From ea3fb3979c7436ba19287d1d1fac068bbeb50493 Mon Sep 17 00:00:00 2001 From: Jesper Wilhelmsson Date: Thu, 4 Oct 2018 10:35:59 +0200 Subject: [PATCH 001/124] Added tag jdk-12+14 for changeset 6f04692c7d51 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index ebb437ff809..5f2accdd825 100644 --- a/.hgtags +++ b/.hgtags @@ -515,3 +515,5 @@ f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11 15094d12a632f452a2064318a4e416d0c7a9ce0c jdk-12+12 511a9946f83e3e3c7b9dbe1840367063fb39b4e1 jdk-12+13 8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14 +8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14 +6f04692c7d5137ee34a6bd94c0c8a6c9219cb127 jdk-12+14 From f5d19b9109c7a0a40a85ca022d3089230ed1456b Mon Sep 17 00:00:00 2001 From: Pallavi Sonal Date: Thu, 4 Oct 2018 17:25:51 +0530 Subject: [PATCH 002/124] 8166138: DateTimeFormatter.ISO_INSTANT should handle offsets Reviewed-by: rriggs, scolebourne, naoto --- .../java/time/format/DateTimeFormatter.java | 7 +- .../time/format/DateTimeFormatterBuilder.java | 9 +- .../time/format/TCKInstantPrinterParser.java | 87 ++++++++++++++----- 3 files changed, 79 insertions(+), 24 deletions(-) diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatter.java b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java index 199313df7e1..3d3cd956c49 100644 --- a/src/java.base/share/classes/java/time/format/DateTimeFormatter.java +++ b/src/java.base/share/classes/java/time/format/DateTimeFormatter.java @@ -1138,9 +1138,12 @@ public final class DateTimeFormatter { *

* This returns an immutable formatter capable of formatting and parsing * the ISO-8601 instant format. - * When formatting, the second-of-minute is always output. + * When formatting, the instant will always be suffixed by 'Z' to indicate UTC. + * The second-of-minute is always output. * The nano-of-second outputs zero, three, six or nine digits as necessary. - * When parsing, time to at least the seconds field is required. + * When parsing, the behaviour of {@link DateTimeFormatterBuilder#appendOffsetId()} + * will be used to parse the offset, converting the instant to UTC as necessary. + * The time to at least the seconds field is required. * Fractional seconds from zero to nine are parsed. * The localized decimal style is not used. *

diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java index 28e58797b47..ca37005fe8a 100644 --- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java +++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java @@ -837,6 +837,10 @@ public final class DateTimeFormatterBuilder { * The leap-second time of '23:59:59' is handled to some degree, see * {@link DateTimeFormatter#parsedLeapSecond()} for full details. *

+ * When formatting, the instant will always be suffixed by 'Z' to indicate UTC. + * When parsing, the behaviour of {@link DateTimeFormatterBuilder#appendOffsetId()} + * will be used to parse the offset, converting the instant to UTC as necessary. + *

* An alternative to this method is to format/parse the instant as a single * epoch-seconds value. That is achieved using {@code appendValue(INSTANT_SECONDS)}. * @@ -3468,7 +3472,7 @@ public final class DateTimeFormatterBuilder { .appendValue(MINUTE_OF_HOUR, 2).appendLiteral(':') .appendValue(SECOND_OF_MINUTE, 2) .appendFraction(NANO_OF_SECOND, minDigits, maxDigits, true) - .appendLiteral('Z') + .appendOffsetId() .toFormatter().toPrinterParser(false); DateTimeParseContext newContext = context.copy(); int pos = parser.parse(newContext, text, position); @@ -3486,6 +3490,7 @@ public final class DateTimeFormatterBuilder { Long nanoVal = newContext.getParsed(NANO_OF_SECOND); int sec = (secVal != null ? secVal.intValue() : 0); int nano = (nanoVal != null ? nanoVal.intValue() : 0); + int offset = newContext.getParsed(OFFSET_SECONDS).intValue(); int days = 0; if (hour == 24 && min == 0 && sec == 0 && nano == 0) { hour = 0; @@ -3498,7 +3503,7 @@ public final class DateTimeFormatterBuilder { long instantSecs; try { LocalDateTime ldt = LocalDateTime.of(year, month, day, hour, min, sec, 0).plusDays(days); - instantSecs = ldt.toEpochSecond(ZoneOffset.UTC); + instantSecs = ldt.toEpochSecond(ZoneOffset.ofTotalSeconds(offset)); instantSecs += Math.multiplyExact(yearParsed / 10_000L, SECONDS_PER_10000_YEARS); } catch (RuntimeException ex) { return ~position; diff --git a/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java index ebd90505c2a..4c8c55f9e0c 100644 --- a/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java +++ b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,12 +69,18 @@ import java.time.Period; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; +import java.time.format.DateTimeParseException; import java.time.format.ResolverStyle; import java.time.temporal.TemporalAccessor; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +/* + * @test + * @bug 8166138 + */ + /** * Test DateTimeFormatterBuilder.appendInstant(). */ @@ -200,7 +206,10 @@ public class TCKInstantPrinterParser { {0, 0, "1970-01-01T00:00:00Z"}, {0, 0, "1970-01-01T00:00:00.0Z"}, {0, 0, "1970-01-01T00:00:00.000Z"}, - {0, 0, "1970-01-01T00:00:00.000000000Z"}, + + {0, 0, "1970-01-01T00:00:00+00:00"}, + {0, 0, "1970-01-01T05:30:00+05:30"}, + {0, 0, "1970-01-01T01:00:00.0+01:00"}, {-1, 0, "1969-12-31T23:59:59Z"}, {1, 0, "1970-01-01T00:00:01Z"}, @@ -208,16 +217,22 @@ public class TCKInstantPrinterParser { {3600, 0, "1970-01-01T01:00:00Z"}, {86400, 0, "1970-01-02T00:00:00Z"}, + {-1, 0, "1969-12-31T23:59:59+00:00"}, + {1, 0, "1970-01-01T05:30:01+05:30"}, + {60, 0, "1969-12-31T19:01:00-05:00"}, + {3600, 0, "1970-01-01T06:30:00+05:30"}, + {86400, 0, "1970-01-01T19:00:00-05:00"}, + {182, 234000000, "1970-01-01T00:03:02.234Z"}, {182, 234000000, "1970-01-01T00:03:02.2340Z"}, {182, 234000000, "1970-01-01T00:03:02.23400Z"}, {182, 234000000, "1970-01-01T00:03:02.234000Z"}, - {182, 234000000, "1970-01-01T00:03:02.234000000Z"}, - {((23 * 60) + 59) * 60 + 59, 123456789, "1970-01-01T23:59:59.123456789Z"}, + {182, 234000000, "1970-01-01T00:03:02.234+00:00"}, + {182, 234000000, "1970-01-01T05:33:02.2340+05:30"}, + {182, 234000000, "1969-12-31T19:03:02.23400-05:00"}, + {182, 234000000, "1970-01-01T00:03:02.234000+00:00"}, - {Instant.MAX.getEpochSecond(), 999999999, "+1000000000-12-31T23:59:59.999999999Z"}, - {Instant.MIN.getEpochSecond(), 0, "-1000000000-01-01T00:00:00.000000000Z"}, }; } @@ -230,22 +245,46 @@ public class TCKInstantPrinterParser { assertEquals(f.parse(input).query(DateTimeFormatter.parsedLeapSecond()), Boolean.FALSE); } - @Test(dataProvider="parseDigits") + @DataProvider(name="parseNineDigits") + Object[][] data_parse_ninedigits() { + return new Object[][] { + {0, 0, "1970-01-01T00:00:00.000000000Z"}, + {0, 0, "1970-01-01T05:30:00.000000000+05:30"}, + + {182, 234000000, "1970-01-01T00:03:02.234000000Z"}, + {182, 234000000, "1970-01-01T01:03:02.234000000+01:00"}, + + {((23 * 60) + 59) * 60 + 59, 123456789, "1970-01-01T23:59:59.123456789Z"}, + {((23 * 60) + 59) * 60 + 59, 123456789, "1970-01-02T05:29:59.123456789+05:30"}, + + {Instant.MAX.getEpochSecond(), 999999999, "+1000000000-12-31T23:59:59.999999999Z"}, + {Instant.MIN.getEpochSecond(), 0, "-1000000000-01-01T00:00:00.000000000Z"}, + {Instant.MAX.getEpochSecond(), 999999999, "+1000000000-12-31T23:59:59.999999999+00:00"}, + {Instant.MIN.getEpochSecond(), 0, "-1000000000-01-01T00:00:00.000000000+00:00"}, + }; + } + + @Test(dataProvider="parseNineDigits") public void test_parse_digitsNine(long instantSecs, int nano, String input) { DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(9).toFormatter(); - if (input.charAt(input.length() - 11) == '.') { - Instant expected = Instant.ofEpochSecond(instantSecs, nano); - assertEquals(f.parse(input, Instant::from), expected); - assertEquals(f.parse(input).query(DateTimeFormatter.parsedExcessDays()), Period.ZERO); - assertEquals(f.parse(input).query(DateTimeFormatter.parsedLeapSecond()), Boolean.FALSE); - } else { - try { - f.parse(input, Instant::from); - fail(); - } catch (DateTimeException ex) { - // expected - } - } + Instant expected = Instant.ofEpochSecond(instantSecs, nano); + assertEquals(f.parse(input, Instant::from), expected); + assertEquals(f.parse(input).query(DateTimeFormatter.parsedExcessDays()), Period.ZERO); + assertEquals(f.parse(input).query(DateTimeFormatter.parsedLeapSecond()), Boolean.FALSE); + } + + @DataProvider(name="parseMaxMinInstant") + Object[][] data_parse_MaxMinInstant() { + return new Object[][] { + {"+1000000000-12-31T23:59:59.999999999-01:00"}, + {"-1000000000-01-01T00:00:00.000000000+01:00"} + }; + } + + @Test(dataProvider="parseMaxMinInstant", expectedExceptions=DateTimeParseException.class) + public void test_invalid_Instant(String input) { + DateTimeFormatter f = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter(); + f.parse(input, Instant::from); } @Test @@ -283,4 +322,12 @@ public class TCKInstantPrinterParser { new DateTimeFormatterBuilder().appendInstant(10); } + //------------------------------------------------------------------------ + @Test + public void test_equality() { + Instant instant1 = Instant.parse("2018-09-12T22:15:51+05:30"); + Instant instant2 = Instant.parse("2018-09-12T16:45:51Z"); + assertEquals(instant2, instant1); + } + } From dcfb9a75aa9d84639ad89772958d796749cb75ba Mon Sep 17 00:00:00 2001 From: Robbin Ehn Date: Thu, 4 Oct 2018 14:03:13 +0200 Subject: [PATCH 003/124] 8210303: VM_HandshakeAllThreads fails assert with "failed: blocked and not walkable" Reviewed-by: dcubed, dholmes --- src/hotspot/share/runtime/handshake.cpp | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp index 7aa1bc53ce7..68703cb3663 100644 --- a/src/hotspot/share/runtime/handshake.cpp +++ b/src/hotspot/share/runtime/handshake.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -347,6 +347,27 @@ bool HandshakeState::vmthread_can_process_handshake(JavaThread* target) { target->is_ext_suspended(); } +static bool possibly_vmthread_can_process_handshake(JavaThread* target) { + // An externally suspended thread cannot be resumed while the + // Threads_lock is held so it is safe. + // Note that this method is allowed to produce false positives. + assert(Threads_lock->owned_by_self(), "Not holding Threads_lock."); + if (target->is_ext_suspended()) { + return true; + } + switch (target->thread_state()) { + case _thread_in_native: + // native threads are safe if they have no java stack or have walkable stack + return !target->has_last_Java_frame() || target->frame_anchor()->walkable(); + + case _thread_blocked: + return true; + + default: + return false; + } +} + bool HandshakeState::claim_handshake_for_vmthread() { if (!_semaphore.trywait()) { return false; @@ -366,7 +387,7 @@ void HandshakeState::process_by_vmthread(JavaThread* target) { return; } - if (!vmthread_can_process_handshake(target)) { + if (!possibly_vmthread_can_process_handshake(target)) { // JT is observed in an unsafe state, it must notice the handshake itself return; } From 4af237427144060d0b97c14a086401b0a3781198 Mon Sep 17 00:00:00 2001 From: Martin Doerr Date: Thu, 4 Oct 2018 16:39:07 +0200 Subject: [PATCH 004/124] 8210754: print_location is not reliable enough (printing register info) Reviewed-by: stuefe, coleenp --- .../share/classfile/classLoaderDataGraph.cpp | 15 ++ .../share/classfile/classLoaderDataGraph.hpp | 4 + src/hotspot/share/code/codeBlob.cpp | 63 ++++++++ src/hotspot/share/code/codeBlob.hpp | 1 + src/hotspot/share/memory/metaspace.cpp | 36 +++++ src/hotspot/share/memory/metaspace.hpp | 11 ++ .../memory/metaspace/virtualSpaceList.cpp | 6 +- .../memory/metaspace/virtualSpaceList.hpp | 3 +- src/hotspot/share/oops/klass.cpp | 17 +++ src/hotspot/share/oops/klass.hpp | 4 + src/hotspot/share/oops/oop.cpp | 57 ++++++++ src/hotspot/share/oops/oop.hpp | 7 + src/hotspot/share/oops/symbol.cpp | 17 +++ src/hotspot/share/oops/symbol.hpp | 2 + src/hotspot/share/runtime/os.cpp | 134 +++++++----------- src/hotspot/share/runtime/os.hpp | 4 + 16 files changed, 298 insertions(+), 83 deletions(-) diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp index 81a59a32bff..9340d03c4b0 100644 --- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp +++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp @@ -487,6 +487,21 @@ bool ClassLoaderDataGraph::contains_loader_data(ClassLoaderData* loader_data) { } #endif // PRODUCT +bool ClassLoaderDataGraph::is_valid(ClassLoaderData* loader_data) { + DEBUG_ONLY( if (!VMError::is_error_reported()) { assert_locked_or_safepoint(ClassLoaderDataGraph_lock); } ) + if (loader_data != NULL) { + if (loader_data == ClassLoaderData::the_null_class_loader_data()) { + return true; + } + for (ClassLoaderData* data = _head; data != NULL; data = data->next()) { + if (loader_data == data) { + return true; + } + } + } + return false; +} + // Move class loader data from main list to the unloaded list for unloading // and deallocation later. bool ClassLoaderDataGraph::do_unloading(bool do_cleaning) { diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp index 1ee4db2e0b7..0eaa51e8dac 100644 --- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp +++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp @@ -146,6 +146,10 @@ class ClassLoaderDataGraph : public AllStatic { #ifndef PRODUCT static bool contains_loader_data(ClassLoaderData* loader_data); #endif + + // Check if ClassLoaderData is part of the ClassLoaderDataGraph (not unloaded) + // Usage without lock only allowed during error reporting. + static bool is_valid(ClassLoaderData* loader_data); }; class LockedClassesDo : public KlassClosure { diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp index eb8ee897df5..bad89d02be2 100644 --- a/src/hotspot/share/code/codeBlob.cpp +++ b/src/hotspot/share/code/codeBlob.cpp @@ -26,7 +26,9 @@ #include "jvm.h" #include "code/codeBlob.hpp" #include "code/codeCache.hpp" +#include "code/icBuffer.hpp" #include "code/relocInfo.hpp" +#include "code/vtableStubs.hpp" #include "compiler/disassembler.hpp" #include "interpreter/bytecode.hpp" #include "memory/allocation.inline.hpp" @@ -559,6 +561,67 @@ void CodeBlob::print_value_on(outputStream* st) const { st->print_cr("[CodeBlob]"); } +void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const { + if (is_buffer_blob()) { + // the interpreter is generated into a buffer blob + InterpreterCodelet* i = Interpreter::codelet_containing(addr); + if (i != NULL) { + st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an Interpreter codelet", p2i(addr), (int)(addr - i->code_begin())); + i->print_on(st); + return; + } + if (Interpreter::contains(addr)) { + st->print_cr(INTPTR_FORMAT " is pointing into interpreter code" + " (not bytecode specific)", p2i(addr)); + return; + } + // + if (AdapterHandlerLibrary::contains(this)) { + st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an AdapterHandler", p2i(addr), (int)(addr - code_begin())); + AdapterHandlerLibrary::print_handler_on(st, this); + } + // the stubroutines are generated into a buffer blob + StubCodeDesc* d = StubCodeDesc::desc_for(addr); + if (d != NULL) { + st->print_cr(INTPTR_FORMAT " is at begin+%d in a stub", p2i(addr), (int)(addr - d->begin())); + d->print_on(st); + st->cr(); + return; + } + if (StubRoutines::contains(addr)) { + st->print_cr(INTPTR_FORMAT " is pointing to an (unnamed) stub routine", p2i(addr)); + return; + } + // the InlineCacheBuffer is using stubs generated into a buffer blob + if (InlineCacheBuffer::contains(addr)) { + st->print_cr(INTPTR_FORMAT " is pointing into InlineCacheBuffer", p2i(addr)); + return; + } + VtableStub* v = VtableStubs::stub_containing(addr); + if (v != NULL) { + st->print_cr(INTPTR_FORMAT " is at entry_point+%d in a vtable stub", p2i(addr), (int)(addr - v->entry_point())); + v->print_on(st); + st->cr(); + return; + } + } + if (is_nmethod()) { + nmethod* nm = (nmethod*)this; + ResourceMark rm; + st->print(INTPTR_FORMAT " is at entry_point+%d in (nmethod*)" INTPTR_FORMAT, + p2i(addr), (int)(addr - nm->entry_point()), p2i(nm)); + if (verbose) { + st->print(" for "); + nm->method()->print_value_on(st); + } + st->cr(); + nm->print_nmethod(verbose); + return; + } + st->print_cr(INTPTR_FORMAT " is at code_begin+%d in ", p2i(addr), (int)(addr - code_begin())); + print_on(st); +} + void RuntimeBlob::verify() { ShouldNotReachHere(); } diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp index c3e0f17b4ac..df657716649 100644 --- a/src/hotspot/share/code/codeBlob.hpp +++ b/src/hotspot/share/code/codeBlob.hpp @@ -221,6 +221,7 @@ public: virtual void print() const { print_on(tty); }; virtual void print_on(outputStream* st) const; virtual void print_value_on(outputStream* st) const; + void dump_for_addr(address addr, outputStream* st, bool verbose) const; void print_code(); // Print the comment associated with offset on stream, if there is one diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp index eafb46ce710..79154b59f28 100644 --- a/src/hotspot/share/memory/metaspace.cpp +++ b/src/hotspot/share/memory/metaspace.cpp @@ -863,6 +863,42 @@ void MetaspaceUtils::verify_metrics() { #endif } +// Utils to check if a pointer or range is part of a committed metaspace region. +metaspace::VirtualSpaceNode* MetaspaceUtils::find_enclosing_virtual_space(const void* p) { + VirtualSpaceNode* vsn = Metaspace::space_list()->find_enclosing_space(p); + if (Metaspace::using_class_space() && vsn == NULL) { + vsn = Metaspace::class_space_list()->find_enclosing_space(p); + } + return vsn; +} + +bool MetaspaceUtils::is_in_committed(const void* p) { +#if INCLUDE_CDS + if (UseSharedSpaces) { + for (int idx = MetaspaceShared::ro; idx <= MetaspaceShared::mc; idx++) { + if (FileMapInfo::current_info()->is_in_shared_region(p, idx)) { + return true; + } + } + } +#endif + return find_enclosing_virtual_space(p) != NULL; +} + +bool MetaspaceUtils::is_range_in_committed(const void* from, const void* to) { +#if INCLUDE_CDS + if (UseSharedSpaces) { + for (int idx = MetaspaceShared::ro; idx <= MetaspaceShared::mc; idx++) { + if (FileMapInfo::current_info()->is_in_shared_region(from, idx)) { + return FileMapInfo::current_info()->is_in_shared_region(to, idx); + } + } + } +#endif + VirtualSpaceNode* vsn = find_enclosing_virtual_space(from); + return (vsn != NULL) && vsn->contains(to); +} + // Metaspace methods diff --git a/src/hotspot/share/memory/metaspace.hpp b/src/hotspot/share/memory/metaspace.hpp index cfbd5bea27b..f2c47919f4d 100644 --- a/src/hotspot/share/memory/metaspace.hpp +++ b/src/hotspot/share/memory/metaspace.hpp @@ -71,6 +71,7 @@ namespace metaspace { class PrintCLDMetaspaceInfoClosure; class SpaceManager; class VirtualSpaceList; + class VirtualSpaceNode; } // Metaspaces each have a SpaceManager and allocations @@ -297,6 +298,10 @@ class MetaspaceUtils : AllStatic { // Spacemanager updates running counters. friend class metaspace::SpaceManager; + // Special access for error reporting (checks without locks). + friend class oopDesc; + friend class Klass; + // Running counters for statistics concerning in-use chunks. // Note: capacity = used + free + waste + overhead. Note that we do not // count free and waste. Their sum can be deduces from the three other values. @@ -324,6 +329,12 @@ class MetaspaceUtils : AllStatic { // Helper for print_xx_report. static void print_vs(outputStream* out, size_t scale); + // Utils to check if a pointer or range is part of a committed metaspace region + // without acquiring any locks. + static metaspace::VirtualSpaceNode* find_enclosing_virtual_space(const void* p); + static bool is_in_committed(const void* p); + static bool is_range_in_committed(const void* from, const void* to); + public: // Collect used metaspace statistics. This involves walking the CLDG. The resulting diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp index d8105a05f97..cf1c71f8744 100644 --- a/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.cpp @@ -141,17 +141,17 @@ void VirtualSpaceList::purge(ChunkManager* chunk_manager) { // This function looks at the mmap regions in the metaspace without locking. // The chunks are added with store ordering and not deleted except for at // unloading time during a safepoint. -bool VirtualSpaceList::contains(const void* ptr) { +VirtualSpaceNode* VirtualSpaceList::find_enclosing_space(const void* ptr) { // List should be stable enough to use an iterator here because removing virtual // space nodes is only allowed at a safepoint. VirtualSpaceListIterator iter(virtual_space_list()); while (iter.repeat()) { VirtualSpaceNode* vsn = iter.get_next(); if (vsn->contains(ptr)) { - return true; + return vsn; } } - return false; + return NULL; } void VirtualSpaceList::retire_current_virtual_space() { diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp index 04c27d7ff33..5879d033dbc 100644 --- a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp @@ -116,7 +116,8 @@ class VirtualSpaceList : public CHeapObj { void inc_virtual_space_count(); void dec_virtual_space_count(); - bool contains(const void* ptr); + VirtualSpaceNode* find_enclosing_space(const void* ptr); + bool contains(const void* ptr) { return find_enclosing_space(ptr) != NULL; } // Unlink empty VirtualSpaceNodes and free it. void purge(ChunkManager* chunk_manager); diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp index e376e7e0940..07898b0fc81 100644 --- a/src/hotspot/share/oops/klass.cpp +++ b/src/hotspot/share/oops/klass.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "classfile/classLoaderData.inline.hpp" +#include "classfile/classLoaderDataGraph.inline.hpp" #include "classfile/dictionary.hpp" #include "classfile/javaClasses.hpp" #include "classfile/systemDictionary.hpp" @@ -740,6 +741,22 @@ void Klass::oop_verify_on(oop obj, outputStream* st) { guarantee(obj->klass()->is_klass(), "klass field is not a klass"); } +Klass* Klass::decode_klass_raw(narrowKlass narrow_klass) { + return (Klass*)(void*)( (uintptr_t)Universe::narrow_klass_base() + + ((uintptr_t)narrow_klass << Universe::narrow_klass_shift())); +} + +bool Klass::is_valid(Klass* k) { + if (!is_aligned(k, sizeof(MetaWord))) return false; + if ((size_t)k < os::min_page_size()) return false; + + if (!os::is_readable_range(k, k + 1)) return false; + if (!MetaspaceUtils::is_range_in_committed(k, k + 1)) return false; + + if (!Symbol::is_valid(k->name())) return false; + return ClassLoaderDataGraph::is_valid(k->class_loader_data()); +} + klassVtable Klass::vtable() const { return klassVtable(const_cast(this), start_of_vtable(), vtable_length() / vtableEntry::size()); } diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp index 57b5737e623..d428e5b0e34 100644 --- a/src/hotspot/share/oops/klass.hpp +++ b/src/hotspot/share/oops/klass.hpp @@ -715,6 +715,10 @@ protected: virtual void oop_verify_on(oop obj, outputStream* st); + // for error reporting + static Klass* decode_klass_raw(narrowKlass narrow_klass); + static bool is_valid(Klass* k); + static bool is_null(narrowKlass obj); static bool is_null(Klass* obj); diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp index 208bf4e4790..ef5f8b9dc72 100644 --- a/src/hotspot/share/oops/oop.cpp +++ b/src/hotspot/share/oops/oop.cpp @@ -171,6 +171,63 @@ bool oopDesc::has_klass_gap() { return UseCompressedClassPointers; } +oop oopDesc::decode_oop_raw(narrowOop narrow_oop) { + return (oop)(void*)( (uintptr_t)Universe::narrow_oop_base() + + ((uintptr_t)narrow_oop << Universe::narrow_oop_shift())); +} + +void* oopDesc::load_klass_raw(oop obj) { + if (UseCompressedClassPointers) { + narrowKlass narrow_klass = *(obj->compressed_klass_addr()); + if (narrow_klass == 0) return NULL; + return (void*)Klass::decode_klass_raw(narrow_klass); + } else { + return *(void**)(obj->klass_addr()); + } +} + +void* oopDesc::load_oop_raw(oop obj, int offset) { + uintptr_t addr = (uintptr_t)(void*)obj + (uint)offset; + if (UseCompressedOops) { + narrowOop narrow_oop = *(narrowOop*)addr; + if (narrow_oop == 0) return NULL; + return (void*)decode_oop_raw(narrow_oop); + } else { + return *(void**)addr; + } +} + +bool oopDesc::is_valid(oop obj) { + if (!is_object_aligned(obj)) return false; + if ((size_t)(oopDesc*)obj < os::min_page_size()) return false; + + // We need at least the mark and the klass word in the committed region. + if (!os::is_readable_range(obj, (oopDesc*)obj + 1)) return false; + if (!Universe::heap()->is_in(obj)) return false; + + Klass* k = (Klass*)load_klass_raw(obj); + + if (!os::is_readable_range(k, k + 1)) return false; + return MetaspaceUtils::is_range_in_committed(k, k + 1); +} + +oop oopDesc::oop_or_null(address addr) { + if (is_valid(oop(addr))) { + // We were just given an oop directly. + return oop(addr); + } + + // Try to find addr using block_start. + HeapWord* p = Universe::heap()->block_start(addr); + if (p != NULL && Universe::heap()->block_is_obj(p)) { + if (!is_valid(oop(p))) return NULL; + return oop(p); + } + + // If we can't find it it just may mean that heap wasn't parsable. + return NULL; +} + oop oopDesc::obj_field_acquire(int offset) const { return HeapAccess::oop_load_at(as_oop(), offset); } void oopDesc::obj_field_put_raw(int offset, oop value) { RawAccess<>::oop_store_at(as_oop(), offset, value); } diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp index 2bf60bf49cf..0e57e46d29c 100644 --- a/src/hotspot/share/oops/oop.hpp +++ b/src/hotspot/share/oops/oop.hpp @@ -334,6 +334,13 @@ class oopDesc { assert(has_klass_gap(), "only applicable to compressed klass pointers"); return klass_offset_in_bytes() + sizeof(narrowKlass); } + + // for error reporting + static oop decode_oop_raw(narrowOop narrow_oop); + static void* load_klass_raw(oop obj); + static void* load_oop_raw(oop obj, int offset); + static bool is_valid(oop obj); + static oop oop_or_null(address addr); }; #endif // SHARE_VM_OOPS_OOP_HPP diff --git a/src/hotspot/share/oops/symbol.cpp b/src/hotspot/share/oops/symbol.cpp index 3c43193632a..fae165e36bb 100644 --- a/src/hotspot/share/oops/symbol.cpp +++ b/src/hotspot/share/oops/symbol.cpp @@ -26,6 +26,7 @@ #include "precompiled.hpp" #include "classfile/altHashing.hpp" #include "classfile/classLoaderData.hpp" +#include "gc/shared/collectedHeap.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" #include "memory/allocation.inline.hpp" @@ -317,5 +318,21 @@ void Symbol::print_value_on(outputStream* st) const { } } +bool Symbol::is_valid(Symbol* s) { + if (!is_aligned(s, sizeof(MetaWord))) return false; + if ((size_t)s < os::min_page_size()) return false; + + if (!os::is_readable_range(s, s + 1)) return false; + + // Symbols are not allocated in Java heap. + if (Universe::heap()->is_in_reserved(s)) return false; + + int len = s->utf8_length(); + if (len < 0) return false; + + jbyte* bytes = (jbyte*) s->bytes(); + return os::is_readable_range(bytes, bytes + len); +} + // SymbolTable prints this in its statistics NOT_PRODUCT(size_t Symbol::_total_count = 0;) diff --git a/src/hotspot/share/oops/symbol.hpp b/src/hotspot/share/oops/symbol.hpp index 0ef2430e981..ac74c674af8 100644 --- a/src/hotspot/share/oops/symbol.hpp +++ b/src/hotspot/share/oops/symbol.hpp @@ -255,6 +255,8 @@ class Symbol : public MetaspaceObj { void print() { print_on(tty); } void print_value() { print_value_on(tty); } + static bool is_valid(Symbol* s); + #ifndef PRODUCT // Empty constructor to create a dummy symbol object on stack // only for getting its vtable pointer. diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index a3fc417b1bc..d703c7297e1 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -1010,6 +1010,15 @@ bool os::is_readable_pointer(const void* p) { return (SafeFetch32(aligned, cafebabe) != cafebabe) || (SafeFetch32(aligned, deadbeef) != deadbeef); } +bool os::is_readable_range(const void* from, const void* to) { + for (address p = align_down((address)from, min_page_size()); p < to; p += min_page_size()) { + if (!is_readable_pointer(p)) { + return false; + } + } + return true; +} + // moved from debug.cpp (used to be find()) but still called from there // The verbose parameter is only set by the debug code in one case @@ -1020,99 +1029,48 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) { st->print_cr("0x0 is NULL"); return; } + + // Check if addr points into a code blob. CodeBlob* b = CodeCache::find_blob_unsafe(addr); if (b != NULL) { - if (b->is_buffer_blob()) { - // the interpreter is generated into a buffer blob - InterpreterCodelet* i = Interpreter::codelet_containing(addr); - if (i != NULL) { - st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an Interpreter codelet", p2i(addr), (int)(addr - i->code_begin())); - i->print_on(st); - return; - } - if (Interpreter::contains(addr)) { - st->print_cr(INTPTR_FORMAT " is pointing into interpreter code" - " (not bytecode specific)", p2i(addr)); - return; - } - // - if (AdapterHandlerLibrary::contains(b)) { - st->print_cr(INTPTR_FORMAT " is at code_begin+%d in an AdapterHandler", p2i(addr), (int)(addr - b->code_begin())); - AdapterHandlerLibrary::print_handler_on(st, b); - } - // the stubroutines are generated into a buffer blob - StubCodeDesc* d = StubCodeDesc::desc_for(addr); - if (d != NULL) { - st->print_cr(INTPTR_FORMAT " is at begin+%d in a stub", p2i(addr), (int)(addr - d->begin())); - d->print_on(st); - st->cr(); - return; - } - if (StubRoutines::contains(addr)) { - st->print_cr(INTPTR_FORMAT " is pointing to an (unnamed) stub routine", p2i(addr)); - return; - } - // the InlineCacheBuffer is using stubs generated into a buffer blob - if (InlineCacheBuffer::contains(addr)) { - st->print_cr(INTPTR_FORMAT " is pointing into InlineCacheBuffer", p2i(addr)); - return; - } - VtableStub* v = VtableStubs::stub_containing(addr); - if (v != NULL) { - st->print_cr(INTPTR_FORMAT " is at entry_point+%d in a vtable stub", p2i(addr), (int)(addr - v->entry_point())); - v->print_on(st); - st->cr(); - return; - } - } - nmethod* nm = b->as_nmethod_or_null(); - if (nm != NULL) { - ResourceMark rm; - st->print(INTPTR_FORMAT " is at entry_point+%d in (nmethod*)" INTPTR_FORMAT, - p2i(addr), (int)(addr - nm->entry_point()), p2i(nm)); - if (verbose) { - st->print(" for "); - nm->method()->print_value_on(st); - } - st->cr(); - nm->print_nmethod(verbose); - return; - } - st->print_cr(INTPTR_FORMAT " is at code_begin+%d in ", p2i(addr), (int)(addr - b->code_begin())); - b->print_on(st); + b->dump_for_addr(addr, st, verbose); return; } + // Check if addr points into Java heap. if (Universe::heap()->is_in(addr)) { - HeapWord* p = Universe::heap()->block_start(addr); - bool print = false; - // If we couldn't find it it just may mean that heap wasn't parsable - // See if we were just given an oop directly - if (p != NULL && Universe::heap()->block_is_obj(p)) { - print = true; - } else if (p == NULL && oopDesc::is_oop(oop(addr))) { - p = (HeapWord*) addr; - print = true; - } - if (print) { - if (p == (HeapWord*) addr) { - st->print_cr(INTPTR_FORMAT " is an oop", p2i(addr)); + oop o = oopDesc::oop_or_null(addr); + if (o != NULL) { + if ((HeapWord*)o == (HeapWord*)addr) { + st->print(INTPTR_FORMAT " is an oop: ", p2i(addr)); } else { - st->print_cr(INTPTR_FORMAT " is pointing into object: " INTPTR_FORMAT, p2i(addr), p2i(p)); + st->print(INTPTR_FORMAT " is pointing into object: " , p2i(addr)); } - oop(p)->print_on(st); + o->print_on(st); return; } - } else { - if (Universe::heap()->is_in_reserved(addr)) { - st->print_cr(INTPTR_FORMAT " is an unallocated location " - "in the heap", p2i(addr)); + } else if (Universe::heap()->is_in_reserved(addr)) { + st->print_cr(INTPTR_FORMAT " is an unallocated location in the heap", p2i(addr)); + return; + } + + // Compressed oop needs to be decoded first. +#ifdef _LP64 + if (UseCompressedOops && ((uintptr_t)addr &~ (uintptr_t)max_juint) == 0) { + narrowOop narrow_oop = (narrowOop)(uintptr_t)addr; + oop o = oopDesc::decode_oop_raw(narrow_oop); + + if (oopDesc::is_valid(o)) { + st->print(UINT32_FORMAT " is a compressed pointer to object: ", narrow_oop); + o->print_on(st); return; } } +#endif bool accessible = is_readable_pointer(addr); + // Check if addr is a JNI handle. if (align_down((intptr_t)addr, sizeof(intptr_t)) != 0 && accessible) { if (JNIHandles::is_global_handle((jobject) addr)) { st->print_cr(INTPTR_FORMAT " is a global jni handle", p2i(addr)); @@ -1131,6 +1089,7 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) { #endif } + // Check if addr belongs to a Java thread. for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) { // Check for privilege stack if (thread->privileged_stack_top() != NULL && @@ -1159,9 +1118,12 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) { } } - // Check if in metaspace and print types that have vptrs (only method now) + // Check if in metaspace and print types that have vptrs if (Metaspace::contains(addr)) { - if (Method::has_method_vptr((const void*)addr)) { + if (Klass::is_valid((Klass*)addr)) { + st->print_cr(INTPTR_FORMAT " is a pointer to class: ", p2i(addr)); + ((Klass*)addr)->print_on(st); + } else if (Method::is_valid_method((const Method*)addr)) { ((Method*)addr)->print_value_on(st); st->cr(); } else { @@ -1171,6 +1133,20 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) { return; } + // Compressed klass needs to be decoded first. +#ifdef _LP64 + if (UseCompressedClassPointers && ((uintptr_t)addr &~ (uintptr_t)max_juint) == 0) { + narrowKlass narrow_klass = (narrowKlass)(uintptr_t)addr; + Klass* k = Klass::decode_klass_raw(narrow_klass); + + if (Klass::is_valid(k)) { + st->print_cr(UINT32_FORMAT " is a compressed pointer to class: " INTPTR_FORMAT, narrow_klass, p2i((HeapWord*)k)); + k->print_on(st); + return; + } + } +#endif + // Try an OS specific find if (os::find(addr, st)) { return; diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp index 3b904a8b6a2..6bc92abbc0f 100644 --- a/src/hotspot/share/runtime/os.hpp +++ b/src/hotspot/share/runtime/os.hpp @@ -303,6 +303,9 @@ class os: AllStatic { return _page_sizes[0]; } + // Return a lower bound for page sizes. Also works before os::init completed. + static size_t min_page_size() { return 4 * K; } + // Methods for tracing page sizes returned by the above method. // The region_{min,max}_size parameters should be the values // passed to page_size_for_region() and page_size should be the result of that @@ -415,6 +418,7 @@ class os: AllStatic { // Check if pointer points to readable memory (by 4-byte read access) static bool is_readable_pointer(const void* p); + static bool is_readable_range(const void* from, const void* to); // Routines used to serialize the thread state without using membars static void serialize_thread_states(); From 73a631303892dfa86c731f47fbf01708eaab5403 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Thu, 4 Oct 2018 08:45:21 -0700 Subject: [PATCH 005/124] 8181443: Replace usages of jdk.internal.misc.Unsafe with MethodHandles.Lookup.defineClass Reviewed-by: alanb, egahlin --- .../java/lang/invoke/ClassSpecializer.java | 29 +++++++------------ .../classes/java/lang/reflect/Proxy.java | 12 ++++---- .../jdk/internal/reflect/ClassDefiner.java | 10 ++++--- .../jdk/jfr/internal/EventClassBuilder.java | 2 +- .../jdk/jfr/internal/EventHandlerCreator.java | 2 +- .../jdk/jfr/internal/SecuritySupport.java | 15 ++++++++-- .../jsr292/NonInlinedCall/RedefineTest.java | 11 +++---- .../unsafe/UnsafeGetConstantField.java | 9 +++++- .../Dictionary/CleanProtectionDomain.java | 7 +++-- 9 files changed, 56 insertions(+), 41 deletions(-) diff --git a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java index 9ee60001ae7..b1d75a5ac09 100644 --- a/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java +++ b/src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java @@ -37,7 +37,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.security.AccessController; import java.security.PrivilegedAction; -import java.security.ProtectionDomain; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -578,23 +577,17 @@ abstract class ClassSpecializer.SpeciesDat InvokerBytecodeGenerator.maybeDump(classBCName(className), classFile); Class speciesCode; - ClassLoader cl = topClass().getClassLoader(); - ProtectionDomain pd = null; - if (cl != null) { - pd = AccessController.doPrivileged( - new PrivilegedAction<>() { - @Override - public ProtectionDomain run() { - return topClass().getProtectionDomain(); - } - }); - } - try { - speciesCode = UNSAFE.defineClass(className, classFile, 0, classFile.length, cl, pd); - } catch (Exception ex) { - throw newInternalError(ex); - } - + MethodHandles.Lookup lookup = IMPL_LOOKUP.in(topClass()); + speciesCode = AccessController.doPrivileged(new PrivilegedAction<>() { + @Override + public Class run() { + try { + return lookup.defineClass(classFile); + } catch (Exception ex) { + throw newInternalError(ex); + } + } + }); return speciesCode.asSubclass(topClass()); } diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java index 456527dd19b..2538b924d89 100644 --- a/src/java.base/share/classes/java/lang/reflect/Proxy.java +++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java @@ -39,12 +39,11 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; -import java.util.stream.Stream; import jdk.internal.loader.BootLoader; +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; import jdk.internal.module.Modules; -import jdk.internal.misc.Unsafe; import jdk.internal.misc.VM; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; @@ -468,7 +467,7 @@ public class Proxy implements java.io.Serializable { * in which the proxy class will be defined. */ private static final class ProxyBuilder { - private static final Unsafe UNSAFE = Unsafe.getUnsafe(); + private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess(); // prefix for all proxy class names private static final String proxyClassNamePrefix = "$Proxy"; @@ -535,9 +534,8 @@ public class Proxy implements java.io.Serializable { byte[] proxyClassFile = ProxyGenerator.generateProxyClass( proxyName, interfaces.toArray(EMPTY_CLASS_ARRAY), accessFlags); try { - Class pc = UNSAFE.defineClass(proxyName, proxyClassFile, - 0, proxyClassFile.length, - loader, null); + Class pc = JLA.defineClass(loader, proxyName, proxyClassFile, + null, "__dynamic_proxy__"); reverseProxyCache.sub(pc).putIfAbsent(loader, Boolean.TRUE); return pc; } catch (ClassFormatError e) { diff --git a/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java b/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java index 8bf8bf9d1d7..d11385bb07f 100644 --- a/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java +++ b/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java @@ -27,14 +27,16 @@ package jdk.internal.reflect; import java.security.AccessController; import java.security.PrivilegedAction; -import jdk.internal.misc.Unsafe; -/** Utility class which assists in calling Unsafe.defineClass() by +import jdk.internal.misc.JavaLangAccess; +import jdk.internal.misc.SharedSecrets; + +/** Utility class which assists in calling defineClass() by creating a new class loader which delegates to the one needed in order for proper resolution of the given bytecodes to occur. */ class ClassDefiner { - static final Unsafe unsafe = Unsafe.getUnsafe(); + static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess(); /**

We define generated code into a new class loader which delegates to the defining loader of the target class. It is @@ -60,7 +62,7 @@ class ClassDefiner { return new DelegatingClassLoader(parentClassLoader); } }); - return unsafe.defineClass(name, bytes, off, len, newLoader, null); + return JLA.defineClass(newLoader, name, bytes, null, "__ClassDefiner__"); } } diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java index d20b773465a..754ed3d0723 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventClassBuilder.java @@ -70,7 +70,7 @@ public final class EventClassBuilder { endClass(); byte[] bytes = classWriter.toByteArray(); ASMToolkit.logASM(fullClassName, bytes); - return SecuritySupport.defineClass(type.getInternalName(), bytes, Event.class.getClassLoader()).asSubclass(Event.class); + return SecuritySupport.defineClass(Event.class, bytes).asSubclass(Event.class); } private void endClass() { diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventHandlerCreator.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventHandlerCreator.java index 0d5fe27ddbc..26b9524137b 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventHandlerCreator.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventHandlerCreator.java @@ -134,7 +134,7 @@ final class EventHandlerCreator { buildWriteMethod(); byte[] bytes = classWriter.toByteArray(); ASMToolkit.logASM(className, bytes); - return SecuritySupport.defineClass(className, bytes, Event.class.getClassLoader()).asSubclass(EventHandler.class); + return SecuritySupport.defineClass(EventHandler.class, bytes).asSubclass(EventHandler.class); } public static EventHandler instantiateEventHandler(Class handlerClass, boolean registered, EventType eventType, EventControl eventControl) throws Error { diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java index f8a57f6c9f0..1d1efe685a7 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.RandomAccessFile; import java.io.Reader; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -71,6 +72,7 @@ import jdk.jfr.Recording; */ public final class SecuritySupport { private final static Unsafe unsafe = Unsafe.getUnsafe(); + private final static MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); private final static Module JFR_MODULE = Event.class.getModule(); public final static SafePath JFC_DIRECTORY = getPathInProperty("java.home", "lib/jfr"); @@ -381,8 +383,17 @@ public final class SecuritySupport { unsafe.ensureClassInitialized(clazz); } - static Class defineClass(String name, byte[] bytes, ClassLoader classLoader) { - return unsafe.defineClass(name, bytes, 0, bytes.length, classLoader, null); + static Class defineClass(Class lookupClass, byte[] bytes) { + return AccessController.doPrivileged(new PrivilegedAction<>() { + @Override + public Class run() { + try { + return MethodHandles.privateLookupIn(lookupClass, LOOKUP).defineClass(bytes); + } catch (IllegalAccessException e) { + throw new InternalError(e); + } + } + }); } static Thread createThreadWitNoPermissions(String threadName, Runnable runnable) { diff --git a/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java b/test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/RedefineTest.java index 806b7490893..364b8189758 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, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * 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,7 +48,6 @@ package compiler.jsr292.NonInlinedCall; -import jdk.internal.misc.Unsafe; import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; import jdk.internal.vm.annotation.DontInline; @@ -68,13 +67,15 @@ import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; public class RedefineTest { static final MethodHandles.Lookup LOOKUP = MethodHandleHelper.IMPL_LOOKUP; - static final Unsafe UNSAFE = Unsafe.getUnsafe(); - static final String NAME = "compiler/jsr292/NonInlinedCall/RedefineTest$T"; static Class getClass(int r) { byte[] classFile = getClassFile(r); - return UNSAFE.defineClass(NAME, classFile, 0, classFile.length, null, null); + try { + return MethodHandles.lookup().defineClass(classFile); + } catch (IllegalAccessException e) { + throw new Error(e); + } } /** diff --git a/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java index f3d0a07c477..b7a36ca0ee6 100644 --- a/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java +++ b/test/hotspot/jtreg/compiler/unsafe/UnsafeGetConstantField.java @@ -32,6 +32,9 @@ * java.base/jdk.internal.vm.annotation * java.base/jdk.internal.misc * + * @library ../jsr292/patches + * @build java.base/java.lang.invoke.MethodHandleHelper + * * @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions * -Xbatch -XX:-TieredCompilation * -XX:+FoldStableValues @@ -64,6 +67,9 @@ import jdk.internal.vm.annotation.Stable; import jdk.test.lib.Asserts; import jdk.test.lib.Platform; +import java.lang.invoke.MethodHandleHelper; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodHandles.Lookup; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -393,8 +399,9 @@ public class UnsafeGetConstantField { } Test generate() { - Class c = U.defineClass(className, classFile, 0, classFile.length, THIS_CLASS.getClassLoader(), null); try { + Lookup lookup = MethodHandleHelper.IMPL_LOOKUP.in(MethodHandles.class); + Class c = lookup.defineClass(classFile); return (Test) c.newInstance(); } catch(Exception e) { throw new Error(e); diff --git a/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java b/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java index 3b559d9bc64..b7ee9bcc4e4 100644 --- a/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java +++ b/test/hotspot/jtreg/runtime/Dictionary/CleanProtectionDomain.java @@ -57,11 +57,10 @@ public class CleanProtectionDomain { static class Test { public static void test() throws Exception { - Unsafe unsafe = Unsafe.getUnsafe(); TestClassLoader classloader = new TestClassLoader(); ProtectionDomain pd = new ProtectionDomain(null, null); byte klassbuf[] = InMemoryJavaCompiler.compile("TestClass", "class TestClass { }"); - Class klass = unsafe.defineClass(null, klassbuf, 0, klassbuf.length, classloader, pd); + Class klass = classloader.defineClass("TestClass", klassbuf, pd); } public static void main(String[] args) throws Exception { @@ -91,6 +90,10 @@ public class CleanProtectionDomain { public TestClassLoader() { super(); } + + public Class defineClass(String name, byte[] bytes, ProtectionDomain pd) { + return defineClass(name, bytes, 0, bytes.length, pd); + } } } } From 2589e9733e054c164a64112db80e25fefd6dd222 Mon Sep 17 00:00:00 2001 From: Vicente Romero Date: Thu, 4 Oct 2018 08:37:08 -0700 Subject: [PATCH 006/124] 8211148: var in implicit lambdas shouldn't be accepted for source < 11 Reviewed-by: mcimadamore --- .../com/sun/tools/javac/code/Source.java | 1 + .../sun/tools/javac/parser/JavacParser.java | 29 ++++++++++------- .../tools/javac/resources/compiler.properties | 3 ++ .../diags/examples/VarInImplicitLambda.java | 32 +++++++++++++++++++ .../tools/javac/lambda/LambdaParserTest.java | 27 +++++++++------- .../VarInImplicitLambdaNegTest01.java | 1 + .../VarInImplicitLambdaNegTest01.out | 8 ++--- .../VarInImplicitLambdaNegTest01_source10.out | 6 ++++ 8 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 test/langtools/tools/javac/diags/examples/VarInImplicitLambda.java create mode 100644 test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01_source10.out diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java index 0cd344531bd..269b6f6e63a 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java @@ -180,6 +180,7 @@ public enum Source { UNDERSCORE_IDENTIFIER(MIN, JDK8), PRIVATE_INTERFACE_METHODS(JDK9, Fragments.FeaturePrivateIntfMethods, DiagKind.PLURAL), LOCAL_VARIABLE_TYPE_INFERENCE(JDK10), + VAR_SYNTAX_IMPLICIT_LAMBDAS(JDK11, Fragments.FeatureVarSyntaxInImplicitLambda, DiagKind.PLURAL), IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES(JDK1_2, JDK8), SWITCH_MULTIPLE_CASE_LABELS(JDK12, Fragments.FeatureMultipleCaseLabels, DiagKind.PLURAL), SWITCH_RULE(JDK12, Fragments.FeatureSwitchRules, DiagKind.PLURAL), diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java index 7e850919a63..df992908488 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -1783,7 +1783,9 @@ public class JavacParser implements Parser { if (param.vartype != null && isRestrictedLocalVarTypeName(param.vartype, false) && param.vartype.hasTag(TYPEARRAY)) { - log.error(DiagnosticFlag.SYNTAX, param.pos, Errors.VarNotAllowedArray); + log.error(DiagnosticFlag.SYNTAX, param.pos, + Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS.allowedInSource(source) + ? Errors.VarNotAllowedArray : Errors.VarNotAllowedHere); } lambdaClassifier.addParameter(param); if (lambdaClassifier.result() == LambdaParameterKind.ERROR) { @@ -1794,7 +1796,9 @@ public class JavacParser implements Parser { log.error(DiagnosticFlag.SYNTAX, pos, Errors.InvalidLambdaParameterDeclaration(lambdaClassifier.diagFragment)); } for (JCVariableDecl param: params) { - if (param.vartype != null && isRestrictedLocalVarTypeName(param.vartype, true)) { + if (param.vartype != null + && isRestrictedLocalVarTypeName(param.vartype, true)) { + checkSourceLevel(param.pos, Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS); param.startPos = TreeInfo.getStartPos(param.vartype); param.vartype = null; } @@ -1804,9 +1808,9 @@ public class JavacParser implements Parser { } enum LambdaParameterKind { - EXPLICIT(0), - IMPLICIT(1), - VAR(2), + VAR(0), + EXPLICIT(1), + IMPLICIT(2), ERROR(-1); private final int index; @@ -1816,11 +1820,11 @@ public class JavacParser implements Parser { } } - private final static Fragment[][] decisionTable = new Fragment[][]{ - /* EXPLICIT IMPLICIT VAR */ - /* EXPLICIT */ {null, ImplicitAndExplicitNotAllowed, VarAndExplicitNotAllowed}, - /* IMPLICIT */ {ImplicitAndExplicitNotAllowed, null, VarAndImplicitNotAllowed}, - /* VAR */ {VarAndExplicitNotAllowed, VarAndImplicitNotAllowed, null} + private final static Fragment[][] decisionTable = new Fragment[][] { + /* VAR EXPLICIT IMPLICIT */ + /* VAR */ {null, VarAndExplicitNotAllowed, VarAndImplicitNotAllowed}, + /* EXPLICIT */ {VarAndExplicitNotAllowed, null, ImplicitAndExplicitNotAllowed}, + /* IMPLICIT */ {VarAndImplicitNotAllowed, ImplicitAndExplicitNotAllowed, null}, }; class LambdaClassifier { @@ -1849,7 +1853,10 @@ public class JavacParser implements Parser { } else if (kind != newKind && kind != LambdaParameterKind.ERROR) { LambdaParameterKind currentKind = kind; kind = LambdaParameterKind.ERROR; - diagFragment = decisionTable[currentKind.index][newKind.index]; + boolean varIndex = currentKind.index == LambdaParameterKind.VAR.index || + newKind.index == LambdaParameterKind.VAR.index; + diagFragment = Feature.VAR_SYNTAX_IMPLICIT_LAMBDAS.allowedInSource(source) || !varIndex ? + decisionTable[currentKind.index][newKind.index] : null; } } diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties index ad1d00a674a..e3c66bbb835 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -2832,6 +2832,9 @@ compiler.misc.feature.switch.expressions=\ compiler.misc.feature.raw.string.literals=\ raw string literals +compiler.misc.feature.var.syntax.in.implicit.lambda=\ + var syntax in implicit lambdas + compiler.warn.underscore.as.identifier=\ as of release 9, ''_'' is a keyword, and may not be used as an identifier diff --git a/test/langtools/tools/javac/diags/examples/VarInImplicitLambda.java b/test/langtools/tools/javac/diags/examples/VarInImplicitLambda.java new file mode 100644 index 00000000000..dea52c2a6d5 --- /dev/null +++ b/test/langtools/tools/javac/diags/examples/VarInImplicitLambda.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// key: compiler.misc.feature.var.syntax.in.implicit.lambda +// key: compiler.err.feature.not.supported.in.source.plural +// options: -source 10 -Xlint:-options + +import java.util.function.*; + +class VarInImplicitLambda { + IntBinaryOperator f2 = (var x, y) -> x + y; +} diff --git a/test/langtools/tools/javac/lambda/LambdaParserTest.java b/test/langtools/tools/javac/lambda/LambdaParserTest.java index d4db1c4862f..0e705603d5b 100644 --- a/test/langtools/tools/javac/lambda/LambdaParserTest.java +++ b/test/langtools/tools/javac/lambda/LambdaParserTest.java @@ -107,8 +107,8 @@ public class LambdaParserTest extends ComboInstance { } enum SourceKind { - SOURCE_9("9"), - SOURCE_10("10"); + SOURCE_10("10"), + SOURCE_11("11"); String sourceNumber; @@ -121,9 +121,9 @@ public class LambdaParserTest extends ComboInstance { IMPLICIT_1("", ExplicitKind.IMPLICIT), IMPLICIT_2("var", ExplicitKind.IMPLICIT_VAR), - EXPLIICT_SIMPLE("A", ExplicitKind.EXPLICIT), - EXPLIICT_SIMPLE_ARR1("A[]", ExplicitKind.EXPLICIT), - EXPLIICT_SIMPLE_ARR2("A[][]", ExplicitKind.EXPLICIT), + EXPLICIT_SIMPLE("A", ExplicitKind.EXPLICIT), + EXPLICIT_SIMPLE_ARR1("A[]", ExplicitKind.EXPLICIT), + EXPLICIT_SIMPLE_ARR2("A[][]", ExplicitKind.EXPLICIT), EXPLICIT_VARARGS("A...", ExplicitKind.EXPLICIT), EXPLICIT_GENERIC1("A", ExplicitKind.EXPLICIT), EXPLICIT_GENERIC2("A", ExplicitKind.EXPLICIT), @@ -157,13 +157,7 @@ public class LambdaParserTest extends ComboInstance { } ExplicitKind explicitKind(SourceKind sk) { - switch (explicitKind) { - case IMPLICIT_VAR: - return (sk == SourceKind.SOURCE_9) ? - ExplicitKind.EXPLICIT : ExplicitKind.IMPLICIT_VAR; - default: - return explicitKind; - } + return explicitKind; } } @@ -299,6 +293,15 @@ public class LambdaParserTest extends ComboInstance { errorExpected |= pn == LambdaParameterName.UNDERSCORE && lk.arity() > 0; + for (int i = 0; i < lk.arity(); i++) { + if (!lk.isShort() && + pks[i].explicitKind(sk) == LambdaParameterKind.ExplicitKind.IMPLICIT_VAR && + sk == SourceKind.SOURCE_10) { + errorExpected = true; + break; + } + } + if (errorExpected != res.hasErrors()) { fail("invalid diagnostics for source:\n" + res.compilationInfo() + diff --git a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java index 4a39be13cb1..c1a440c0e8a 100644 --- a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java +++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.java @@ -3,6 +3,7 @@ * @bug 8198512 8199327 * @summary compiler support for local-variable syntax for lambda parameters * @compile/fail/ref=VarInImplicitLambdaNegTest01.out -XDrawDiagnostics VarInImplicitLambdaNegTest01.java + * @compile/fail/ref=VarInImplicitLambdaNegTest01_source10.out -source 10 -XDrawDiagnostics VarInImplicitLambdaNegTest01.java */ import java.util.function.*; diff --git a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.out b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.out index 7aee5be36e0..19110e4ec4a 100644 --- a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.out +++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01.out @@ -1,6 +1,6 @@ -VarInImplicitLambdaNegTest01.java:11:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.implicit.not.allowed) VarInImplicitLambdaNegTest01.java:12:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.implicit.not.allowed) -VarInImplicitLambdaNegTest01.java:13:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.explicit.not.allowed) -VarInImplicitLambdaNegTest01.java:14:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.implicit.and.explicit.not.allowed) -VarInImplicitLambdaNegTest01.java:16:52: compiler.err.var.not.allowed.array +VarInImplicitLambdaNegTest01.java:13:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.implicit.not.allowed) +VarInImplicitLambdaNegTest01.java:14:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.var.and.explicit.not.allowed) +VarInImplicitLambdaNegTest01.java:15:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.implicit.and.explicit.not.allowed) +VarInImplicitLambdaNegTest01.java:17:52: compiler.err.var.not.allowed.array 5 errors diff --git a/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01_source10.out b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01_source10.out new file mode 100644 index 00000000000..8c325a59f3e --- /dev/null +++ b/test/langtools/tools/javac/var_implicit_lambda/VarInImplicitLambdaNegTest01_source10.out @@ -0,0 +1,6 @@ +- compiler.warn.source.no.bootclasspath: 10 +VarInImplicitLambdaNegTest01.java:12:36: compiler.err.feature.not.supported.in.source.plural: (compiler.misc.feature.var.syntax.in.implicit.lambda), 10, 11 +VarInImplicitLambdaNegTest01.java:15:28: compiler.err.invalid.lambda.parameter.declaration: (compiler.misc.implicit.and.explicit.not.allowed) +VarInImplicitLambdaNegTest01.java:17:52: compiler.err.var.not.allowed.here +3 errors +1 warning From 44a83147db4c421fd23c0b6caf3c3fac3bea369b Mon Sep 17 00:00:00 2001 From: Gilles Duboscq Date: Fri, 17 Aug 2018 12:19:52 +0200 Subject: [PATCH 007/124] 8209136: [JVMCI] Make sure volatile fields are read as volatile during constant reflection Reviewed-by: kvn --- .../HotSpotConstantReflectionProvider.java | 7 ++- .../HotSpotMemoryAccessProviderImpl.java | 51 +++++++++---------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java index 346f8aa7f80..32c84cedb17 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotConstantReflectionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -108,7 +108,6 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProv * Otherwise the generated code might be the only reference to the boxed value and since object * references from nmethods are weak this can cause GC problems. * - * @param source * @return true if the box is cached */ private static boolean isBoxCached(JavaConstant source) { @@ -182,13 +181,13 @@ public class HotSpotConstantReflectionProvider implements ConstantReflectionProv if (hotspotField.isStatic()) { HotSpotResolvedJavaType holder = (HotSpotResolvedJavaType) hotspotField.getDeclaringClass(); if (holder.isInitialized()) { - return memoryAccess.readFieldValue(hotspotField, holder.mirror()); + return memoryAccess.readFieldValue(hotspotField, holder.mirror(), field.isVolatile()); } } else { if (receiver.isNonNull()) { Object object = ((HotSpotObjectConstantImpl) receiver).object(); if (hotspotField.isInObject(receiver)) { - return memoryAccess.readFieldValue(hotspotField, object); + return memoryAccess.readFieldValue(hotspotField, object, field.isVolatile()); } } } diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java index a3dcd294bb2..925bcfb0d1e 100644 --- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java +++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -208,37 +208,34 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider { return ret; } - JavaConstant readFieldValue(HotSpotResolvedJavaField field, Object obj) { + JavaConstant readFieldValue(HotSpotResolvedJavaField field, Object obj, boolean isVolatile) { assert obj != null; assert !field.isStatic() || obj instanceof Class; long displacement = field.getOffset(); assert checkRead(field.getJavaKind(), displacement, (HotSpotResolvedObjectType) runtime.getHostJVMCIBackend().getMetaAccess().lookupJavaType(obj.getClass()), obj, runtime.getHostJVMCIBackend().getMetaAccess()); - if (field.getJavaKind() == JavaKind.Object) { - Object o = UNSAFE.getObject(obj, displacement); - return HotSpotObjectConstantImpl.forObject(o); - } else { - JavaKind kind = field.getJavaKind(); - switch (kind) { - case Boolean: - return JavaConstant.forBoolean(UNSAFE.getBoolean(obj, displacement)); - case Byte: - return JavaConstant.forByte(UNSAFE.getByte(obj, displacement)); - case Char: - return JavaConstant.forChar(UNSAFE.getChar(obj, displacement)); - case Short: - return JavaConstant.forShort(UNSAFE.getShort(obj, displacement)); - case Int: - return JavaConstant.forInt(UNSAFE.getInt(obj, displacement)); - case Long: - return JavaConstant.forLong(UNSAFE.getLong(obj, displacement)); - case Float: - return JavaConstant.forFloat(UNSAFE.getFloat(obj, displacement)); - case Double: - return JavaConstant.forDouble(UNSAFE.getDouble(obj, displacement)); - default: - throw new IllegalArgumentException("Unsupported kind: " + kind); - } + JavaKind kind = field.getJavaKind(); + switch (kind) { + case Boolean: + return JavaConstant.forBoolean(isVolatile ? UNSAFE.getBooleanVolatile(obj, displacement) : UNSAFE.getBoolean(obj, displacement)); + case Byte: + return JavaConstant.forByte(isVolatile ? UNSAFE.getByteVolatile(obj, displacement) : UNSAFE.getByte(obj, displacement)); + case Char: + return JavaConstant.forChar(isVolatile ? UNSAFE.getCharVolatile(obj, displacement) : UNSAFE.getChar(obj, displacement)); + case Short: + return JavaConstant.forShort(isVolatile ? UNSAFE.getShortVolatile(obj, displacement) : UNSAFE.getShort(obj, displacement)); + case Int: + return JavaConstant.forInt(isVolatile ? UNSAFE.getIntVolatile(obj, displacement) : UNSAFE.getInt(obj, displacement)); + case Long: + return JavaConstant.forLong(isVolatile ? UNSAFE.getLongVolatile(obj, displacement) : UNSAFE.getLong(obj, displacement)); + case Float: + return JavaConstant.forFloat(isVolatile ? UNSAFE.getFloatVolatile(obj, displacement) : UNSAFE.getFloat(obj, displacement)); + case Double: + return JavaConstant.forDouble(isVolatile ? UNSAFE.getDoubleVolatile(obj, displacement) : UNSAFE.getDouble(obj, displacement)); + case Object: + return HotSpotObjectConstantImpl.forObject(isVolatile ? UNSAFE.getObjectVolatile(obj, displacement) : UNSAFE.getObject(obj, displacement)); + default: + throw new IllegalArgumentException("Unsupported kind: " + kind); } } From 2c88ce1b89744119458f85f1d9c46659ee9adb01 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Thu, 4 Oct 2018 09:43:49 -0700 Subject: [PATCH 008/124] 8211677: Java resource copy and clean should use MakeTargetDir macro Reviewed-by: tbell, ihse --- make/common/JavaCompilation.gmk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk index a1cdd9264d7..2d85ba0bf61 100644 --- a/make/common/JavaCompilation.gmk +++ b/make/common/JavaCompilation.gmk @@ -76,8 +76,8 @@ define add_file_to_copy $1_COPY_$$($2_TARGET) := 1 # Now we can setup the dependency that will trigger the copying. $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2 - $(MKDIR) -p $$(@D) - $(CP) $$< $$@ + $$(call LogInfo, Copying $$(patsubst $(OUTPUTDIR)/%,%, $$@)) + $$(install-file) $(CHMOD) -f ug+w $$@ # And do not forget this target @@ -120,7 +120,8 @@ define add_file_to_clean ifneq ($$($1_CLEAN_$$($2_TARGET)), 1) $1_CLEAN_$$($2_TARGET) := 1 $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2 - $(MKDIR) -p $$(@D) + $$(call LogInfo, Cleaning $$(patsubst $(OUTPUTDIR)/%,%, $$@)) + $$(call MakeTargetDir) export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \ | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \ -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ ]*#.*/#/g' \ From 609d90e98ae5663ad4587812052a9b98e98078bb Mon Sep 17 00:00:00 2001 From: Vicente Romero Date: Thu, 4 Oct 2018 10:19:01 -0700 Subject: [PATCH 009/124] 8210789: langtools/tools/javac/T8152616.java missing @modules Reviewed-by: jjg --- test/langtools/tools/javac/T8152616.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/langtools/tools/javac/T8152616.java b/test/langtools/tools/javac/T8152616.java index 9b49f283152..e2c6d38eaf6 100644 --- a/test/langtools/tools/javac/T8152616.java +++ b/test/langtools/tools/javac/T8152616.java @@ -25,8 +25,8 @@ * @test * @bug 8152616 * @summary Unit test for corner case of PrettyPrinting when SourceOutput is false - * @run compile --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED T8152616.java - * @run main T8152616 + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.tree */ import java.io.File; From 46f0fa8c20382d19cb38d9af8d4b08ea2b3ca896 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Thu, 4 Oct 2018 13:02:58 -0700 Subject: [PATCH 010/124] 8206240: java.lang.Class.newInstance() is causing caller to leak Reviewed-by: alanb --- .../share/classes/java/lang/Class.java | 29 ++---- .../java/lang/reflect/AccessibleObject.java | 89 +++++++++++++------ .../java/lang/reflect/Constructor.java | 17 +++- .../java/lang/reflect/ReflectAccess.java | 6 ++ .../internal/reflect/LangReflectAccess.java | 4 + .../internal/reflect/ReflectionFactory.java | 6 ++ .../lang/StackWalker/ReflectionFrames.java | 71 +++++++++++---- .../lang/reflect/callerCache/AccessTest.java | 7 ++ .../ReflectionCallerCacheTest.java | 3 +- test/jdk/jdk/modules/open/Basic.java | 37 ++++++++ 10 files changed, 198 insertions(+), 71 deletions(-) diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java index 8203e07c320..904ace62070 100644 --- a/src/java.base/share/classes/java/lang/Class.java +++ b/src/java.base/share/classes/java/lang/Class.java @@ -64,7 +64,6 @@ import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.loader.BootLoader; import jdk.internal.loader.BuiltinClassLoader; import jdk.internal.misc.Unsafe; -import jdk.internal.misc.VM; import jdk.internal.module.Resources; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.ConstantPool; @@ -540,11 +539,9 @@ public final class Class implements java.io.Serializable, checkMemberAccess(sm, Member.PUBLIC, Reflection.getCallerClass(), false); } - // NOTE: the following code may not be strictly correct under - // the current Java memory model. - // Constructor lookup - if (cachedConstructor == null) { + Constructor tmpConstructor = cachedConstructor; + if (tmpConstructor == null) { if (this == Class.class) { throw new IllegalAccessException( "Can not call newInstance() on the Class for java.lang.Class" @@ -555,9 +552,7 @@ public final class Class implements java.io.Serializable, final Constructor c = getReflectionFactory().copyConstructor( getConstructor0(empty, Member.DECLARED)); // Disable accessibility checks on the constructor - // since we have to do the security check here anyway - // (the stack depth is wrong for the Constructor's - // security check to work) + // access check is done with the true caller java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<>() { public Void run() { @@ -565,32 +560,24 @@ public final class Class implements java.io.Serializable, return null; } }); - cachedConstructor = c; + cachedConstructor = tmpConstructor = c; } catch (NoSuchMethodException e) { throw (InstantiationException) new InstantiationException(getName()).initCause(e); } } - Constructor tmpConstructor = cachedConstructor; - // Security check (same as in java.lang.reflect.Constructor) - Class caller = Reflection.getCallerClass(); - if (newInstanceCallerCache != caller) { - int modifiers = tmpConstructor.getModifiers(); - Reflection.ensureMemberAccess(caller, this, this, modifiers); - newInstanceCallerCache = caller; - } - // Run constructor + try { - return tmpConstructor.newInstance((Object[])null); + Class caller = Reflection.getCallerClass(); + return getReflectionFactory().newInstance(tmpConstructor, null, caller); } catch (InvocationTargetException e) { Unsafe.getUnsafe().throwException(e.getTargetException()); // Not reached return null; } } - private transient volatile Constructor cachedConstructor; - private transient volatile Class newInstanceCallerCache; + private transient volatile Constructor cachedConstructor; /** * Determines if the specified {@code Object} is assignment-compatible diff --git a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java index bebdd357b14..9baffbe7733 100644 --- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java +++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java @@ -27,6 +27,7 @@ package java.lang.reflect; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; +import java.lang.ref.WeakReference; import java.security.AccessController; import jdk.internal.misc.VM; @@ -567,21 +568,68 @@ public class AccessibleObject implements AnnotatedElement { // Shared access checking logic. // For non-public members or members in package-private classes, - // it is necessary to perform somewhat expensive security checks. - // If the security check succeeds for a given class, it will + // it is necessary to perform somewhat expensive access checks. + // If the access check succeeds for a given class, it will // always succeed (it is not affected by the granting or revoking // of permissions); we speed up the check in the common case by // remembering the last Class for which the check succeeded. // - // The simple security check for Constructor is to see if + // The simple access check for Constructor is to see if // the caller has already been seen, verified, and cached. - // (See also Class.newInstance(), which uses a similar method.) // - // A more complicated security check cache is needed for Method and Field - // The cache can be either null (empty cache), a 2-array of {caller,targetClass}, + // A more complicated access check cache is needed for Method and Field + // The cache can be either null (empty cache), {caller,targetClass} pair, // or a caller (with targetClass implicitly equal to memberClass). - // In the 2-array case, the targetClass is always different from the memberClass. - volatile Object securityCheckCache; + // In the {caller,targetClass} case, the targetClass is always different + // from the memberClass. + volatile Object accessCheckCache; + + private static class Cache { + final WeakReference> callerRef; + final WeakReference> targetRef; + + Cache(Class caller, Class target) { + this.callerRef = new WeakReference<>(caller); + this.targetRef = new WeakReference<>(target); + } + + boolean isCacheFor(Class caller, Class refc) { + return callerRef.get() == caller && targetRef.get() == refc; + } + + static Object protectedMemberCallerCache(Class caller, Class refc) { + return new Cache(caller, refc); + } + } + + /* + * Returns true if the previous access check was verified for the + * given caller accessing a protected member with an instance of + * the given targetClass where the target class is different than + * the declaring member class. + */ + private boolean isAccessChecked(Class caller, Class targetClass) { + Object cache = accessCheckCache; // read volatile + if (cache instanceof Cache) { + return ((Cache) cache).isCacheFor(caller, targetClass); + } + return false; + } + + /* + * Returns true if the previous access check was verified for the + * given caller accessing a static member or an instance member of + * the target class that is the same as the declaring member class. + */ + private boolean isAccessChecked(Class caller) { + Object cache = accessCheckCache; // read volatile + if (cache instanceof WeakReference) { + @SuppressWarnings("unchecked") + WeakReference> ref = (WeakReference>) cache; + return ref.get() == caller; + } + return false; + } final void checkAccess(Class caller, Class memberClass, Class targetClass, int modifiers) @@ -603,21 +651,13 @@ public class AccessibleObject implements AnnotatedElement { if (caller == memberClass) { // quick check return true; // ACCESS IS OK } - Object cache = securityCheckCache; // read volatile if (targetClass != null // instance member or constructor && Modifier.isProtected(modifiers) && targetClass != memberClass) { - // Must match a 2-list of { caller, targetClass }. - if (cache instanceof Class[]) { - Class[] cache2 = (Class[]) cache; - if (cache2[1] == targetClass && - cache2[0] == caller) { - return true; // ACCESS IS OK - } - // (Test cache[1] first since range check for [1] - // subsumes range check for [0].) + if (isAccessChecked(caller, targetClass)) { + return true; // ACCESS IS OK } - } else if (cache == caller) { + } else if (isAccessChecked(caller)) { // Non-protected case (or targetClass == memberClass or static member). return true; // ACCESS IS OK } @@ -642,14 +682,9 @@ public class AccessibleObject implements AnnotatedElement { Object cache = (targetClass != null && Modifier.isProtected(modifiers) && targetClass != memberClass) - ? new Class[] { caller, targetClass } - : caller; - - // Note: The two cache elements are not volatile, - // but they are effectively final. The Java memory model - // guarantees that the initializing stores for the cache - // elements will occur before the volatile write. - securityCheckCache = cache; // write volatile + ? Cache.protectedMemberCallerCache(caller, targetClass) + : new WeakReference<>(caller); + accessCheckCache = cache; // write volatile return true; } diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java index 2d7a8160ba5..49184d0dc4c 100644 --- a/src/java.base/share/classes/java/lang/reflect/Constructor.java +++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java @@ -476,18 +476,27 @@ public final class Constructor extends Executable { throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { - if (!override) { - Class caller = Reflection.getCallerClass(); + Class caller = override ? null : Reflection.getCallerClass(); + return newInstanceWithCaller(initargs, !override, caller); + } + + /* package-private */ + T newInstanceWithCaller(Object[] args, boolean checkAccess, Class caller) + throws InstantiationException, IllegalAccessException, + InvocationTargetException + { + if (checkAccess) checkAccess(caller, clazz, clazz, modifiers); - } + if ((clazz.getModifiers() & Modifier.ENUM) != 0) throw new IllegalArgumentException("Cannot reflectively create enum objects"); + ConstructorAccessor ca = constructorAccessor; // read volatile if (ca == null) { ca = acquireConstructorAccessor(); } @SuppressWarnings("unchecked") - T inst = (T) ca.newInstance(initargs); + T inst = (T) ca.newInstance(args); return inst; } diff --git a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java index 754b8bf2be9..dd84d0abd38 100644 --- a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java +++ b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java @@ -159,4 +159,10 @@ class ReflectAccess implements jdk.internal.reflect.LangReflectAccess { public T getRoot(T obj) { return (T) obj.getRoot(); } + + public T newInstance(Constructor ctor, Object[] args, Class caller) + throws IllegalAccessException, InstantiationException, InvocationTargetException + { + return ctor.newInstanceWithCaller(args, true, caller); + } } diff --git a/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java b/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java index 38ccbcc4a5c..9a80e913b25 100644 --- a/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java +++ b/src/java.base/share/classes/jdk/internal/reflect/LangReflectAccess.java @@ -118,4 +118,8 @@ public interface LangReflectAccess { /** Gets the root of the given AccessibleObject object; null if arg is the root */ public T getRoot(T obj); + + /** Returns a new instance created by the given constructor with access check */ + public T newInstance(Constructor ctor, Object[] args, Class caller) + throws IllegalAccessException, InstantiationException, InvocationTargetException; } diff --git a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java index 4b2f43868a1..cf88992a63f 100644 --- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java +++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java @@ -398,6 +398,12 @@ public class ReflectionFactory { return langReflectAccess().getExecutableSharedParameterTypes(ex); } + public T newInstance(Constructor ctor, Object[] args, Class caller) + throws IllegalAccessException, InstantiationException, InvocationTargetException + { + return langReflectAccess().newInstance(ctor, args, caller); + } + //-------------------------------------------------------------------------- // // Routines used by serialization diff --git a/test/jdk/java/lang/StackWalker/ReflectionFrames.java b/test/jdk/java/lang/StackWalker/ReflectionFrames.java index eacc55fe92b..5a9ea78389f 100644 --- a/test/jdk/java/lang/StackWalker/ReflectionFrames.java +++ b/test/jdk/java/lang/StackWalker/ReflectionFrames.java @@ -48,6 +48,16 @@ import static org.testng.Assert.*; public class ReflectionFrames { final static boolean verbose = false; + final static Class REFLECT_ACCESS = findClass("java.lang.reflect.ReflectAccess"); + final static Class REFLECTION_FACTORY = findClass("jdk.internal.reflect.ReflectionFactory"); + + private static Class findClass(String cn) { + try { + return Class.forName(cn); + } catch (ClassNotFoundException e) { + throw new AssertionError(e); + } + } /** * This test invokes new StackInspector() directly from @@ -326,6 +336,8 @@ public class ReflectionFrames { assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", + Constructor.class.getName() + +"::newInstanceWithCaller", Constructor.class.getName() +"::newInstance", StackInspector.Caller.class.getName() @@ -354,6 +366,8 @@ public class ReflectionFrames { assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", + Constructor.class.getName() + +"::newInstanceWithCaller", Constructor.class.getName() +"::newInstance", StackInspector.Caller.class.getName() @@ -386,6 +400,8 @@ public class ReflectionFrames { assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", + Constructor.class.getName() + +"::newInstanceWithCaller", Constructor.class.getName() +"::newInstance", StackInspector.Caller.class.getName() @@ -436,15 +452,19 @@ public class ReflectionFrames { assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", + REFLECT_ACCESS.getName() + +"::newInstance", + REFLECTION_FACTORY.getName() + +"::newInstance", Class.class.getName() +"::newInstance", StackInspector.Caller.class.getName() +"::create", ReflectionFrames.class.getName() +"::testNewInstance")); - // Because Class.newInstance is not filtered, then the - // caller is Class.class - assertEquals(obj.cls, Class.class); + // Because implementation frames are not filtered, then the + // caller is ReflectAccess.class + assertEquals(obj.cls, REFLECT_ACCESS); assertEquals(obj.filtered, 0); // Calls the StackInspector.reflect method through reflection @@ -464,6 +484,10 @@ public class ReflectionFrames { assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", + REFLECT_ACCESS.getName() + +"::newInstance", + REFLECTION_FACTORY.getName() + +"::newInstance", Class.class.getName() +"::newInstance", StackInspector.Caller.class.getName() @@ -473,9 +497,9 @@ public class ReflectionFrames { ReflectionFrames.class.getName() +"::testNewInstance")); - // Because Class.newInstance is not filtered, then the - // caller is Class.class - assertEquals(obj.cls, Class.class); + // Because implementation frames are not filtered, then the + // caller is ReflectAccess.class + assertEquals(obj.cls, REFLECT_ACCESS); assertEquals(obj.filtered, 0); // Calls the StackInspector.handle method through reflection @@ -495,6 +519,10 @@ public class ReflectionFrames { assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", + REFLECT_ACCESS.getName() + +"::newInstance", + REFLECTION_FACTORY.getName() + +"::newInstance", Class.class.getName() +"::newInstance", StackInspector.Caller.class.getName() @@ -504,9 +532,9 @@ public class ReflectionFrames { ReflectionFrames.class.getName() +"::testNewInstance")); - // Because Class.newInstance is not filtered, then the - // caller is Class.class - assertEquals(obj.cls, Class.class); + // Because implementation frames are not filtered, then the + // caller is ReflectAccess.class + assertEquals(obj.cls, REFLECT_ACCESS); assertEquals(obj.filtered, 0); // Sets a non-default walker configured to show @@ -529,6 +557,8 @@ public class ReflectionFrames { List.of(StackInspector.class.getName() +"::", Constructor.class.getName() + +"::newInstanceWithCaller", + REFLECT_ACCESS.getName() +"::newInstance", Class.class.getName() +"::newInstance", @@ -538,9 +568,9 @@ public class ReflectionFrames { +"::invoke", ReflectionFrames.class.getName() +"::testNewInstance")); - // Because Class.newInstance is not filtered, then the - // caller is Class.class - assertEquals(obj.cls, Class.class); + // Because implementation frames are not filtered, then the + // caller is ReflectAccess.class + assertEquals(obj.cls, REFLECT_ACCESS); assertNotEquals(obj.filtered, 0); // Calls the StackInspector.reflect method through reflection @@ -557,10 +587,13 @@ public class ReflectionFrames { obj = ((StackInspector)StackInspector.Caller.class .getMethod("reflect", How.class) .invoke(null, How.CLASS)); + System.out.println(obj.collectedFrames); assertEquals(obj.collectedFrames, List.of(StackInspector.class.getName() +"::", Constructor.class.getName() + +"::newInstanceWithCaller", + REFLECT_ACCESS.getName() +"::newInstance", Class.class.getName() +"::newInstance", @@ -575,9 +608,9 @@ public class ReflectionFrames { ReflectionFrames.class.getName() +"::testNewInstance")); - // Because Class.newInstance is not filtered, then the - // caller is Class.class - assertEquals(obj.cls, Class.class); + // Because implementation frames are not filtered, then the + // caller is ReflectAccess.class + assertEquals(obj.cls, REFLECT_ACCESS); assertNotEquals(obj.filtered, 0); // Calls the StackInspector.handle method through reflection @@ -598,6 +631,8 @@ public class ReflectionFrames { List.of(StackInspector.class.getName() +"::", Constructor.class.getName() + +"::newInstanceWithCaller", + REFLECT_ACCESS.getName() +"::newInstance", Class.class.getName() +"::newInstance", @@ -611,9 +646,9 @@ public class ReflectionFrames { ReflectionFrames.class.getName() +"::testNewInstance")); - // Because Class.newInstance is not filtered, then the - // caller is Class.class - assertEquals(obj.cls, Class.class); + // Because implementation frames are not filtered, then the + // caller is ReflectAccess.class + assertEquals(obj.cls, REFLECT_ACCESS); assertNotEquals(obj.filtered, 0); } diff --git a/test/jdk/java/lang/reflect/callerCache/AccessTest.java b/test/jdk/java/lang/reflect/callerCache/AccessTest.java index cab7fd96744..0037d81732d 100644 --- a/test/jdk/java/lang/reflect/callerCache/AccessTest.java +++ b/test/jdk/java/lang/reflect/callerCache/AccessTest.java @@ -149,4 +149,11 @@ public class AccessTest { super("privateStaticFinalField"); } } + + public static class NewInstance implements Callable { + public Object call() throws Exception { + return Members.class.newInstance(); + } + } + } diff --git a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java index a6e9da08806..2f8dafaf754 100644 --- a/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java +++ b/test/jdk/java/lang/reflect/callerCache/ReflectionCallerCacheTest.java @@ -77,7 +77,8 @@ public class ReflectionCallerCacheTest { { "AccessTest$PublicFinalField"}, { "AccessTest$PrivateFinalField"}, { "AccessTest$PublicStaticFinalField"}, - { "AccessTest$PrivateStaticFinalField"} + { "AccessTest$PrivateStaticFinalField"}, + { "AccessTest$NewInstance"} }; } diff --git a/test/jdk/jdk/modules/open/Basic.java b/test/jdk/jdk/modules/open/Basic.java index 27c54902c5b..ade1fe3ec86 100644 --- a/test/jdk/jdk/modules/open/Basic.java +++ b/test/jdk/jdk/modules/open/Basic.java @@ -98,6 +98,9 @@ public class Basic { ctor.setAccessible(true); ctor.newInstance(); + // Class::newInstance + clazz.newInstance(); + // method handles findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); findNoArgConstructorAndInvoke(clazz, MethodHandles.lookup()); @@ -122,6 +125,12 @@ public class Basic { ctor.setAccessible(true); ctor.newInstance(); + // Class::newInstance + try { + clazz.newInstance(); + assertTrue(false); + } catch (IllegalAccessException expected) { } + // method handles try { findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); @@ -150,6 +159,9 @@ public class Basic { ctor.setAccessible(true); ctor.newInstance(); + // Class::newInstance + clazz.newInstance(); + // method handles findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); findNoArgConstructorAndInvoke(clazz, MethodHandles.lookup()); @@ -174,6 +186,12 @@ public class Basic { ctor.setAccessible(true); ctor.newInstance(); + // Class::newInstance + try { + clazz.newInstance(); + assertTrue(false); + } catch (IllegalAccessException expected) { } + // method handles try { findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); @@ -200,6 +218,7 @@ public class Basic { // core reflection Class clazz = q.PublicType.class; clazz.getConstructor().newInstance(); + clazz.newInstance(); // method handles findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); @@ -226,6 +245,12 @@ public class Basic { ctor.setAccessible(true); ctor.newInstance(); + // Class::newInstance + try { + clazz.newInstance(); + assertTrue(false); + } catch (IllegalAccessException expected) { } + // method handles try { findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); @@ -256,6 +281,12 @@ public class Basic { assertTrue(false); } catch (InaccessibleObjectException expected) { } + // Class::newInstance + try { + clazz.newInstance(); + assertTrue(false); + } catch (IllegalAccessException expected) { } + // method handles try { findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); @@ -288,6 +319,12 @@ public class Basic { assertTrue(false); } catch (InaccessibleObjectException expected) { } + // Class::newInstance + try { + clazz.newInstance(); + assertTrue(false); + } catch (IllegalAccessException expected) { } + // method handles try { findNoArgConstructorAndInvoke(clazz, MethodHandles.publicLookup()); From 271e3be381caeda89b33a8ba2b1c6f705d5379c4 Mon Sep 17 00:00:00 2001 From: Naoto Sato Date: Thu, 4 Oct 2018 14:12:34 -0700 Subject: [PATCH 011/124] 8211398: Square character support for the Japanese new era Reviewed-by: rriggs --- make/data/unicodedata/UnicodeData.txt | 1 + .../share/classes/java/lang/Character.java | 4 ++-- test/jdk/java/lang/Character/Scripts.txt | 1 + test/jdk/java/lang/Character/UnicodeData.txt | 1 + test/jdk/java/lang/Character/charprop00.bin | Bin 1048617 -> 1048617 bytes 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/make/data/unicodedata/UnicodeData.txt b/make/data/unicodedata/UnicodeData.txt index d89c64f526a..e9814761e70 100644 --- a/make/data/unicodedata/UnicodeData.txt +++ b/make/data/unicodedata/UnicodeData.txt @@ -11729,6 +11729,7 @@ 32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;; 32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;; 32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;; +32FF;SQUARE ERA NAME NEWERA;So;0;L; 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;; 3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; 3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; 3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java index f655f89165e..0ed379442f6 100644 --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -5385,7 +5385,7 @@ class Character implements java.io.Serializable, Comparable { 0x3260, // 3260..327E; HANGUL 0x327F, // 327F..32CF; COMMON 0x32D0, // 32D0..32FE; KATAKANA - 0x32FF, // 32FF ; UNKNOWN + 0x32FF, // 32FF ; COMMON 0x3300, // 3300..3357; KATAKANA 0x3358, // 3358..33FF; COMMON 0x3400, // 3400..4DB5; HAN @@ -6902,7 +6902,7 @@ class Character implements java.io.Serializable, Comparable { HANGUL, // 3260..327E COMMON, // 327F..32CF KATAKANA, // 32D0..32FE - UNKNOWN, // 32FF + COMMON, // 32FF KATAKANA, // 3300..3357 COMMON, // 3358..33FF HAN, // 3400..4DB5 diff --git a/test/jdk/java/lang/Character/Scripts.txt b/test/jdk/java/lang/Character/Scripts.txt index 80430b32a8f..794ef91a888 100644 --- a/test/jdk/java/lang/Character/Scripts.txt +++ b/test/jdk/java/lang/Character/Scripts.txt @@ -402,6 +402,7 @@ 328A..32B0 ; Common # So [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT 32B1..32BF ; Common # No [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY 32C0..32CF ; Common # So [16] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..LIMITED LIABILITY SIGN +32FF ; Common # So SQUARE ERA NAME NEWERA 3358..33FF ; Common # So [168] IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO..SQUARE GAL 4DC0..4DFF ; Common # So [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION A700..A716 ; Common # Sk [23] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR diff --git a/test/jdk/java/lang/Character/UnicodeData.txt b/test/jdk/java/lang/Character/UnicodeData.txt index d89c64f526a..e9814761e70 100644 --- a/test/jdk/java/lang/Character/UnicodeData.txt +++ b/test/jdk/java/lang/Character/UnicodeData.txt @@ -11729,6 +11729,7 @@ 32FC;CIRCLED KATAKANA WI;So;0;L; 30F0;;;;N;;;;; 32FD;CIRCLED KATAKANA WE;So;0;L; 30F1;;;;N;;;;; 32FE;CIRCLED KATAKANA WO;So;0;L; 30F2;;;;N;;;;; +32FF;SQUARE ERA NAME NEWERA;So;0;L; 5143 53F7;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME NEWERA;;;; 3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;; 3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;; 3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;; diff --git a/test/jdk/java/lang/Character/charprop00.bin b/test/jdk/java/lang/Character/charprop00.bin index fb3f2658b3aefc78ffc60ac54a6bf436bee71bfe..5174850ce6992b53bcbac8c3359ce8b45b4f5009 100644 GIT binary patch delta 87 zcmZ44;IOj6fpg7U2G$Y=ZbPF+&Q?ywR!*j^oXnyI%uF0I?TQA>K+FQftU$~L#Oy%K a0mPg@%mu{UK+FTgygK+FQftU$~L#Oy%K a0mPg@%mu{UK+FTgyg Date: Fri, 5 Oct 2018 07:54:28 +0200 Subject: [PATCH 012/124] 8210459: Add support for generating compile_commands.json Reviewed-by: erikj, ihse --- make/CompileCommands.gmk | 60 +++++++++++++++++ make/Main.gmk | 49 +++++++++++++- make/ModuleWrapper.gmk | 8 ++- make/common/JdkNativeCompilation.gmk | 23 +++++++ make/common/NativeCompilation.gmk | 68 ++++++++++++++++---- make/conf/jib-profiles.js | 2 +- make/hotspot/lib/CompileJvm.gmk | 96 +++++++++++++++------------- make/launcher/Launcher-jdk.pack.gmk | 10 +-- make/launcher/LauncherCommon.gmk | 6 +- make/lib/Awt2dLibraries.gmk | 4 +- make/lib/Lib-jdk.accessibility.gmk | 2 +- make/lib/LibCommon.gmk | 18 ------ test/make/TestCompileCommands.gmk | 54 ++++++++++++++++ test/make/TestMake.gmk | 5 +- 14 files changed, 309 insertions(+), 96 deletions(-) create mode 100644 make/CompileCommands.gmk create mode 100644 test/make/TestCompileCommands.gmk diff --git a/make/CompileCommands.gmk b/make/CompileCommands.gmk new file mode 100644 index 00000000000..ad729830e53 --- /dev/null +++ b/make/CompileCommands.gmk @@ -0,0 +1,60 @@ +# +# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +default: all + +include $(SPEC) +include MakeBase.gmk + +# When FIXPATH is set, let it process the file to make sure all paths are usable +# by system native tools. The FIXPATH tool assumes arguments preceeded by an @ +# character points to a text file containing further arguments (similar to a +# linker). It replaces any such arguments with a different temporary filename, +# whose contents has been processed to make any paths native. To obtain a +# properly processed compile_commands.json, FIXPATH is then made to invoke an +# AWK script with the unprocessed json file as the only argument, prepended with +# an @ character. The AWK script simply copies the contents of this processed +# file. +# +# The sed command encloses the fragments inside brackets and removes the final +# trailing comma. +$(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-commands/*.json) + $(call LogWarn, Updating compile_commands.json) + $(RM) $@ + $(FIND) $(MAKESUPPORT_OUTPUTDIR)/compile-commands/ -name \*.json | \ + $(SORT) | $(XARGS) $(CAT) >> $@.tmp + $(if $(FIXPATH),$(FIXPATH) $(AWK) 'BEGIN { \ + tmpfile = substr(ARGV[2],2); \ + cmd = "$(CP) " "\047" tmpfile "\047" " $@.tmp"; \ + system(cmd); \ + }' -- @$@.tmp) + $(SED) -e '1s/^/[\$(NEWLINE)/' -e '$(DOLLAR)s/,\s\{0,\}$(DOLLAR)/\$(NEWLINE)]/' $@.tmp > $@ + $(RM) $@.tmp + +TARGETS += $(OUTPUTDIR)/compile_commands.json + +all: $(TARGETS) + +.PHONY: all diff --git a/make/Main.gmk b/make/Main.gmk index 3b957d2c979..d16463910bc 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -262,6 +262,31 @@ hotspot-ide-project: ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \ $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-ide-project +################################################################################ +# Generate libs and launcher targets for creating compile_commands.json fragments +define DeclareCompileCommandsRecipe + $1-compile-commands: + $$(call LogInfo, Generating compile_commands.json fragments for $1) + +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk $1-only \ + GENERATE_COMPILE_COMMANDS_ONLY=true) + + COMPILE_COMMANDS_TARGETS_$2 += $1-compile-commands +endef + +$(foreach t, $(HOTSPOT_VARIANT_LIBS_TARGETS), \ + $(eval $(call DeclareCompileCommandsRecipe,$t,HOTSPOT)) \ +) + +$(foreach t, $(LIBS_TARGETS) $(LAUNCHER_TARGETS), \ + $(eval $(call DeclareCompileCommandsRecipe,$t,JDK)) \ +) + +compile-commands compile-commands-hotspot: + +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileCommands.gmk) + +ALL_TARGETS += $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK) +ALL_TARGETS += compile-commands compile-commands-hotspot + ################################################################################ # Build demos targets @@ -559,8 +584,12 @@ test-jdk-jtreg-native: test-make: ($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET)) +test-compile-commands: + ($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk test-compile-commands) + ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \ - test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make + test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make \ + test-compile-commands ################################################################################ # Bundles @@ -735,6 +764,20 @@ else $(foreach m, $(ALL_MODULES), $(eval $m-jmod: $($(m)_JMOD_DEPS))) $(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $m-interim-jmod: $($(m)_JMOD_DEPS))) + # Setup the minimal set of generated native source dependencies for hotspot + $(foreach v, $(JVM_VARIANTS), \ + $(eval hotspot-$v-libs-compile-commands: hotspot-$v-gensrc) \ + $(foreach m, $(filter java.desktop jdk.hotspot.agent, $(GENSRC_MODULES)), \ + $(eval hotspot-$v-libs-compile-commands: $m-gensrc)) \ + ) + + # For the full JDK compile commands, create all possible generated sources + $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc)) + $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java)) + + compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) + compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK) + # Jmods cannot be created until we have the jmod tool ready to run. During # a normal build we run it from the exploded image, but when cross compiling # it's run from the buildjdk, which is either created at build time or user @@ -849,6 +892,8 @@ else test-make: clean-test-make + test-compile-commands: compile-commands + build-test-lib: exploded-image-optimize build-test-failure-handler: interim-langtools @@ -1071,7 +1116,7 @@ CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \ # Remove everything, except the output from configure. clean: $(CLEAN_DIR_TARGETS) - ($(CD) $(OUTPUTDIR) && $(RM) -r build*.log*) + ($(CD) $(OUTPUTDIR) && $(RM) -r build*.log* compile_commands.json) $(ECHO) Cleaned all build artifacts. clean-docs: diff --git a/make/ModuleWrapper.gmk b/make/ModuleWrapper.gmk index dd6a8afebf1..5f9c5fc82ec 100644 --- a/make/ModuleWrapper.gmk +++ b/make/ModuleWrapper.gmk @@ -100,5 +100,9 @@ $(eval $(call SetupCopyFiles, COPY_CONF, \ $(TARGETS)), \ )) -all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \ - $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB) +ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) + all: $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS)) +else + all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \ + $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB) +endif diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk index bf09d4875e5..c1c0a4323cd 100644 --- a/make/common/JdkNativeCompilation.gmk +++ b/make/common/JdkNativeCompilation.gmk @@ -47,6 +47,29 @@ FindSrcDirsForComponent += \ $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \ $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2))) +# Find a library +# Param 1 - module name +# Param 2 - library name +# Param 3 - optional subdir for library +FindLib = \ + $(call FindLibDirForModule, \ + $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX) + +# Find a static library +# Param 1 - module name +# Param 2 - library name +# Param 3 - optional subdir for library +FindStaticLib = \ + $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \ + $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX)) + +# If only generating compile_commands.json, make these return empty to avoid +# declaring dependencies. +ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) + FindLib = + FindStaticLib = +endif + GetJavaHeaderDir = \ $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)) diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index f90022ce2ff..7b409256870 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -59,6 +59,29 @@ define GetSymbols fi endef +################################################################################ +# Creates a recipe that creates a compile_commands.json fragment. Remove any +# occurences of FIXPATH programs from the command to show the actual invocation. +# +# Param 1: Name of file to create +# Param 2: Working directory +# Param 3: Source file +# Param 4: Compile command +# Param 5: Object name +################################################################################ +define WriteCompileCommandsFragment + $(call LogInfo, Creating compile commands fragment for $(notdir $3)) + $(call MakeDir, $(dir $1)) + $(call WriteFile,{ \ + "directory": "$(strip $2)"$(COMMA) \ + "file": "$(strip $3)"$(COMMA) \ + "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\,\ + $(subst $(FIXPATH),,$4))))"$(COMMA) \ + "output": "$(strip $5)" \ + }$(COMMA), \ + $1) +endef + ################################################################################ # Define a native toolchain configuration that can be used by # SetupNativeCompilation calls @@ -203,6 +226,11 @@ define SetupCompileNativeFileBody $1_OBJ := $$($$($1_BASE)_OBJECT_DIR)/$$(call replace_with_obj_extension, \ $$($1_FILENAME)) + # Generate the corresponding compile_commands.json fragment. + $1_OBJ_JSON = $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \ + $$(OUTPUTDIR)/,,$$($1_OBJ))).json + $$($1_BASE)_ALL_OBJS_JSON += $$($1_OBJ_JSON) + # Only continue if this object file hasn't been processed already. This lets # the first found source file override any other with the same name. ifeq ($$(findstring $$($1_OBJ), $$($$($1_BASE)_OBJS_SO_FAR)), ) @@ -297,8 +325,15 @@ define SetupCompileNativeFileBody $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_OBJ).vardeps) endif - $$($1_OBJ): $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \ - $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE) | $$($$($1_BASE)_BUILD_INFO) + $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \ + $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE) + $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE) + + $$($1_OBJ_JSON): $$($1_OBJ_DEPS) + $$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \ + $$($1_COMPILER) $$($1_COMPILE_OPTIONS), $$($1_OBJ)) + + $$($1_OBJ): $$($1_OBJ_DEPS) | $$($$($1_BASE)_BUILD_INFO) $$(call LogInfo, Compiling $$($1_FILENAME) (for $$($$($1_BASE)_BASENAME))) $$(call MakeDir, $$(@D)) ifneq ($(TOOLCHAIN_TYPE), microsoft) @@ -307,13 +342,11 @@ define SetupCompileNativeFileBody # object file in the generated deps files. Fixing it with sed. If # compiling assembly, don't try this. $$(call ExecuteWithLog, $$@, \ - $$($1_COMPILER) $$($1_FLAGS) $$($1_DEP_FLAG) $$($1_DEP).tmp \ - $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)) + $$($1_COMPILER) $$($1_DEP_FLAG) $$($1_DEP).tmp $$($1_COMPILE_OPTIONS)) $(SED) 's|^$$(@F):|$$@:|' $$($1_DEP).tmp > $$($1_DEP) else $$(call ExecuteWithLog, $$@, \ - $$($1_COMPILER) $$($1_FLAGS) $$($1_DEP_FLAG) $$($1_DEP) \ - $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)) + $$($1_COMPILER) $$($1_DEP_FLAG) $$($1_DEP) $$($1_COMPILE_OPTIONS)) endif # Create a dependency target file from the dependency file. # Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/ @@ -329,8 +362,7 @@ define SetupCompileNativeFileBody # on Windows. No need to save exit code from compilation since # pipefail is always active on Windows. $$(call ExecuteWithLog, $$@, \ - $$($1_COMPILER) $$($1_FLAGS) -showIncludes \ - $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)) \ + $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS)) \ | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \ -e "^$$($1_FILENAME)$$$$" || test "$$$$?" = "1" ; \ $(ECHO) $$@: \\ > $$($1_DEP) ; \ @@ -694,17 +726,25 @@ define SetupNativeCompilationBody -include $$($1_PCH_DEP) -include $$($1_PCH_DEP_TARGETS) + $1_PCH_COMMAND := $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \ + $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP) + $$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE) $$(call LogInfo, Generating precompiled header) $$(call MakeDir, $$(@D)) - $$(call ExecuteWithLog, $$@, \ - $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \ - $$($1_OPT_CFLAGS) \ - -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP) $$< -o $$@) + $$(call ExecuteWithLog, $$@, $$($1_PCH_COMMAND) $$< -o $$@) $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEP) > $$($1_PCH_DEP_TARGETS) $$($1_ALL_OBJS): $$($1_PCH_FILE) + # Generate the corresponding compile_commands.json fragment. + $1_PCH_FILE_JSON := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \ + $$(OUTPUTDIR)/,,$$($1_PCH_FILE))).json + $1_ALL_OBJS_JSON += $$($1_PCH_FILE_JSON) + + $$($1_PCH_FILE_JSON): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE) + $$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$<, \ + $$($1_PCH_COMMAND) $$< -o $$($1_PCH_FILE), $$($1_PCH_FILE)) endif endif endif @@ -1025,6 +1065,10 @@ define SetupNativeCompilationBody endif endif endif + + ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) + $1 := $$($1_ALL_OBJS_JSON) + endif endef endif # _NATIVE_COMPILATION_GMK diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 916c46cc6ec..a3285c234fb 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -522,7 +522,7 @@ var getJibProfilesProfiles = function (input, common, data) { .forEach(function (name) { var maketestName = name + "-testmake"; profiles[maketestName] = concatObjects(profiles[name], testmakeBase); - profiles[maketestName].default_make_targets = [ "test-make" ]; + profiles[maketestName].default_make_targets = [ "test-make", "test-compile-commands" ]; }); // Profiles for building the zero jvm variant. These are used for verification. diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk index 002db8f6c73..45c30e9a3c1 100644 --- a/make/hotspot/lib/CompileJvm.gmk +++ b/make/hotspot/lib/CompileJvm.gmk @@ -214,15 +214,17 @@ VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX) $(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \ $(BUILD_LIBJVM_TARGET_DEPS)) -ifeq ($(OPENJDK_TARGET_OS), windows) - # It doesn't matter which jvm.lib file gets exported, but we need - # to pick just one. - ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN)) - $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \ - DEST := $(LIB_OUTPUTDIR), \ - FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \ - )) - TARGETS += $(COPY_JVM_LIB) +ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) + ifeq ($(OPENJDK_TARGET_OS), windows) + # It doesn't matter which jvm.lib file gets exported, but we need + # to pick just one. + ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN)) + $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \ + DEST := $(LIB_OUTPUTDIR), \ + FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \ + )) + TARGETS += $(COPY_JVM_LIB) + endif endif endif @@ -261,44 +263,46 @@ TARGETS += $(BUILD_LIBJVM) # Search the output for the operator(s) of interest, to see where they are # referenced. -ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), ) +ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) + ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), ) - DEMANGLED_REGEXP := [^:]operator (new|delete) + DEMANGLED_REGEXP := [^:]operator (new|delete) - # Running c++filt to find offending symbols in all files is too expensive, - # especially on Solaris, so use mangled names when looking for symbols. - # Save the demangling for when something is actually found. - ifeq ($(TOOLCHAIN_TYPE), solstudio) - MANGLED_SYMS := \ - __1c2n6FL_pv_ \ - __1c2N6FL_pv_ \ - __1c2k6Fpv_v_ \ - __1c2K6Fpv_v_ \ - # - UNDEF_PATTERN := UNDEF - else - MANGLED_SYMS := \ - _ZdaPv \ - _ZdlPv \ - _Znam \ - _Znwm \ - # - UNDEF_PATTERN := ' U ' + # Running c++filt to find offending symbols in all files is too expensive, + # especially on Solaris, so use mangled names when looking for symbols. + # Save the demangling for when something is actually found. + ifeq ($(TOOLCHAIN_TYPE), solstudio) + MANGLED_SYMS := \ + __1c2n6FL_pv_ \ + __1c2N6FL_pv_ \ + __1c2k6Fpv_v_ \ + __1c2K6Fpv_v_ \ + # + UNDEF_PATTERN := UNDEF + else + MANGLED_SYMS := \ + _ZdaPv \ + _ZdlPv \ + _Znam \ + _Znwm \ + # + UNDEF_PATTERN := ' U ' + endif + + define SetupOperatorNewDeleteCheck + $1.op_check: $1 + if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \ + | $(GREP) $(UNDEF_PATTERN)`" ]; then \ + $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \ + $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \ + $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \ + exit 1; \ + fi + $(TOUCH) $$@ + + TARGETS += $1.op_check + endef + + $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o))) endif - - define SetupOperatorNewDeleteCheck - $1.op_check: $1 - if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \ - | $(GREP) $(UNDEF_PATTERN)`" ]; then \ - $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \ - $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \ - $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \ - exit 1; \ - fi - $(TOUCH) $$@ - - TARGETS += $1.op_check - endef - - $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o))) endif diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk index 75879d3eeb3..122aece5a86 100644 --- a/make/launcher/Launcher-jdk.pack.gmk +++ b/make/launcher/Launcher-jdk.pack.gmk @@ -91,21 +91,15 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \ CFLAGS_solaris := -KPIC, \ CFLAGS_macosx := -fPIC, \ DISABLED_WARNINGS_clang := format-nonliteral, \ - LDFLAGS := $(UNPACKEXE_ZIPOBJS) \ - $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ + LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \ MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \ MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ + EXTRA_OBJECT_FILES := $(UNPACKEXE_ZIPOBJS) \ )) -ifneq ($(USE_EXTERNAL_LIBZ), true) - - $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS) - -endif - TARGETS += $(BUILD_UNPACKEXE) ################################################################################ diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk index 27afc85ecf2..294dd1770d2 100644 --- a/make/launcher/LauncherCommon.gmk +++ b/make/launcher/LauncherCommon.gmk @@ -135,7 +135,7 @@ define SetupBuildLauncherBody $1_LIBS += -lz endif - $1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib + $1_WINDOWS_JLI_LIB := $(call FindStaticLib, java.base, jli, /libjli) $$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \ NAME := $1, \ @@ -181,11 +181,11 @@ define SetupBuildLauncherBody TARGETS += $$($1) ifeq ($(OPENJDK_TARGET_OS), aix) - $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a + $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static) endif ifeq ($(OPENJDK_TARGET_OS), windows) - $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \ + $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \ $$($1_WINDOWS_JLI_LIB) endif endef diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk index 8ee27deafd7..3592d9e8c36 100644 --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -739,11 +739,11 @@ else # OPENJDK_TARGET_OS not windows ifeq ($(ENABLE_HEADLESS_ONLY), false) $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT) else - $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) + $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless) endif ifeq ($(OPENJDK_TARGET_OS), macosx) - $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) + $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt) endif endif # OPENJDK_TARGET_OS diff --git a/make/lib/Lib-jdk.accessibility.gmk b/make/lib/Lib-jdk.accessibility.gmk index fbe2f8fc6b6..d95ca62d85d 100644 --- a/make/lib/Lib-jdk.accessibility.gmk +++ b/make/lib/Lib-jdk.accessibility.gmk @@ -55,7 +55,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \ ) - $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib + $$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt) TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1) endef diff --git a/make/lib/LibCommon.gmk b/make/lib/LibCommon.gmk index 3af84454c90..00b19a4d815 100644 --- a/make/lib/LibCommon.gmk +++ b/make/lib/LibCommon.gmk @@ -61,24 +61,6 @@ else ifeq ($(TOOLCHAIN_TYPE), xlc) endif endif -################################################################################ -# Find a library -# Param 1 - module name -# Param 2 - library name -# Param 3 - optional subdir for library -FindLib = \ - $(call FindLibDirForModule, \ - $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX) - -################################################################################ -# Find a static library -# Param 1 - module name -# Param 2 - library name -# Param 3 - optional subdir for library -FindStaticLib = \ - $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \ - $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX)) - # Put the libraries here. INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE)) diff --git a/test/make/TestCompileCommands.gmk b/test/make/TestCompileCommands.gmk new file mode 100644 index 00000000000..d79805c4b0e --- /dev/null +++ b/test/make/TestCompileCommands.gmk @@ -0,0 +1,54 @@ + +# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include $(SPEC) +include MakeBase.gmk + +default: all + +COMPILE_COMMANDS := $(OUTPUTDIR)/compile_commands.json + +# Perform basic compile_commands.json validation: +# - should start with [ and end with ] +# - should contain at least one entry (opening {) +# - last entry should not have a trailing comma (end with }) +verify-compile-commands-json: + $(HEAD) -n 1 $(COMPILE_COMMANDS) | $(GREP) -q -e "^\[$$" + $(TAIL) -1 $(COMPILE_COMMANDS) | $(GREP) -q -e "^\]$$" + $(HEAD) -n 2 $(COMPILE_COMMANDS) | $(GREP) -q -e "{" + $(TAIL) -2 $(COMPILE_COMMANDS) | $(GREP) -q -e "}$$" + +# Ensure that no native shared library for hotspot was created during the +# build. Checking hotspot only since on Windows the jdk folders are prepopulated +# with CRT DLLs. Also note that this test requires a clean build folder. +verify-no-shared-libraries: + $(FIND) $(OUTPUTDIR)/hotspot -type f -name "*$(SHARED_LIBRARY_SUFFIX)" \ + -exec false {} + + +TEST_TARGETS += verify-compile-commands-json verify-no-shared-libraries + +all: $(TEST_TARGETS) + +.PHONY: default all verify-compile-commands diff --git a/test/make/TestMake.gmk b/test/make/TestMake.gmk index 258dcd56484..f274f7c2ea2 100644 --- a/test/make/TestMake.gmk +++ b/test/make/TestMake.gmk @@ -39,7 +39,10 @@ copy-files: test-idea: +$(MAKE) -f TestIdea.gmk $(TEST_SUBTARGET) +test-compile-commands: + +$(MAKE) -f TestCompileCommands.gmk $(TEST_SUBTARGET) + all: make-base java-compilation copy-files test-idea -.PHONY: default all make-base java-compilation copy-files test-idea +.PHONY: default all make-base java-compilation copy-files test-idea test-compile-commands From e8f90125d2d22927be546333034f194775b3b03f Mon Sep 17 00:00:00 2001 From: Michael McMahon Date: Fri, 5 Oct 2018 11:28:23 +0100 Subject: [PATCH 013/124] 8211420: com.sun.net.httpserver.HttpServer returns Content-length header for 204 response code Reviewed-by: chegar --- .../sun/net/httpserver/ExchangeImpl.java | 8 +- .../com/sun/net/httpserver/bugs/B8211420.java | 108 ++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 test/jdk/com/sun/net/httpserver/bugs/B8211420.java diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java index 3341595f168..6d1230a54e0 100644 --- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java +++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java @@ -210,6 +210,7 @@ class ExchangeImpl { PlaceholderOutputStream o = getPlaceholderResponseBody(); tmpout.write (bytes(statusLine, 0), 0, statusLine.length()); boolean noContentToSend = false; // assume there is content + boolean noContentLengthHeader = false; // must not send Content-length is set rspHdrs.set ("Date", dateFormat.get().format (new Date())); /* check for response type that is not allowed to send a body */ @@ -225,6 +226,7 @@ class ExchangeImpl { logger.log (Level.WARNING, msg); } contentLen = -1; + noContentLengthHeader = (rCode != 304); } if (isHeadRequest() || rCode == 304) { @@ -253,7 +255,11 @@ class ExchangeImpl { noContentToSend = true; contentLen = 0; } - rspHdrs.set("Content-length", Long.toString(contentLen)); + if (noContentLengthHeader) { + rspHdrs.remove("Content-length"); + } else { + rspHdrs.set("Content-length", Long.toString(contentLen)); + } o.setWrappedStream (new FixedLengthOutputStream (this, ros, contentLen)); } } diff --git a/test/jdk/com/sun/net/httpserver/bugs/B8211420.java b/test/jdk/com/sun/net/httpserver/bugs/B8211420.java new file mode 100644 index 00000000000..3a358592648 --- /dev/null +++ b/test/jdk/com/sun/net/httpserver/bugs/B8211420.java @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8211420 + * @run main/othervm B8211420 + * @summary + */ + +import com.sun.net.httpserver.*; + +import java.util.*; +import java.util.concurrent.*; +import java.util.logging.*; +import java.io.*; +import java.net.*; + +public class B8211420 { + + public static void main (String[] args) throws Exception { + Logger logger = Logger.getLogger ("com.sun.net.httpserver"); + ConsoleHandler c = new ConsoleHandler(); + c.setLevel (Level.WARNING); + logger.addHandler (c); + logger.setLevel (Level.WARNING); + Handler handler = new Handler(); + InetSocketAddress addr = new InetSocketAddress (0); + HttpServer server = HttpServer.create (addr, 0); + HttpContext ctx = server.createContext ("/test", handler); + ExecutorService executor = Executors.newCachedThreadPool(); + server.setExecutor (executor); + server.start (); + + URL url = new URL ("http://localhost:"+server.getAddress().getPort()+"/test/foo.html"); + HttpURLConnection urlc = (HttpURLConnection)url.openConnection (); + try { + InputStream is = urlc.getInputStream(); + while (is.read()!= -1) ; + is.close (); + String prop = urlc.getHeaderField("Content-length"); + System.out.println ("Content-length = " + prop + " should be null"); + if (prop != null) + throw new RuntimeException("Content-length was present"); + + urlc = (HttpURLConnection)url.openConnection(); + is = urlc.getInputStream(); + while (is.read()!= -1) ; + is.close (); + if (urlc.getResponseCode() != 304) // expected for 2nd test + throw new RuntimeException("wrong response code"); + String clen = urlc.getHeaderField("Content-length"); + System.out.println ("Content-length = " + clen + " should be 99"); + System.out.println ("len = " + clen.length()); + if (clen == null || !clen.equals("99")) + throw new RuntimeException("Content-length not present or has wrong value"); + System.out.println ("OK"); + } finally { + server.stop(2); + executor.shutdown(); + } + } + + public static boolean error = false; + + static class Handler implements HttpHandler { + volatile int invocation = 1; + public void handle (HttpExchange t) + throws IOException + { + InputStream is = t.getRequestBody(); + Headers map = t.getRequestHeaders(); + Headers rmap = t.getResponseHeaders(); + while (is.read () != -1) ; + is.close(); + if (invocation++ == 1) { + // send a 204 response with no body + t.sendResponseHeaders(204, -1); + t.close(); + } else { + // send a 304 response with no body but with content - length + rmap.add("Content-length", "99"); + t.sendResponseHeaders(304, -1); + t.close(); + } + } + } +} From d872314ef3f9a9c3fdea88d097867599c8e08494 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Fri, 5 Oct 2018 08:50:49 -0400 Subject: [PATCH 014/124] 8211438: [Testbug] runtime/XCheckJniJsig/XCheckJSig.java looks for libjsig in wrong location Remove the os_arch string and JRE path from the test. Also add JNIEXPORT to libjsig symbols so dlsym can find them Reviewed-by: dholmes, lfoltan --- src/java.base/unix/native/libjsig/jsig.c | 6 +++--- test/hotspot/jtreg/ProblemList.txt | 1 - .../jtreg/runtime/XCheckJniJsig/XCheckJSig.java | 14 +++----------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/java.base/unix/native/libjsig/jsig.c b/src/java.base/unix/native/libjsig/jsig.c index 86d619f98bb..3578b99bb6c 100644 --- a/src/java.base/unix/native/libjsig/jsig.c +++ b/src/java.base/unix/native/libjsig/jsig.c @@ -312,7 +312,7 @@ JNIEXPORT int sigaction(int sig, const struct sigaction *act, struct sigaction * } /* The three functions for the jvm to call into. */ -void JVM_begin_signal_setting() { +JNIEXPORT void JVM_begin_signal_setting() { signal_lock(); sigemptyset(&jvmsigs); jvm_signal_installing = true; @@ -320,7 +320,7 @@ void JVM_begin_signal_setting() { signal_unlock(); } -void JVM_end_signal_setting() { +JNIEXPORT void JVM_end_signal_setting() { signal_lock(); jvm_signal_installed = true; jvm_signal_installing = false; @@ -328,7 +328,7 @@ void JVM_end_signal_setting() { signal_unlock(); } -struct sigaction *JVM_get_signal_action(int sig) { +JNIEXPORT struct sigaction *JVM_get_signal_action(int sig) { allocate_sact(); /* Does race condition make sense here? */ if (sigismember(&jvmsigs, sig)) { diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 8d7c33a0af7..a9014d2c266 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -84,7 +84,6 @@ runtime/appcds/javaldr/GCDuringDump.java 8208778 macosx-x64 runtime/CompressedOops/UseCompressedOops.java 8079353 generic-all runtime/RedefineTests/RedefineRunningMethods.java 8208778 macosx-x64 runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all -runtime/XCheckJniJsig/XCheckJSig.java 8211084 macosx-x64 ############################################################################# diff --git a/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java b/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java index df40afd548c..830d226515c 100644 --- a/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java +++ b/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java @@ -44,29 +44,21 @@ public class XCheckJSig { System.out.println("Regression test for bugs 7051189 and 8023393"); String jdk_path = System.getProperty("test.jdk"); - String os_arch = Platform.getOsArch(); String libjsig; String env_var; if (Platform.isOSX()) { env_var = "DYLD_INSERT_LIBRARIES"; - libjsig = jdk_path + "/jre/lib/libjsig.dylib"; // jdk location - if (!(new File(libjsig).exists())) { - libjsig = jdk_path + "/lib/libjsig.dylib"; // jre location - } + libjsig = jdk_path + "/lib/libjsig.dylib"; // jre location } else { env_var = "LD_PRELOAD"; - libjsig = jdk_path + "/jre/lib/" + os_arch + "/libjsig.so"; // jdk location - if (!(new File(libjsig).exists())) { - libjsig = jdk_path + "/lib/" + os_arch + "/libjsig.so"; // jre location - } + libjsig = jdk_path + "/lib/libjsig.so"; // jre location } // If this test fails, these might be useful to know. System.out.println("libjsig: " + libjsig); - System.out.println("osArch: " + os_arch); // Make sure the libjsig file exists. if (!(new File(libjsig).exists())) { - throw new jtreg.SkippedException("File " + libjsig + " not found"); + throw new RuntimeException("File libjsig not found, path: " + libjsig); } ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xcheck:jni", "-version"); From 432605be5cd1cf89eba38ff023515df9e6116351 Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Fri, 5 Oct 2018 09:15:52 -0400 Subject: [PATCH 015/124] 8209889: RedefineStress tests crash Create CompileTaskWrapper before potential safepoint Reviewed-by: mdoerr, dlong --- src/hotspot/share/compiler/compileBroker.cpp | 45 ++++++++++---------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp index 619a9f1e002..861972e5bc9 100644 --- a/src/hotspot/share/compiler/compileBroker.cpp +++ b/src/hotspot/share/compiler/compileBroker.cpp @@ -1781,30 +1781,31 @@ void CompileBroker::compiler_thread_loop() { return; // Stop this thread. } } - continue; - } + } else { + // Assign the task to the current thread. Mark this compilation + // thread as active for the profiler. + // CompileTaskWrapper also keeps the Method* from being deallocated if redefinition + // occurs after fetching the compile task off the queue. + CompileTaskWrapper ctw(task); + nmethodLocker result_handle; // (handle for the nmethod produced by this task) + task->set_code_handle(&result_handle); + methodHandle method(thread, task->method()); - if (UseDynamicNumberOfCompilerThreads) { - possibly_add_compiler_threads(); - } + // Never compile a method if breakpoints are present in it + if (method()->number_of_breakpoints() == 0) { + // Compile the method. + if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) { + invoke_compiler_on_method(task); + thread->start_idle_timer(); + } else { + // After compilation is disabled, remove remaining methods from queue + method->clear_queued_for_compilation(); + task->set_failure_reason("compilation is disabled"); + } + } - // Assign the task to the current thread. Mark this compilation - // thread as active for the profiler. - CompileTaskWrapper ctw(task); - nmethodLocker result_handle; // (handle for the nmethod produced by this task) - task->set_code_handle(&result_handle); - methodHandle method(thread, task->method()); - - // Never compile a method if breakpoints are present in it - if (method()->number_of_breakpoints() == 0) { - // Compile the method. - if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) { - invoke_compiler_on_method(task); - thread->start_idle_timer(); - } else { - // After compilation is disabled, remove remaining methods from queue - method->clear_queued_for_compilation(); - task->set_failure_reason("compilation is disabled"); + if (UseDynamicNumberOfCompilerThreads) { + possibly_add_compiler_threads(); } } } From cd95f5a933a13212fd27adba79c31d7dfccadb2e Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Fri, 5 Oct 2018 14:28:44 -0400 Subject: [PATCH 016/124] 8211296: Remove HotSpot deprecation warning suppression for Mac/clang Removed deprecation warning suppression, fixed uses of deprecated functions. Reviewed-by: dholmes, mikael --- make/hotspot/lib/CompileJvm.gmk | 2 +- src/hotspot/os/bsd/os_bsd.cpp | 10 ---------- src/hotspot/share/utilities/globalDefinitions_gcc.hpp | 4 ++-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk index 45c30e9a3c1..a520621f3c2 100644 --- a/make/hotspot/lib/CompileJvm.gmk +++ b/make/hotspot/lib/CompileJvm.gmk @@ -92,7 +92,7 @@ ifeq ($(call check-jvm-feature, zero), true) DISABLED_WARNINGS_gcc += return-type switch endif -DISABLED_WARNINGS_clang := tautological-compare deprecated-declarations \ +DISABLED_WARNINGS_clang := tautological-compare \ undefined-var-template sometimes-uninitialized unknown-pragmas \ delete-non-virtual-dtor missing-braces char-subscripts \ ignored-qualifiers missing-field-initializers mismatched-tags diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp index 7879d2f2cc0..73dfc6f1ec6 100644 --- a/src/hotspot/os/bsd/os_bsd.cpp +++ b/src/hotspot/os/bsd/os_bsd.cpp @@ -3238,16 +3238,6 @@ void os::init(void) { Bsd::clock_init(); initial_time_count = javaTimeNanos(); -#ifdef __APPLE__ - // XXXDARWIN - // Work around the unaligned VM callbacks in hotspot's - // sharedRuntime. The callbacks don't use SSE2 instructions, and work on - // Linux, Solaris, and FreeBSD. On Mac OS X, dyld (rightly so) enforces - // alignment when doing symbol lookup. To work around this, we force early - // binding of all symbols now, thus binding when alignment is known-good. - _dyld_bind_fully_image_containing_address((const void *) &os::init); -#endif - os::Posix::init(); } diff --git a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp index 7f7546b5a3a..c9031a8332f 100644 --- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp +++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp @@ -218,8 +218,8 @@ inline int g_isnan(double f) { return isnan(f); } // Checking for finiteness -inline int g_isfinite(jfloat f) { return finite(f); } -inline int g_isfinite(jdouble f) { return finite(f); } +inline int g_isfinite(jfloat f) { return isfinite(f); } +inline int g_isfinite(jdouble f) { return isfinite(f); } // Wide characters From a87e8e52ea800b44eb801a9a3ccf2d3d7d72dd8c Mon Sep 17 00:00:00 2001 From: Jean Christophe Beyler Date: Fri, 5 Oct 2018 13:38:03 -0700 Subject: [PATCH 017/124] 8211123: GC Metaspace printing after full gc Move GC printing to after usage is calculated Co-authored-by: Jiapeng Li Reviewed-by: tschatzl, stuefe --- .../share/gc/shared/genCollectedHeap.cpp | 6 +- .../jtreg/gc/logging/TestMetaSpaceLog.java | 143 ++++++++++++++++++ test/hotspot/jtreg/gc/logging/testcases.jar | Bin 0 -> 18020 bytes 3 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java create mode 100644 test/hotspot/jtreg/gc/logging/testcases.jar diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp index 71200926fb9..609c3b48eb0 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp @@ -649,9 +649,6 @@ void GenCollectedHeap::do_collection(bool full, // a whole heap collection. complete = complete || collected_old; - print_heap_change(young_prev_used, old_prev_used); - MetaspaceUtils::print_metaspace_change(metadata_prev_used); - // Adjust generation sizes. if (collected_old) { _old_gen->compute_new_size(); @@ -667,6 +664,9 @@ void GenCollectedHeap::do_collection(bool full, update_full_collections_completed(); } + print_heap_change(young_prev_used, old_prev_used); + MetaspaceUtils::print_metaspace_change(metadata_prev_used); + // Track memory usage and detect low memory after GC finishes MemoryService::track_memory_usage(); diff --git a/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java new file mode 100644 index 00000000000..4b967243b3e --- /dev/null +++ b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, Google and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.io.File; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.List; +import java.util.function.Predicate; +import java.util.regex.Pattern; +import java.util.regex.Matcher; + +import jdk.test.lib.Asserts; +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; +import sun.hotspot.WhiteBox; + +/* + * @test TestMetaSpaceLog + * @bug 8211123 + * @summary Ensure that the Metaspace is updated in the log + * @requires vm.gc=="null" + * @key gc + * @library /test/lib + * @modules java.base/jdk.internal.misc + * java.management + * + * @compile TestMetaSpaceLog.java + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main TestMetaSpaceLog + */ + +public class TestMetaSpaceLog { + private static Pattern metaSpaceRegexp; + + static { + // Do this once here. + metaSpaceRegexp = Pattern.compile(".*Metaspace: ([0-9]+).*->([0-9]+).*"); + } + + public static void main(String[] args) throws Exception { + testMetaSpaceUpdate("UseParallelGC"); + testMetaSpaceUpdate("UseG1GC"); + testMetaSpaceUpdate("UseConcMarkSweepGC"); + testMetaSpaceUpdate("UseSerialGC"); + } + + private static void verifyContainsMetaSpaceUpdate(OutputAnalyzer output) { + Predicate collectedMetaSpace = line -> check(line); + + // At least one metaspace line from GC should show GC being collected. + boolean foundCollectedMetaSpace = output.asLines().stream() + .filter(s -> s.contains("[gc,metaspace")) + .anyMatch(TestMetaSpaceLog::check); + Asserts.assertTrue(foundCollectedMetaSpace); + } + + private static boolean check(String line) { + Matcher m = metaSpaceRegexp.matcher(line); + Asserts.assertTrue(m.matches(), "Unexpected line for metaspace logging: " + line); + long before = Long.parseLong(m.group(1)); + long after = Long.parseLong(m.group(2)); + return before > after; + } + + private static void testMetaSpaceUpdate(String gcFlag) throws Exception { + // Propagate test.src for the jar file. + String testSrc= "-Dtest.src=" + System.getProperty("test.src", "."); + + System.err.println("Testing with GC Flag: " + gcFlag); + ProcessBuilder pb = + ProcessTools.createJavaProcessBuilder( + "-XX:+" + gcFlag, + "-Xlog:gc*", + "-Xbootclasspath/a:.", + "-XX:+UnlockDiagnosticVMOptions", + "-XX:+WhiteBoxAPI", + "-Xmx1000M", + "-Xms1000M", + testSrc, StressMetaSpace.class.getName()); + + OutputAnalyzer output = null; + try { + output = new OutputAnalyzer(pb.start()); + verifyContainsMetaSpaceUpdate(output); + } catch (Exception e) { + // For error diagnosis: print and throw. + e.printStackTrace(); + output.reportDiagnosticSummary(); + throw e; + } + } + + static class StressMetaSpace { + private static URL[] urls = new URL[1]; + + static { + try { + File jarFile = new File(System.getProperty("test.src") + "/testcases.jar"); + urls[0] = jarFile.toURI().toURL(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void main(String args[]) { + WhiteBox wb = WhiteBox.getWhiteBox(); + for(int i = 0; i < 10000; i++) { + loadClass(wb); + } + wb.fullGC(); + } + + public static void loadClass(WhiteBox wb) { + try { + URLClassLoader ucl = new URLClassLoader(urls); + Class.forName("case00", false, ucl); + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} diff --git a/test/hotspot/jtreg/gc/logging/testcases.jar b/test/hotspot/jtreg/gc/logging/testcases.jar new file mode 100644 index 0000000000000000000000000000000000000000..5996133fe1ed2ca30a11f587abd28de4d6536f77 GIT binary patch literal 18020 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 literal 0 HcmV?d00001 From 9a1fbb653c835bd8b14b941f4d28e509b96717e2 Mon Sep 17 00:00:00 2001 From: Brian Burkhalter Date: Fri, 5 Oct 2018 15:37:46 -0700 Subject: [PATCH 018/124] 8211794: Remove jdk/java/nio/channels/Selector/RacyDeregister.java from problem list Reviewed-by: bchristi --- test/jdk/ProblemList.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index bf6432c62ce..b373980f18c 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -565,7 +565,6 @@ java/nio/Buffer/EqualsCompareTest.java 8193917 solaris- java/nio/channels/DatagramChannel/ChangingAddress.java 7141822 macosx-all java/nio/channels/Selector/Wakeup.java 6963118 windows-all -java/nio/channels/Selector/RacyDeregister.java 8201765 windows-all java/nio/file/WatchService/Basic.java 7158947 solaris-all Solaris 11 java/nio/file/WatchService/MayFlies.java 7158947 solaris-all Solaris 11 From ec0cbd58f4585c157cf3a798784ce63e62b911fc Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Fri, 5 Oct 2018 15:46:47 -0700 Subject: [PATCH 019/124] 8206963: [AOT] bug with multiple class loaders AOT should not support custom class loaders. Reviewed-by: dlong, iveresov --- src/hotspot/share/aot/aotCodeHeap.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/aot/aotCodeHeap.cpp b/src/hotspot/share/aot/aotCodeHeap.cpp index 7108839e905..9b456e29149 100644 --- a/src/hotspot/share/aot/aotCodeHeap.cpp +++ b/src/hotspot/share/aot/aotCodeHeap.cpp @@ -735,6 +735,14 @@ bool AOTCodeHeap::load_klass_data(InstanceKlass* ik, Thread* thread) { NOT_PRODUCT( klasses_seen++; ) + // AOT does not support custom class loaders. + ClassLoaderData* cld = ik->class_loader_data(); + if (!cld->is_builtin_class_loader_data()) { + log_trace(aot, class, load)("skip class %s for custom classloader %s (%p) tid=" INTPTR_FORMAT, + ik->internal_name(), cld->loader_name(), cld, p2i(thread)); + return false; + } + AOTKlassData* klass_data = find_klass(ik); if (klass_data == NULL) { return false; @@ -759,9 +767,10 @@ bool AOTCodeHeap::load_klass_data(InstanceKlass* ik, Thread* thread) { assert(klass_data->_class_id < _class_count, "invalid class id"); AOTClass* aot_class = &_classes[klass_data->_class_id]; - if (aot_class->_classloader != NULL && aot_class->_classloader != ik->class_loader_data()) { - log_trace(aot, class, load)("class %s in %s already loaded for classloader %p vs %p tid=" INTPTR_FORMAT, - ik->internal_name(), _lib->name(), aot_class->_classloader, ik->class_loader_data(), p2i(thread)); + ClassLoaderData* aot_cld = aot_class->_classloader; + if (aot_cld != NULL && aot_cld != cld) { + log_trace(aot, class, load)("class %s in %s already loaded for classloader %s (%p) vs %s (%p) tid=" INTPTR_FORMAT, + ik->internal_name(), _lib->name(), aot_cld->loader_name(), aot_cld, cld->loader_name(), cld, p2i(thread)); NOT_PRODUCT( aot_klasses_cl_miss++; ) return false; } @@ -774,9 +783,9 @@ bool AOTCodeHeap::load_klass_data(InstanceKlass* ik, Thread* thread) { NOT_PRODUCT( aot_klasses_found++; ) - log_trace(aot, class, load)("found %s in %s for classloader %p tid=" INTPTR_FORMAT, ik->internal_name(), _lib->name(), ik->class_loader_data(), p2i(thread)); + log_trace(aot, class, load)("found %s in %s for classloader %s (%p) tid=" INTPTR_FORMAT, ik->internal_name(), _lib->name(), cld->loader_name(), cld, p2i(thread)); - aot_class->_classloader = ik->class_loader_data(); + aot_class->_classloader = cld; // Set klass's Resolve (second) got cell. _klasses_got[klass_data->_got_index] = ik; if (ik->is_initialized()) { From 57b516dd0e571366b3d2a09e5a1ff08c3b527ef7 Mon Sep 17 00:00:00 2001 From: Jiangli Zhou Date: Fri, 5 Oct 2018 18:56:11 -0400 Subject: [PATCH 020/124] 8202951: Implementation of JEP 341: Default CDS Archives 8210592: Convert CDS-mode test sets in tier5 and tier6 to non-CDS-mode tests 8209739: [TESTBUG] javax/imageio/plugins/png/ItxtUtf8Test.java fails with OutOfMemoryError when running in CDS mode Generate the default CDS archive at JDK build time. Co-authored-by: Erik Joelsson Co-authored-by: Calvin Cheung Reviewed-by: erikj, ihse, dholmes, iklam, ccheung, mseledtsov --- make/Images.gmk | 12 +++- make/autoconf/configure.ac | 1 + make/autoconf/jdk-options.m4 | 35 ++++++++++ make/autoconf/spec.gmk.in | 2 + make/scripts/compare.sh | 1 + src/hotspot/share/prims/whitebox.cpp | 17 +++++ src/hotspot/share/runtime/arguments.cpp | 30 +++++---- src/hotspot/share/runtime/arguments.hpp | 1 + test/TestCommon.gmk | 14 ---- ...-mode.txt => ProblemList-non-cds-mode.txt} | 2 +- .../CheckDefaultArchiveFile.java | 63 ++++++++++++++++++ .../CheckSharingWithDefaultArchive.java | 66 +++++++++++++++++++ ...stMutuallyExclusivePlatformPredicates.java | 5 +- .../imageio/plugins/png/ItxtUtf8Test.java | 2 +- test/lib/jdk/test/lib/Platform.java | 13 ++++ test/lib/sun/hotspot/WhiteBox.java | 2 + 16 files changed, 234 insertions(+), 32 deletions(-) rename test/hotspot/jtreg/{ProblemList-cds-mode.txt => ProblemList-non-cds-mode.txt} (94%) create mode 100644 test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java create mode 100644 test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java diff --git a/make/Images.gmk b/make/Images.gmk index 10e3dc2d827..a12970dd8e8 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -90,24 +90,32 @@ endif $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE) - $(ECHO) Creating jdk image + $(call LogWarn, Creating jdk image) $(RM) -r $(JDK_IMAGE_DIR) $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jdk, \ $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \ $(JLINK_JDK_EXTRA_OPTS) \ --output $(JDK_IMAGE_DIR) \ ) + ifeq ($(BUILD_CDS_ARCHIVE), true) + $(call LogWarn, Creating CDS archive for jdk image) + $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO) + endif $(TOUCH) $@ $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE) - $(ECHO) Creating legacy jre image + $(call LogWarn, Creating legacy jre image) $(RM) -r $(JRE_IMAGE_DIR) $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/images/jre, \ $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \ $(JLINK_JRE_EXTRA_OPTS) \ --output $(JRE_IMAGE_DIR) \ ) + ifeq ($(BUILD_CDS_ARCHIVE), true) + $(call LogWarn, Creating CDS archive for jre image) + $(JRE_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO) + endif $(TOUCH) $@ TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac index a9edea8c2c1..b579af3e697 100644 --- a/make/autoconf/configure.ac +++ b/make/autoconf/configure.ac @@ -233,6 +233,7 @@ JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST JDKOPT_EXCLUDE_TRANSLATIONS JDKOPT_ENABLE_DISABLE_MANPAGES +JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE ############################################################################### # diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index e958eba27ad..4dcd3b86718 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -605,3 +605,38 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES], AC_SUBST(BUILD_MANPAGES) ]) + +################################################################################ +# +# Disable the default CDS archive generation +# cross compilation - disabled +# zero - off by default (not a tested configuration) +# +AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE], +[ + AC_ARG_ENABLE([cds-archive], [AS_HELP_STRING([--disable-cds-archive], + [Set to disable generation of a default CDS archive in the product image @<:@enabled@:>@])]) + + AC_MSG_CHECKING([if a default CDS archive should be generated]) + if test "x$COMPILE_TYPE" = "xcross"; then + AC_MSG_RESULT([no, not possible with cross compilation]) + BUILD_CDS_ARCHIVE="false" + elif test "x$enable_cds_archive" = "xyes"; then + AC_MSG_RESULT([yes, forced]) + BUILD_CDS_ARCHIVE="true" + elif HOTSPOT_CHECK_JVM_VARIANT(zero); then + AC_MSG_RESULT([no]) + BUILD_CDS_ARCHIVE="false" + elif test "x$enable_cds_archive" = "x"; then + AC_MSG_RESULT([yes]) + BUILD_CDS_ARCHIVE="true" + elif test "x$enable_cds_archive" = "xno"; then + AC_MSG_RESULT([no, forced]) + BUILD_CDS_ARCHIVE="false" + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([--enable-cds_archive can only be yes/no or empty]) + fi + + AC_SUBST(BUILD_CDS_ARCHIVE) +]) diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in index f95bd921391..aec35664ac9 100644 --- a/make/autoconf/spec.gmk.in +++ b/make/autoconf/spec.gmk.in @@ -309,6 +309,8 @@ EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@ BUILD_MANPAGES := @BUILD_MANPAGES@ +BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@ + # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep # it in sync. BOOT_JDK:=@BOOT_JDK@ diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh index 8a99e4bb4a6..2cfc820b0b1 100644 --- a/make/scripts/compare.sh +++ b/make/scripts/compare.sh @@ -385,6 +385,7 @@ compare_general_files() { ! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \ ! -name "jspawnhelper" ! -name "JavawsLauncher" ! -name "*.a" \ ! -name "finish_installation" ! -name "Sparkle" ! -name "*.tar.gz" \ + ! -name "classes.jsa" \ | $GREP -v "./bin/" | $SORT | $FILTER) echo Other files with binary differences... diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index 984ce83dd3f..5aea49e0ea0 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -1749,6 +1749,20 @@ WB_ENTRY(jobject, WB_GetMethodStringOption(JNIEnv* env, jobject wb, jobject meth return NULL; WB_END +WB_ENTRY(jobject, WB_GetDefaultArchivePath(JNIEnv* env, jobject wb)) + const char* p = Arguments::get_default_shared_archive_path(); + ThreadToNativeFromVM ttn(thread); + jstring path_string = env->NewStringUTF(p); + + CHECK_JNI_EXCEPTION_(env, NULL); + + return path_string; +WB_END + +WB_ENTRY(jboolean, WB_IsSharingEnabled(JNIEnv* env, jobject wb)) + return UseSharedSpaces; +WB_END + WB_ENTRY(jboolean, WB_IsShared(JNIEnv* env, jobject wb, jobject obj)) oop obj_oop = JNIHandles::resolve(obj); return MetaspaceShared::is_archive_object(obj_oop); @@ -2185,6 +2199,9 @@ static JNINativeMethod methods[] = { {CC"getMethodStringOption", CC"(Ljava/lang/reflect/Executable;Ljava/lang/String;)Ljava/lang/String;", (void*)&WB_GetMethodStringOption}, + {CC"getDefaultArchivePath", CC"()Ljava/lang/String;", + (void*)&WB_GetDefaultArchivePath}, + {CC"isSharingEnabled", CC"()Z", (void*)&WB_IsSharingEnabled}, {CC"isShared", CC"(Ljava/lang/Object;)Z", (void*)&WB_IsShared }, {CC"isSharedClass", CC"(Ljava/lang/Class;)Z", (void*)&WB_IsSharedClass }, {CC"areSharedStringsIgnored", CC"()Z", (void*)&WB_AreSharedStringsIgnored }, diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index cd7761e9044..6347b287358 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -3450,21 +3450,27 @@ void Arguments::set_shared_spaces_flags() { // Sharing support // Construct the path to the archive +char* Arguments::get_default_shared_archive_path() { + char *default_archive_path; + char jvm_path[JVM_MAXPATHLEN]; + os::jvm_path(jvm_path, sizeof(jvm_path)); + char *end = strrchr(jvm_path, *os::file_separator()); + if (end != NULL) *end = '\0'; + size_t jvm_path_len = strlen(jvm_path); + size_t file_sep_len = strlen(os::file_separator()); + const size_t len = jvm_path_len + file_sep_len + 20; + default_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments); + if (default_archive_path != NULL) { + jio_snprintf(default_archive_path, len, "%s%sclasses.jsa", + jvm_path, os::file_separator()); + } + return default_archive_path; +} + static char* get_shared_archive_path() { char *shared_archive_path; if (SharedArchiveFile == NULL) { - char jvm_path[JVM_MAXPATHLEN]; - os::jvm_path(jvm_path, sizeof(jvm_path)); - char *end = strrchr(jvm_path, *os::file_separator()); - if (end != NULL) *end = '\0'; - size_t jvm_path_len = strlen(jvm_path); - size_t file_sep_len = strlen(os::file_separator()); - const size_t len = jvm_path_len + file_sep_len + 20; - shared_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments); - if (shared_archive_path != NULL) { - jio_snprintf(shared_archive_path, len, "%s%sclasses.jsa", - jvm_path, os::file_separator()); - } + shared_archive_path = Arguments::get_default_shared_archive_path(); } else { shared_archive_path = os::strdup_check_oom(SharedArchiveFile, mtArguments); } diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp index 72bfd2bf9e3..3bb983e6cd0 100644 --- a/src/hotspot/share/runtime/arguments.hpp +++ b/src/hotspot/share/runtime/arguments.hpp @@ -633,6 +633,7 @@ class Arguments : AllStatic { static char* get_appclasspath() { return _java_class_path->value(); } static void fix_appclasspath(); + static char* get_default_shared_archive_path(); // Operation modi static Mode mode() { return _mode; } diff --git a/test/TestCommon.gmk b/test/TestCommon.gmk index a51ce82c7b5..79c9f30f0a4 100644 --- a/test/TestCommon.gmk +++ b/test/TestCommon.gmk @@ -178,20 +178,6 @@ ifeq ($(USE_FAILURE_HANDLER), true) endif endif - -# Optionally create a CDS archive before running tests -ifeq ($(GENERATE_CDS_ARCHIVE), true) - CDS_ARCHIVE_FILE := $(ABS_TEST_OUTPUT_DIR)/cds_archive.jsa - - $(CDS_ARCHIVE_FILE): $(PRODUCT_HOME) - $(PRODUCT_HOME)/bin/java -XX:+UnlockDiagnosticVMOptions \ - -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)") -Xshare:dump - - CDS_VM_ARGS := -XX:+UnlockDiagnosticVMOptions -XX:SharedArchiveFile=$(shell $(GETMIXEDPATH) "$(CDS_ARCHIVE_FILE)") - JTREG_TEST_OPTIONS += $(addprefix -vmoption:, $(CDS_VM_ARGS)) - TEST_PREREQS += $(CDS_ARCHIVE_FILE) -endif - # How to create the test bundle (pass or fail, we want to create this) # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. ifneq ($(ARCHIVE_BUNDLE), ) diff --git a/test/hotspot/jtreg/ProblemList-cds-mode.txt b/test/hotspot/jtreg/ProblemList-non-cds-mode.txt similarity index 94% rename from test/hotspot/jtreg/ProblemList-cds-mode.txt rename to test/hotspot/jtreg/ProblemList-non-cds-mode.txt index 8fbc756f0b5..912f4c05cd1 100644 --- a/test/hotspot/jtreg/ProblemList-cds-mode.txt +++ b/test/hotspot/jtreg/ProblemList-non-cds-mode.txt @@ -23,7 +23,7 @@ ############################################################################# # -# Additional list of quarantined tests when CDS mode enabled. +# Additional list of quarantined tests when non-CDS mode enabled. # ############################################################################# diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java new file mode 100644 index 00000000000..191471255f9 --- /dev/null +++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckDefaultArchiveFile.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test Default CDS archive file + * @summary JDK platforms/binaries do not support default CDS archive should + * not contain classes.jsa in the default location. + * @library /test/lib + * @modules java.base/jdk.internal.misc + * java.management + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI CheckDefaultArchiveFile + */ +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import jdk.test.lib.Platform; +import jdk.test.lib.cds.CDSTestUtils; +import jtreg.SkippedException; +import sun.hotspot.WhiteBox; + +public class CheckDefaultArchiveFile { + public static void main(String[] args) throws Exception { + WhiteBox wb = WhiteBox.getWhiteBox(); + String osArch = Platform.getOsArch(); + String vmName = System.getProperty("java.vm.name"); + String vmString = vmName + "(" + osArch + ")"; + String jsaString = wb.getDefaultArchivePath(); + Path jsa = Paths.get(jsaString); + if (Platform.isDefaultCDSArchiveSupported()) { + if (Files.exists(jsa)) { + System.out.println("Passed. " + vmString + + ": has default classes.jsa file"); + } else { + throw new RuntimeException(vmString + "has no " + jsaString); + } + } else { + throw new SkippedException("Default CDS archive is not supported"); + } + } +} diff --git a/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java b/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java new file mode 100644 index 00000000000..d25331c11a4 --- /dev/null +++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/CheckSharingWithDefaultArchive.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test Default CDS archive + * @summary Sharing should be enabled by default on supported platform/binaries. + * No -Xshare:dump is needed. No -Xshare:auto or -Xshare:on in needed. + * Verify a set of well-known shared classes. + * @requires vm.cds + * @library /test/lib + * @modules java.base/jdk.internal.misc + * java.management + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox + * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions + * -XX:+WhiteBoxAPI CheckSharingWithDefaultArchive -showversion + */ +import jdk.test.lib.Platform; +import jtreg.SkippedException; +import sun.hotspot.WhiteBox; + +public class CheckSharingWithDefaultArchive { + public static void main(String[] args) throws Exception { + if (!Platform.isDefaultCDSArchiveSupported()) { + throw new SkippedException("Supported platform"); + } + + WhiteBox wb = WhiteBox.getWhiteBox(); + String classes[] = {"java.lang.Object", + "java.lang.String", + "java.lang.Class"}; + // If maping fails, sharing is disabled + if (wb.isSharingEnabled()) { + for (int i = 0; i < classes.length; i++) { + Class c = Class.forName(classes[i]); + if (wb.isSharedClass(c)) { + System.out.println(classes[i] + " is shared."); + } else { + throw new RuntimeException(classes[i] + " is not shared"); + } + } + } else { + throw new SkippedException("Sharing is not enabled."); + } + } +} diff --git a/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java b/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java index a016f233e7d..211b0b3384b 100644 --- a/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java +++ b/test/hotspot/jtreg/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java @@ -50,8 +50,9 @@ public class TestMutuallyExclusivePlatformPredicates { OS("isAix", "isLinux", "isOSX", "isSolaris", "isWindows"), VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero", "isEmbedded"), MODE("isInt", "isMixed", "isComp"), - IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild", "isSlowDebugBuild", - "hasSA", "shouldSAAttach", "isTieredSupported", "areCustomLoadersSupportedForCDS"); + IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild", + "isSlowDebugBuild", "hasSA", "shouldSAAttach", "isTieredSupported", + "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported"); public final List methodNames; diff --git a/test/jdk/javax/imageio/plugins/png/ItxtUtf8Test.java b/test/jdk/javax/imageio/plugins/png/ItxtUtf8Test.java index 74938bcda18..6f2dbb247c5 100644 --- a/test/jdk/javax/imageio/plugins/png/ItxtUtf8Test.java +++ b/test/jdk/javax/imageio/plugins/png/ItxtUtf8Test.java @@ -30,7 +30,7 @@ * * @run main ItxtUtf8Test * - * @run main/othervm/timeout=10 -Xmx4m ItxtUtf8Test truncate + * @run main/othervm/timeout=10 -Xmx6m ItxtUtf8Test truncate */ import java.awt.image.BufferedImage; diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java index 3b68d0d2868..a658fa0b720 100644 --- a/test/lib/jdk/test/lib/Platform.java +++ b/test/lib/jdk/test/lib/Platform.java @@ -325,6 +325,19 @@ public class Platform { } } + public static boolean isDefaultCDSArchiveSupported() { + return (is64bit() && + isServer() && + (isLinux() || + isOSX() || + isSolaris() || + isWindows()) && + !isZero() && + !isMinimal() && + !isAArch64() && + !isARM()); + } + /* * This should match the #if condition in ClassListParser::load_class_from_source(). */ diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index d3ce3b7b80d..1a8101304a5 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -512,6 +512,8 @@ public class WhiteBox { public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue); // Sharing & archiving + public native String getDefaultArchivePath(); + public native boolean isSharingEnabled(); public native boolean isShared(Object o); public native boolean isSharedClass(Class c); public native boolean areSharedStringsIgnored(); From e77e2d1df8b8221ac456292388745a90ded2e96e Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Thu, 27 Sep 2018 13:56:09 +0200 Subject: [PATCH 021/124] 8211219: Type inconsistency in LIRGenerator::atomic_cmpxchg(..) Reviewed-by: eosterlund, iveresov --- src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp index 1c0ecfa0126..a26a99cef97 100644 --- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp +++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp @@ -688,7 +688,7 @@ LIR_Opr LIRGenerator::atomic_cmpxchg(BasicType type, LIR_Opr addr, LIRItem& cmp_ } LIR_Opr result = new_register(T_INT); __ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0), - result, type); + result, T_INT); return result; } From 2223e083ba15c151b84bd5a967a6d82c39dd121a Mon Sep 17 00:00:00 2001 From: Vaibhav Choudhary Date: Fri, 5 Oct 2018 18:25:15 +0100 Subject: [PATCH 022/124] 8210376: [TESTBUG] @requires vm.cds should be replaced by @requires vm.cds.archived.java.heap and documentation is required for vm.gc==null @requires vm.cds should be replaced by @requires vm.cds.archived.java.heap and documentation is required for vm.gc==null Reviewed-by: iklam, jiangli --- test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java | 5 ++++- .../jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java | 1 - .../jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java | 3 +++ .../runtime/appcds/sharedStrings/IncompatibleOptions.java | 3 +++ .../sharedStrings/IncompatibleOptions_noCompactStrings.java | 3 +++ .../sharedStrings/IncompatibleOptions_stringDedup.java | 3 +++ .../jtreg/runtime/appcds/sharedStrings/SysDictCrash.java | 3 +-- 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java b/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java index 4c0fdf64dee..a8d08d10641 100644 --- a/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java +++ b/test/hotspot/jtreg/runtime/appcds/CommandLineFlagCombo.java @@ -24,7 +24,10 @@ /* * @test CommandLineFlagCombo - * @requires vm.cds + * @requires vm.cds.archived.java.heap + * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set + * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed + * vm options. * @requires (vm.gc=="null") * @summary Test command line flag combinations that * could likely affect the behaviour of AppCDS diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java b/test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java index 70387b1d7f1..37a8857c1de 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java +++ b/test/hotspot/jtreg/runtime/appcds/cacheObject/DifferentHeapSizes.java @@ -26,7 +26,6 @@ * @test * @summary Test automatic relocation of archive heap regions dur to heap size changes. * @requires vm.cds.archived.java.heap - * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/appcds * @modules jdk.jartool/sun.tools.jar * @compile ../test-classes/Hello.java diff --git a/test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java b/test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java index 7228d8310e9..eb3020286a8 100644 --- a/test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java +++ b/test/hotspot/jtreg/runtime/appcds/cacheObject/OpenArchiveRegion.java @@ -26,6 +26,9 @@ * @test * @summary Test open archive heap regions * @requires vm.cds.archived.java.heap + * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set + * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed + * vm options. * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/appcds * @modules java.base/jdk.internal.misc diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java index d6feb24a077..fa8473ccc5e 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java +++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions.java @@ -27,6 +27,9 @@ * @summary Test options that are incompatible with use of shared strings * Also test mismatch in oops encoding between dump time and run time * @requires vm.cds.archived.java.heap + * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set + * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed + * vm options. * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/appcds * @modules jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_noCompactStrings.java b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_noCompactStrings.java index 5d354600608..67963957cfd 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_noCompactStrings.java +++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_noCompactStrings.java @@ -27,6 +27,9 @@ * @summary Test options that are incompatible with use of shared strings * Also test mismatch in oops encoding between dump time and run time * @requires vm.cds.archived.java.heap + * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set + * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed + * vm options. * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/appcds * @modules jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_stringDedup.java b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_stringDedup.java index d22b7ab1406..5ab3ff6433c 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_stringDedup.java +++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/IncompatibleOptions_stringDedup.java @@ -27,6 +27,9 @@ * @summary Test options that are incompatible with use of shared strings * Also test mismatch in oops encoding between dump time and run time * @requires vm.cds.archived.java.heap + * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set + * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed + * vm options. * @requires (vm.gc=="null") * @library /test/lib /test/hotspot/jtreg/runtime/appcds * @modules jdk.jartool/sun.tools.jar diff --git a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java index 6ed6dbcc151..3e726e1217b 100644 --- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java +++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/SysDictCrash.java @@ -26,8 +26,7 @@ * @test * @summary Regression test for JDK-8098821 * @bug 8098821 - * @requires vm.cds - * @requires vm.gc.G1 + * @requires vm.cds.archived.java.heap * @library /test/lib /test/hotspot/jtreg/runtime/appcds * @modules java.base/jdk.internal.misc * @modules java.management From 548eb6860a39e6ebd06af4f211f081af0a63b52d Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Fri, 5 Oct 2018 20:03:14 +0200 Subject: [PATCH 023/124] 8208686: [AOT] JVMTI ResourceExhausted event repeated for same allocation Reviewed-by: never, kvn, sspitsyn --- src/hotspot/share/aot/aotCodeHeap.cpp | 7 +- src/hotspot/share/gc/shared/memAllocator.cpp | 23 ++- src/hotspot/share/jvmci/jvmciRuntime.cpp | 97 ++++++++++-- src/hotspot/share/jvmci/jvmciRuntime.hpp | 34 ++++- src/hotspot/share/jvmci/vmStructs_jvmci.cpp | 6 + src/hotspot/share/memory/universe.cpp | 9 +- src/hotspot/share/memory/universe.hpp | 3 + src/hotspot/share/oops/arrayKlass.cpp | 9 +- src/hotspot/share/oops/instanceKlass.cpp | 9 +- src/hotspot/share/oops/klass.cpp | 14 ++ src/hotspot/share/oops/klass.hpp | 3 + src/hotspot/share/oops/objArrayKlass.cpp | 17 +-- src/hotspot/share/oops/typeArrayKlass.cpp | 17 +-- src/hotspot/share/runtime/thread.cpp | 1 + src/hotspot/share/runtime/thread.hpp | 17 ++- .../jaotc/binformat/BinaryContainer.java | 15 +- .../hotspot/GraalHotSpotVMConfig.java | 27 +++- .../compiler/hotspot/HotSpotBackend.java | 21 ++- .../meta/HotSpotHostForeignCallsProvider.java | 16 +- .../replacements/NewObjectSnippets.java | 144 ++++++++++++------ 20 files changed, 348 insertions(+), 141 deletions(-) diff --git a/src/hotspot/share/aot/aotCodeHeap.cpp b/src/hotspot/share/aot/aotCodeHeap.cpp index 9b456e29149..e493f37d790 100644 --- a/src/hotspot/share/aot/aotCodeHeap.cpp +++ b/src/hotspot/share/aot/aotCodeHeap.cpp @@ -436,14 +436,19 @@ void AOTCodeHeap::link_graal_runtime_symbols() { SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_instance", address, JVMCIRuntime::new_instance); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_array", address, JVMCIRuntime::new_array); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_multi_array", address, JVMCIRuntime::new_multi_array); + SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_instance", address, JVMCIRuntime::dynamic_new_instance); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_array", address, JVMCIRuntime::dynamic_new_array); + SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_instance_or_null", address, JVMCIRuntime::new_instance_or_null); + SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_array_or_null", address, JVMCIRuntime::new_array_or_null); + SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_multi_array_or_null", address, JVMCIRuntime::new_multi_array_or_null); + SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_instance_or_null", address, JVMCIRuntime::dynamic_new_instance_or_null); + SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_array_or_null", address, JVMCIRuntime::dynamic_new_array_or_null); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_validate_object", address, JVMCIRuntime::validate_object); #if INCLUDE_G1GC SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_write_barrier_pre", address, JVMCIRuntime::write_barrier_pre); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_write_barrier_post", address, JVMCIRuntime::write_barrier_post); #endif SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_identity_hash_code", address, JVMCIRuntime::identity_hash_code); - SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_instance", address, JVMCIRuntime::dynamic_new_instance); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_thread_is_interrupted", address, JVMCIRuntime::thread_is_interrupted); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_exception_handler_for_pc", address, JVMCIRuntime::exception_handler_for_pc); SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_test_deoptimize_call_int", address, JVMCIRuntime::test_deoptimize_call_int); diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp index 4b9d1d311ce..5012e6b8ee1 100644 --- a/src/hotspot/share/gc/shared/memAllocator.cpp +++ b/src/hotspot/share/gc/shared/memAllocator.cpp @@ -120,27 +120,22 @@ bool MemAllocator::Allocation::check_out_of_memory() { return false; } - if (!_overhead_limit_exceeded) { + const char* message = _overhead_limit_exceeded ? "GC overhead limit exceeded" : "Java heap space"; + if (!THREAD->in_retryable_allocation()) { // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support - report_java_out_of_memory("Java heap space"); + report_java_out_of_memory(message); if (JvmtiExport::should_post_resource_exhausted()) { JvmtiExport::post_resource_exhausted( JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR | JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP, - "Java heap space"); + message); } - THROW_OOP_(Universe::out_of_memory_error_java_heap(), true); + oop exception = _overhead_limit_exceeded ? + Universe::out_of_memory_error_gc_overhead_limit() : + Universe::out_of_memory_error_java_heap(); + THROW_OOP_(exception, true); } else { - // -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError support - report_java_out_of_memory("GC overhead limit exceeded"); - - if (JvmtiExport::should_post_resource_exhausted()) { - JvmtiExport::post_resource_exhausted( - JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR | JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP, - "GC overhead limit exceeded"); - } - - THROW_OOP_(Universe::out_of_memory_error_gc_overhead_limit(), true); + THROW_OOP_(Universe::out_of_memory_error_retry(), true); } } diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp index 98ad6947c91..418df4d440f 100644 --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp @@ -109,22 +109,72 @@ static void deopt_caller() { } } -JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance(JavaThread* thread, Klass* klass)) +// Manages a scope for a JVMCI runtime call that attempts a heap allocation. +// If there is a pending exception upon closing the scope and the runtime +// call is of the variety where allocation failure returns NULL without an +// exception, the following action is taken: +// 1. The pending exception is cleared +// 2. NULL is written to JavaThread::_vm_result +// 3. Checks that an OutOfMemoryError is Universe::out_of_memory_error_retry(). +class RetryableAllocationMark: public StackObj { + private: + JavaThread* _thread; + public: + RetryableAllocationMark(JavaThread* thread, bool activate) { + if (activate) { + assert(!thread->in_retryable_allocation(), "retryable allocation scope is non-reentrant"); + _thread = thread; + _thread->set_in_retryable_allocation(true); + } else { + _thread = NULL; + } + } + ~RetryableAllocationMark() { + if (_thread != NULL) { + _thread->set_in_retryable_allocation(false); + JavaThread* THREAD = _thread; + if (HAS_PENDING_EXCEPTION) { + oop ex = PENDING_EXCEPTION; + CLEAR_PENDING_EXCEPTION; + oop retry_oome = Universe::out_of_memory_error_retry(); + if (ex->is_a(retry_oome->klass()) && retry_oome != ex) { + ResourceMark rm; + fatal("Unexpected exception in scope of retryable allocation: " INTPTR_FORMAT " of type %s", p2i(ex), ex->klass()->external_name()); + } + _thread->set_vm_result(NULL); + } + } + } +}; + +JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_instance_common(JavaThread* thread, Klass* klass, bool null_on_fail)) JRT_BLOCK; assert(klass->is_klass(), "not a class"); Handle holder(THREAD, klass->klass_holder()); // keep the klass alive InstanceKlass* ik = InstanceKlass::cast(klass); - ik->check_valid_for_instantiation(true, CHECK); - // make sure klass is initialized - ik->initialize(CHECK); - // allocate instance and return via TLS - oop obj = ik->allocate_instance(CHECK); - thread->set_vm_result(obj); + { + RetryableAllocationMark ram(thread, null_on_fail); + ik->check_valid_for_instantiation(true, CHECK); + oop obj; + if (null_on_fail) { + if (!ik->is_initialized()) { + // Cannot re-execute class initialization without side effects + // so return without attempting the initialization + return; + } + } else { + // make sure klass is initialized + ik->initialize(CHECK); + } + // allocate instance and return via TLS + obj = ik->allocate_instance(CHECK); + thread->set_vm_result(obj); + } JRT_BLOCK_END; SharedRuntime::on_slowpath_allocation_exit(thread); JRT_END -JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array(JavaThread* thread, Klass* array_klass, jint length)) +JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array_common(JavaThread* thread, Klass* array_klass, jint length, bool null_on_fail)) JRT_BLOCK; // Note: no handle for klass needed since they are not used // anymore after new_objArray() and no GC can happen before. @@ -133,10 +183,12 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array(JavaThread* thread, Klass* array_k oop obj; if (array_klass->is_typeArray_klass()) { BasicType elt_type = TypeArrayKlass::cast(array_klass)->element_type(); + RetryableAllocationMark ram(thread, null_on_fail); obj = oopFactory::new_typeArray(elt_type, length, CHECK); } else { Handle holder(THREAD, array_klass->klass_holder()); // keep the klass alive Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass(); + RetryableAllocationMark ram(thread, null_on_fail); obj = oopFactory::new_objArray(elem_klass, length, CHECK); } thread->set_vm_result(obj); @@ -146,8 +198,12 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array(JavaThread* thread, Klass* array_k static int deopts = 0; // Alternate between deoptimizing and raising an error (which will also cause a deopt) if (deopts++ % 2 == 0) { - ResourceMark rm(THREAD); - THROW(vmSymbols::java_lang_OutOfMemoryError()); + if (null_on_fail) { + return; + } else { + ResourceMark rm(THREAD); + THROW(vmSymbols::java_lang_OutOfMemoryError()); + } } else { deopt_caller(); } @@ -156,32 +212,43 @@ JRT_BLOCK_ENTRY(void, JVMCIRuntime::new_array(JavaThread* thread, Klass* array_k SharedRuntime::on_slowpath_allocation_exit(thread); JRT_END -JRT_ENTRY(void, JVMCIRuntime::new_multi_array(JavaThread* thread, Klass* klass, int rank, jint* dims)) +JRT_ENTRY(void, JVMCIRuntime::new_multi_array_common(JavaThread* thread, Klass* klass, int rank, jint* dims, bool null_on_fail)) assert(klass->is_klass(), "not a class"); assert(rank >= 1, "rank must be nonzero"); Handle holder(THREAD, klass->klass_holder()); // keep the klass alive + RetryableAllocationMark ram(thread, null_on_fail); oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); thread->set_vm_result(obj); JRT_END -JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array(JavaThread* thread, oopDesc* element_mirror, jint length)) +JRT_ENTRY(void, JVMCIRuntime::dynamic_new_array_common(JavaThread* thread, oopDesc* element_mirror, jint length, bool null_on_fail)) + RetryableAllocationMark ram(thread, null_on_fail); oop obj = Reflection::reflect_new_array(element_mirror, length, CHECK); thread->set_vm_result(obj); JRT_END -JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance(JavaThread* thread, oopDesc* type_mirror)) +JRT_ENTRY(void, JVMCIRuntime::dynamic_new_instance_common(JavaThread* thread, oopDesc* type_mirror, bool null_on_fail)) InstanceKlass* klass = InstanceKlass::cast(java_lang_Class::as_Klass(type_mirror)); if (klass == NULL) { ResourceMark rm(THREAD); THROW(vmSymbols::java_lang_InstantiationException()); } + RetryableAllocationMark ram(thread, null_on_fail); // Create new instance (the receiver) klass->check_valid_for_instantiation(false, CHECK); - // Make sure klass gets initialized - klass->initialize(CHECK); + if (null_on_fail) { + if (!klass->is_initialized()) { + // Cannot re-execute class initialization without side effects + // so return without attempting the initialization + return; + } + } else { + // Make sure klass gets initialized + klass->initialize(CHECK); + } oop obj = klass->allocate_instance(CHECK); thread->set_vm_result(obj); diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp index dcfe2ef869e..e031e7d0a47 100644 --- a/src/hotspot/share/jvmci/jvmciRuntime.hpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp @@ -121,13 +121,35 @@ class JVMCIRuntime: public AllStatic { static BasicType kindToBasicType(Handle kind, TRAPS); - // The following routines are all called from compiled JVMCI code + static void new_instance_common(JavaThread* thread, Klass* klass, bool null_on_fail); + static void new_array_common(JavaThread* thread, Klass* klass, jint length, bool null_on_fail); + static void new_multi_array_common(JavaThread* thread, Klass* klass, int rank, jint* dims, bool null_on_fail); + static void dynamic_new_array_common(JavaThread* thread, oopDesc* element_mirror, jint length, bool null_on_fail); + static void dynamic_new_instance_common(JavaThread* thread, oopDesc* type_mirror, bool null_on_fail); + + // The following routines are called from compiled JVMCI code + + // When allocation fails, these stubs: + // 1. Exercise -XX:+HeapDumpOnOutOfMemoryError and -XX:OnOutOfMemoryError handling and also + // post a JVMTI_EVENT_RESOURCE_EXHAUSTED event if the failure is an OutOfMemroyError + // 2. Return NULL with a pending exception. + // Compiled code must ensure these stubs are not called twice for the same allocation + // site due to the non-repeatable side effects in the case of OOME. + static void new_instance(JavaThread* thread, Klass* klass) { new_instance_common(thread, klass, false); } + static void new_array(JavaThread* thread, Klass* klass, jint length) { new_array_common(thread, klass, length, false); } + static void new_multi_array(JavaThread* thread, Klass* klass, int rank, jint* dims) { new_multi_array_common(thread, klass, rank, dims, false); } + static void dynamic_new_array(JavaThread* thread, oopDesc* element_mirror, jint length) { dynamic_new_array_common(thread, element_mirror, length, false); } + static void dynamic_new_instance(JavaThread* thread, oopDesc* type_mirror) { dynamic_new_instance_common(thread, type_mirror, false); } + + // When allocation fails, these stubs return NULL and have no pending exception. Compiled code + // can use these stubs if a failed allocation will be retried (e.g., by deoptimizing and + // re-executing in the interpreter). + static void new_instance_or_null(JavaThread* thread, Klass* klass) { new_instance_common(thread, klass, true); } + static void new_array_or_null(JavaThread* thread, Klass* klass, jint length) { new_array_common(thread, klass, length, true); } + static void new_multi_array_or_null(JavaThread* thread, Klass* klass, int rank, jint* dims) { new_multi_array_common(thread, klass, rank, dims, true); } + static void dynamic_new_array_or_null(JavaThread* thread, oopDesc* element_mirror, jint length) { dynamic_new_array_common(thread, element_mirror, length, true); } + static void dynamic_new_instance_or_null(JavaThread* thread, oopDesc* type_mirror) { dynamic_new_instance_common(thread, type_mirror, true); } - static void new_instance(JavaThread* thread, Klass* klass); - static void new_array(JavaThread* thread, Klass* klass, jint length); - static void new_multi_array(JavaThread* thread, Klass* klass, int rank, jint* dims); - static void dynamic_new_array(JavaThread* thread, oopDesc* element_mirror, jint length); - static void dynamic_new_instance(JavaThread* thread, oopDesc* type_mirror); static jboolean thread_is_interrupted(JavaThread* thread, oopDesc* obj, jboolean clear_interrupted); static void vm_message(jboolean vmError, jlong format, jlong v1, jlong v2, jlong v3); static jint identity_hash_code(JavaThread* thread, oopDesc* obj); diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp index de2a444a0b2..2008bff1182 100644 --- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp @@ -622,6 +622,12 @@ declare_function(JVMCIRuntime::dynamic_new_array) \ declare_function(JVMCIRuntime::dynamic_new_instance) \ \ + declare_function(JVMCIRuntime::new_instance_or_null) \ + declare_function(JVMCIRuntime::new_array_or_null) \ + declare_function(JVMCIRuntime::new_multi_array_or_null) \ + declare_function(JVMCIRuntime::dynamic_new_array_or_null) \ + declare_function(JVMCIRuntime::dynamic_new_instance_or_null) \ + \ declare_function(JVMCIRuntime::thread_is_interrupted) \ declare_function(JVMCIRuntime::vm_message) \ declare_function(JVMCIRuntime::identity_hash_code) \ diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp index 82e737867f0..c1801e3f164 100644 --- a/src/hotspot/share/memory/universe.cpp +++ b/src/hotspot/share/memory/universe.cpp @@ -113,6 +113,7 @@ oop Universe::_out_of_memory_error_class_metaspace = NULL; oop Universe::_out_of_memory_error_array_size = NULL; oop Universe::_out_of_memory_error_gc_overhead_limit = NULL; oop Universe::_out_of_memory_error_realloc_objects = NULL; +oop Universe::_out_of_memory_error_retry = NULL; oop Universe::_delayed_stack_overflow_error_message = NULL; objArrayOop Universe::_preallocated_out_of_memory_error_array = NULL; volatile jint Universe::_preallocated_out_of_memory_error_avail_count = 0; @@ -195,6 +196,7 @@ void Universe::oops_do(OopClosure* f) { f->do_oop((oop*)&_out_of_memory_error_array_size); f->do_oop((oop*)&_out_of_memory_error_gc_overhead_limit); f->do_oop((oop*)&_out_of_memory_error_realloc_objects); + f->do_oop((oop*)&_out_of_memory_error_retry); f->do_oop((oop*)&_delayed_stack_overflow_error_message); f->do_oop((oop*)&_preallocated_out_of_memory_error_array); f->do_oop((oop*)&_null_ptr_exception_instance); @@ -565,7 +567,8 @@ bool Universe::should_fill_in_stack_trace(Handle throwable) { (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_class_metaspace)) && (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_array_size)) && (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_gc_overhead_limit)) && - (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_realloc_objects))); + (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_realloc_objects)) && + (!oopDesc::equals(throwable(), Universe::_out_of_memory_error_retry))); } @@ -974,6 +977,7 @@ bool universe_post_init() { Universe::_out_of_memory_error_gc_overhead_limit = ik->allocate_instance(CHECK_false); Universe::_out_of_memory_error_realloc_objects = ik->allocate_instance(CHECK_false); + Universe::_out_of_memory_error_retry = ik->allocate_instance(CHECK_false); // Setup preallocated cause message for delayed StackOverflowError if (StackReservedPages > 0) { @@ -1019,6 +1023,9 @@ bool universe_post_init() { msg = java_lang_String::create_from_str("Java heap space: failed reallocation of scalar replaced objects", CHECK_false); java_lang_Throwable::set_message(Universe::_out_of_memory_error_realloc_objects, msg()); + msg = java_lang_String::create_from_str("Java heap space: failed retryable allocation", CHECK_false); + java_lang_Throwable::set_message(Universe::_out_of_memory_error_retry, msg()); + msg = java_lang_String::create_from_str("/ by zero", CHECK_false); java_lang_Throwable::set_message(Universe::_arithmetic_exception_instance, msg()); diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp index ae28b6f5030..0acc16a7917 100644 --- a/src/hotspot/share/memory/universe.hpp +++ b/src/hotspot/share/memory/universe.hpp @@ -148,6 +148,7 @@ class Universe: AllStatic { static oop _out_of_memory_error_array_size; static oop _out_of_memory_error_gc_overhead_limit; static oop _out_of_memory_error_realloc_objects; + static oop _out_of_memory_error_retry; // preallocated cause message for delayed StackOverflowError static oop _delayed_stack_overflow_error_message; @@ -363,6 +364,8 @@ class Universe: AllStatic { static oop out_of_memory_error_array_size() { return gen_out_of_memory_error(_out_of_memory_error_array_size); } static oop out_of_memory_error_gc_overhead_limit() { return gen_out_of_memory_error(_out_of_memory_error_gc_overhead_limit); } static oop out_of_memory_error_realloc_objects() { return gen_out_of_memory_error(_out_of_memory_error_realloc_objects); } + // Throw default _out_of_memory_error_retry object as it will never propagate out of the VM + static oop out_of_memory_error_retry() { return _out_of_memory_error_retry; } static oop delayed_stack_overflow_error_message() { return _delayed_stack_overflow_error_message; } // The particular choice of collected heap. diff --git a/src/hotspot/share/oops/arrayKlass.cpp b/src/hotspot/share/oops/arrayKlass.cpp index de046aac202..0c1a163e9ae 100644 --- a/src/hotspot/share/oops/arrayKlass.cpp +++ b/src/hotspot/share/oops/arrayKlass.cpp @@ -130,14 +130,7 @@ bool ArrayKlass::compute_is_subtype_of(Klass* k) { } objArrayOop ArrayKlass::allocate_arrayArray(int n, int length, TRAPS) { - if (length < 0) { - THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length)); - } - if (length > arrayOopDesc::max_array_length(T_ARRAY)) { - report_java_out_of_memory("Requested array size exceeds VM limit"); - JvmtiExport::post_array_size_exhausted(); - THROW_OOP_0(Universe::out_of_memory_error_array_size()); - } + check_array_allocation_length(length, arrayOopDesc::max_array_length(T_ARRAY), CHECK_0); int size = objArrayOopDesc::object_size(length); Klass* k = array_klass(n+dimension(), CHECK_0); ArrayKlass* ak = ArrayKlass::cast(k); diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index d648b5ad6cf..319cfce81e6 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -1201,14 +1201,7 @@ bool InstanceKlass::is_same_or_direct_interface(Klass *k) const { } objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) { - if (length < 0) { - THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length)); - } - if (length > arrayOopDesc::max_array_length(T_OBJECT)) { - report_java_out_of_memory("Requested array size exceeds VM limit"); - JvmtiExport::post_array_size_exhausted(); - THROW_OOP_0(Universe::out_of_memory_error_array_size()); - } + check_array_allocation_length(length, arrayOopDesc::max_array_length(T_OBJECT), CHECK_NULL); int size = objArrayOopDesc::object_size(length); Klass* ak = array_klass(n, CHECK_NULL); objArrayOop o = (objArrayOop)Universe::heap()->array_allocate(ak, size, length, diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp index 07898b0fc81..db6bf64ea70 100644 --- a/src/hotspot/share/oops/klass.cpp +++ b/src/hotspot/share/oops/klass.cpp @@ -611,6 +611,20 @@ Klass* Klass::array_klass_impl(bool or_null, TRAPS) { return NULL; } +void Klass::check_array_allocation_length(int length, int max_length, TRAPS) { + if (length > max_length) { + if (!THREAD->in_retryable_allocation()) { + report_java_out_of_memory("Requested array size exceeds VM limit"); + JvmtiExport::post_array_size_exhausted(); + THROW_OOP(Universe::out_of_memory_error_array_size()); + } else { + THROW_OOP(Universe::out_of_memory_error_retry()); + } + } else if (length < 0) { + THROW_MSG(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length)); + } +} + oop Klass::class_loader() const { return class_loader_data()->class_loader(); } // In product mode, this function doesn't have virtual function calls so diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp index d428e5b0e34..aabde977082 100644 --- a/src/hotspot/share/oops/klass.hpp +++ b/src/hotspot/share/oops/klass.hpp @@ -514,6 +514,9 @@ protected: virtual Klass* array_klass_impl(bool or_null, int rank, TRAPS); virtual Klass* array_klass_impl(bool or_null, TRAPS); + // Error handling when length > max_length or length < 0 + static void check_array_allocation_length(int length, int max_length, TRAPS); + void set_vtable_length(int len) { _vtable_len= len; } vtableEntry* start_of_vtable() const; diff --git a/src/hotspot/share/oops/objArrayKlass.cpp b/src/hotspot/share/oops/objArrayKlass.cpp index 3feacb89280..8138a0a9437 100644 --- a/src/hotspot/share/oops/objArrayKlass.cpp +++ b/src/hotspot/share/oops/objArrayKlass.cpp @@ -170,19 +170,10 @@ int ObjArrayKlass::oop_size(oop obj) const { } objArrayOop ObjArrayKlass::allocate(int length, TRAPS) { - if (length >= 0) { - if (length <= arrayOopDesc::max_array_length(T_OBJECT)) { - int size = objArrayOopDesc::object_size(length); - return (objArrayOop)Universe::heap()->array_allocate(this, size, length, - /* do_zero */ true, THREAD); - } else { - report_java_out_of_memory("Requested array size exceeds VM limit"); - JvmtiExport::post_array_size_exhausted(); - THROW_OOP_0(Universe::out_of_memory_error_array_size()); - } - } else { - THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length)); - } + check_array_allocation_length(length, arrayOopDesc::max_array_length(T_OBJECT), CHECK_0); + int size = objArrayOopDesc::object_size(length); + return (objArrayOop)Universe::heap()->array_allocate(this, size, length, + /* do_zero */ true, THREAD); } static int multi_alloc_counter = 0; diff --git a/src/hotspot/share/oops/typeArrayKlass.cpp b/src/hotspot/share/oops/typeArrayKlass.cpp index 0898b31e501..47e3f8661ac 100644 --- a/src/hotspot/share/oops/typeArrayKlass.cpp +++ b/src/hotspot/share/oops/typeArrayKlass.cpp @@ -99,19 +99,10 @@ TypeArrayKlass::TypeArrayKlass(BasicType type, Symbol* name) : ArrayKlass(name, typeArrayOop TypeArrayKlass::allocate_common(int length, bool do_zero, TRAPS) { assert(log2_element_size() >= 0, "bad scale"); - if (length >= 0) { - if (length <= max_length()) { - size_t size = typeArrayOopDesc::object_size(layout_helper(), length); - return (typeArrayOop)Universe::heap()->array_allocate(this, (int)size, length, - do_zero, CHECK_NULL); - } else { - report_java_out_of_memory("Requested array size exceeds VM limit"); - JvmtiExport::post_array_size_exhausted(); - THROW_OOP_0(Universe::out_of_memory_error_array_size()); - } - } else { - THROW_MSG_0(vmSymbols::java_lang_NegativeArraySizeException(), err_msg("%d", length)); - } + check_array_allocation_length(length, max_length(), CHECK_NULL); + size_t size = typeArrayOopDesc::object_size(layout_helper(), length); + return (typeArrayOop)Universe::heap()->array_allocate(this, (int)size, length, + do_zero, CHECK_NULL); } oop TypeArrayKlass::multi_allocate(int rank, jint* last_size, TRAPS) { diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp index f354f6faefa..1c1ee13a388 100644 --- a/src/hotspot/share/runtime/thread.cpp +++ b/src/hotspot/share/runtime/thread.cpp @@ -1547,6 +1547,7 @@ void JavaThread::initialize() { _pending_failed_speculation = 0; _pending_transfer_to_interpreter = false; _adjusting_comp_level = false; + _in_retryable_allocation = false; _jvmci._alternate_call_target = NULL; assert(_jvmci._implicit_exception_pc == NULL, "must be"); if (JVMCICounterSize > 0) { diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp index ce25684a034..3a212d85c26 100644 --- a/src/hotspot/share/runtime/thread.hpp +++ b/src/hotspot/share/runtime/thread.hpp @@ -281,6 +281,14 @@ class Thread: public ThreadShadow { void leave_signal_handler() { _num_nested_signal--; } bool is_inside_signal_handler() const { return _num_nested_signal > 0; } + // Determines if a heap allocation failure will be retried + // (e.g., by deoptimizing and re-executing in the interpreter). + // In this case, the failed allocation must raise + // Universe::out_of_memory_error_retry() and omit side effects + // such as JVMTI events and handling -XX:+HeapDumpOnOutOfMemoryError + // and -XX:OnOutOfMemoryError. + virtual bool in_retryable_allocation() const { return false; } + #ifdef ASSERT void set_suspendible_thread() { _suspendible_thread = true; @@ -1048,6 +1056,10 @@ class JavaThread: public Thread { // Guard for re-entrant call to JVMCIRuntime::adjust_comp_level bool _adjusting_comp_level; + // True if in a runtime call from compiled code that will deoptimize + // and re-execute a failed heap allocation in the interpreter. + bool _in_retryable_allocation; + // An id of a speculation that JVMCI compiled code can use to further describe and // uniquely identify the speculative optimization guarded by the uncommon trap long _pending_failed_speculation; @@ -1458,7 +1470,7 @@ class JavaThread: public Thread { #if INCLUDE_JVMCI int pending_deoptimization() const { return _pending_deoptimization; } - long pending_failed_speculation() const { return _pending_failed_speculation; } + long pending_failed_speculation() const { return _pending_failed_speculation; } bool adjusting_comp_level() const { return _adjusting_comp_level; } void set_adjusting_comp_level(bool b) { _adjusting_comp_level = b; } bool has_pending_monitorenter() const { return _pending_monitorenter; } @@ -1468,6 +1480,9 @@ class JavaThread: public Thread { void set_pending_transfer_to_interpreter(bool b) { _pending_transfer_to_interpreter = b; } void set_jvmci_alternate_call_target(address a) { assert(_jvmci._alternate_call_target == NULL, "must be"); _jvmci._alternate_call_target = a; } void set_jvmci_implicit_exception_pc(address a) { assert(_jvmci._implicit_exception_pc == NULL, "must be"); _jvmci._implicit_exception_pc = a; } + + virtual bool in_retryable_allocation() const { return _in_retryable_allocation; } + void set_in_retryable_allocation(bool b) { _in_retryable_allocation = b; } #endif // INCLUDE_JVMCI // Exception handling for compiled methods diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java index e19248cf59b..3c6fbdcfa65 100644 --- a/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java @@ -240,14 +240,20 @@ public final class BinaryContainer implements SymbolTable { {"JVMCIRuntime::log_printf", "_aot_jvmci_runtime_log_printf"}, {"JVMCIRuntime::vm_message", "_aot_jvmci_runtime_vm_message"}, {"JVMCIRuntime::new_instance", "_aot_jvmci_runtime_new_instance"}, - {"JVMCIRuntime::log_primitive", "_aot_jvmci_runtime_log_primitive"}, + {"JVMCIRuntime::new_array", "_aot_jvmci_runtime_new_array"}, {"JVMCIRuntime::new_multi_array", "_aot_jvmci_runtime_new_multi_array"}, - {"JVMCIRuntime::validate_object", "_aot_jvmci_runtime_validate_object"}, + {"JVMCIRuntime::dynamic_new_instance", "_aot_jvmci_runtime_dynamic_new_instance"}, {"JVMCIRuntime::dynamic_new_array", "_aot_jvmci_runtime_dynamic_new_array"}, + {"JVMCIRuntime::new_instance_or_null", "_aot_jvmci_runtime_new_instance_or_null"}, + {"JVMCIRuntime::new_array_or_null", "_aot_jvmci_runtime_new_array_or_null"}, + {"JVMCIRuntime::new_multi_array_or_null", "_aot_jvmci_runtime_new_multi_array_or_null"}, + {"JVMCIRuntime::dynamic_new_instance_or_null", "_aot_jvmci_runtime_dynamic_new_instance_or_null"}, + {"JVMCIRuntime::dynamic_new_array_or_null", "_aot_jvmci_runtime_dynamic_new_array_or_null"}, + {"JVMCIRuntime::log_primitive", "_aot_jvmci_runtime_log_primitive"}, + {"JVMCIRuntime::validate_object", "_aot_jvmci_runtime_validate_object"}, {"JVMCIRuntime::write_barrier_pre", "_aot_jvmci_runtime_write_barrier_pre"}, {"JVMCIRuntime::identity_hash_code", "_aot_jvmci_runtime_identity_hash_code"}, {"JVMCIRuntime::write_barrier_post", "_aot_jvmci_runtime_write_barrier_post"}, - {"JVMCIRuntime::dynamic_new_instance", "_aot_jvmci_runtime_dynamic_new_instance"}, {"JVMCIRuntime::thread_is_interrupted", "_aot_jvmci_runtime_thread_is_interrupted"}, {"JVMCIRuntime::exception_handler_for_pc", "_aot_jvmci_runtime_exception_handler_for_pc"}, {"JVMCIRuntime::test_deoptimize_call_int", "_aot_jvmci_runtime_test_deoptimize_call_int"}, @@ -256,8 +262,7 @@ public final class BinaryContainer implements SymbolTable { {"JVMCIRuntime::throw_klass_external_name_exception", "_aot_jvmci_runtime_throw_klass_external_name_exception"}, {"JVMCIRuntime::throw_class_cast_exception", "_aot_jvmci_runtime_throw_class_cast_exception"}, - {"JVMCIRuntime::vm_error", "_aot_jvmci_runtime_vm_error"}, - {"JVMCIRuntime::new_array", "_aot_jvmci_runtime_new_array"} + {"JVMCIRuntime::vm_error", "_aot_jvmci_runtime_vm_error"} }; //@formatter:on diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java index f8b8109d5f0..80db6566fb2 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java @@ -648,11 +648,33 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { public final long unsafeArraycopy = getFieldValue("StubRoutines::_unsafe_arraycopy", Long.class, "address"); public final long genericArraycopy = getFieldValue("StubRoutines::_generic_arraycopy", Long.class, "address"); + // Allocation stubs that throw an exception when allocation fails public final long newInstanceAddress = getAddress("JVMCIRuntime::new_instance"); public final long newArrayAddress = getAddress("JVMCIRuntime::new_array"); public final long newMultiArrayAddress = getAddress("JVMCIRuntime::new_multi_array"); - public final long dynamicNewArrayAddress = getAddress("JVMCIRuntime::dynamic_new_array"); - public final long dynamicNewInstanceAddress = getAddress("JVMCIRuntime::dynamic_new_instance"); + + // Allocation stubs that return null when allocation fails + public final long newInstanceOrNullAddress = getAddress("JVMCIRuntime::new_instance_or_null", 0L); + public final long newArrayOrNullAddress = getAddress("JVMCIRuntime::new_array_or_null", 0L); + public final long newMultiArrayOrNullAddress = getAddress("JVMCIRuntime::new_multi_array_or_null", 0L); + + public boolean areNullAllocationStubsAvailable() { + return newInstanceOrNullAddress != 0L; + } + + /** + * Checks that HotSpot implements all or none of the allocate-or-null stubs. + */ + private boolean checkNullAllocationStubs() { + if (newInstanceOrNullAddress == 0L) { + assert newArrayOrNullAddress == 0L; + assert newMultiArrayOrNullAddress == 0L; + } else { + assert newArrayOrNullAddress != 0L; + assert newMultiArrayOrNullAddress != 0L; + } + return true; + } public final long threadIsInterruptedAddress = getAddress("JVMCIRuntime::thread_is_interrupted"); public final long vmMessageAddress = getAddress("JVMCIRuntime::vm_message"); @@ -757,6 +779,7 @@ public class GraalHotSpotVMConfig extends GraalHotSpotVMConfigBase { } assert codeEntryAlignment > 0 : codeEntryAlignment; + assert checkNullAllocationStubs(); return true; } } diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java index 3ffa610a363..a08613f534c 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java @@ -279,20 +279,35 @@ public abstract class HotSpotBackend extends Backend implements FrameMap.Referen public static final ForeignCallDescriptor VM_ERROR = new ForeignCallDescriptor("vm_error", void.class, Object.class, Object.class, long.class); /** - * New multi array stub call. + * New multi array stub that throws an {@link OutOfMemoryError} on allocation failure. */ public static final ForeignCallDescriptor NEW_MULTI_ARRAY = new ForeignCallDescriptor("new_multi_array", Object.class, KlassPointer.class, int.class, Word.class); /** - * New array stub. + * New multi array stub that will return null on allocation failure. + */ + public static final ForeignCallDescriptor NEW_MULTI_ARRAY_OR_NULL = new ForeignCallDescriptor("new_multi_array_or_null", Object.class, KlassPointer.class, int.class, Word.class); + + /** + * New array stub that throws an {@link OutOfMemoryError} on allocation failure. */ public static final ForeignCallDescriptor NEW_ARRAY = new ForeignCallDescriptor("new_array", Object.class, KlassPointer.class, int.class); /** - * New instance stub. + * New array stub that will return null on allocation failure. + */ + public static final ForeignCallDescriptor NEW_ARRAY_OR_NULL = new ForeignCallDescriptor("new_array_or_null", Object.class, KlassPointer.class, int.class); + + /** + * New instance stub that throws an {@link OutOfMemoryError} on allocation failure. */ public static final ForeignCallDescriptor NEW_INSTANCE = new ForeignCallDescriptor("new_instance", Object.class, KlassPointer.class); + /** + * New instance stub that will return null on allocation failure. + */ + public static final ForeignCallDescriptor NEW_INSTANCE_OR_NULL = new ForeignCallDescriptor("new_instance_or_null", Object.class, KlassPointer.class); + /** * @see ResolveConstantStubCall */ diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java index 4afc1f71c02..990c0d14bdb 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java @@ -45,8 +45,11 @@ import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_SQUARE; import static org.graalvm.compiler.hotspot.HotSpotBackend.MULTIPLY_TO_LEN; import static org.graalvm.compiler.hotspot.HotSpotBackend.MUL_ADD; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_DYNAMIC_INVOKE; import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_KLASS_BY_SYMBOL; import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS; @@ -78,8 +81,6 @@ import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil. import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; import static org.graalvm.compiler.hotspot.replacements.MonitorSnippets.MONITORENTER; import static org.graalvm.compiler.hotspot.replacements.MonitorSnippets.MONITOREXIT; -import static org.graalvm.compiler.hotspot.replacements.NewObjectSnippets.DYNAMIC_NEW_ARRAY; -import static org.graalvm.compiler.hotspot.replacements.NewObjectSnippets.DYNAMIC_NEW_INSTANCE; import static org.graalvm.compiler.hotspot.replacements.ThreadSubstitutions.THREAD_IS_INTERRUPTED; import static org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.G1WBPOSTCALL; import static org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.G1WBPRECALL; @@ -288,6 +289,14 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall linkForeignCall(options, providers, NEW_INSTANCE, c.newInstanceAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); linkForeignCall(options, providers, NEW_ARRAY, c.newArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); + linkForeignCall(options, providers, NEW_MULTI_ARRAY, c.newMultiArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); + + if (c.areNullAllocationStubsAvailable()) { + linkForeignCall(options, providers, NEW_INSTANCE_OR_NULL, c.newInstanceOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); + linkForeignCall(options, providers, NEW_ARRAY_OR_NULL, c.newArrayOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); + linkForeignCall(options, providers, NEW_MULTI_ARRAY_OR_NULL, c.newMultiArrayOrNullAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); + } + link(new ExceptionHandlerStub(options, providers, foreignCalls.get(EXCEPTION_HANDLER))); link(new UnwindExceptionToCallerStub(options, providers, registerStubCall(UNWIND_EXCEPTION_TO_CALLER, SAFEPOINT, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any()))); link(new VerifyOopStub(options, providers, registerStubCall(VERIFY_OOP, LEAF_NOFP, REEXECUTABLE, NO_LOCATIONS))); @@ -305,11 +314,8 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall linkForeignCall(options, providers, REGISTER_FINALIZER, c.registerFinalizerAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any()); linkForeignCall(options, providers, MONITORENTER, c.monitorenterAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any()); linkForeignCall(options, providers, MONITOREXIT, c.monitorexitAddress, PREPEND_THREAD, STACK_INSPECTABLE_LEAF, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any()); - linkForeignCall(options, providers, NEW_MULTI_ARRAY, c.newMultiArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE, TLAB_TOP_LOCATION, TLAB_END_LOCATION); linkForeignCall(options, providers, NOTIFY, c.notifyAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any()); linkForeignCall(options, providers, NOTIFY_ALL, c.notifyAllAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE_ONLY_AFTER_EXCEPTION, any()); - linkForeignCall(options, providers, DYNAMIC_NEW_ARRAY, c.dynamicNewArrayAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE); - linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE, c.dynamicNewInstanceAddress, PREPEND_THREAD, SAFEPOINT, REEXECUTABLE); linkForeignCall(options, providers, LOG_PRINTF, c.logPrintfAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS); linkForeignCall(options, providers, LOG_OBJECT, c.logObjectAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS); linkForeignCall(options, providers, LOG_PRIMITIVE, c.logPrimitiveAddress, PREPEND_THREAD, LEAF, REEXECUTABLE, NO_LOCATIONS); diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java index a7946c78b8f..2beb6e63edf 100644 --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/NewObjectSnippets.java @@ -24,9 +24,17 @@ package org.graalvm.compiler.hotspot.replacements; +import static jdk.vm.ci.meta.DeoptimizationAction.None; +import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC; import static org.graalvm.compiler.core.common.calc.UnsignedMath.belowThan; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_VMCONFIG; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; +import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION; import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; @@ -70,6 +78,7 @@ import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; import static org.graalvm.compiler.replacements.nodes.ExplodeLoopNode.explodeLoop; import org.graalvm.compiler.api.replacements.Fold; +import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; import org.graalvm.compiler.api.replacements.Snippet; import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter; @@ -80,7 +89,6 @@ import org.graalvm.compiler.debug.GraalError; import org.graalvm.compiler.graph.Node.ConstantNodeParameter; import org.graalvm.compiler.graph.Node.NodeIntrinsic; import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; import org.graalvm.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; import org.graalvm.compiler.hotspot.nodes.DimensionsNode; @@ -126,8 +134,6 @@ import jdk.vm.ci.code.MemoryBarriers; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; -import jdk.vm.ci.meta.DeoptimizationAction; -import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaType; @@ -220,14 +226,25 @@ public class NewObjectSnippets implements Snippets { if (counters != null && counters.stub != null) { counters.stub.inc(); } - result = newInstance(HotSpotBackend.NEW_INSTANCE, hub); + result = newInstanceStub(hub); } profileAllocation("instance", size, typeContext, options); return verifyOop(result); } + public static Object newInstanceStub(KlassPointer hub) { + if (useNullAllocationStubs(INJECTED_VMCONFIG)) { + return nonNullOrDeopt(newInstanceOrNull(NEW_INSTANCE_OR_NULL, hub)); + } else { + return newInstance(NEW_INSTANCE, hub); + } + } + @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true) - public static native Object newInstance(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub); + private static native Object newInstance(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub); + + @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = false) + private static native Object newInstanceOrNull(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub); @Snippet public static Object allocateInstancePIC(@ConstantParameter int size, KlassPointer hub, Word prototypeMarkWord, @ConstantParameter boolean fillContents, @@ -244,18 +261,18 @@ public class NewObjectSnippets implements Snippets { public static Object allocateInstanceDynamic(Class type, Class classClass, @ConstantParameter boolean fillContents, @ConstantParameter Register threadRegister, @ConstantParameter OptionValues options, @ConstantParameter Counters counters) { if (probability(SLOW_PATH_PROBABILITY, type == null)) { - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(None, RuntimeConstraint); } Class nonNullType = PiNode.piCastNonNullClass(type, SnippetAnchorNode.anchor()); if (probability(SLOW_PATH_PROBABILITY, DynamicNewInstanceNode.throwsInstantiationException(type, classClass))) { - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(None, RuntimeConstraint); } - return PiNode.piCastToSnippetReplaceeStamp(allocateInstanceDynamicHelper(type, fillContents, threadRegister, options, counters, nonNullType)); + return PiNode.piCastToSnippetReplaceeStamp(allocateInstanceDynamicHelper(fillContents, threadRegister, options, counters, nonNullType)); } - private static Object allocateInstanceDynamicHelper(Class type, boolean fillContents, Register threadRegister, OptionValues options, Counters counters, Class nonNullType) { + private static Object allocateInstanceDynamicHelper(boolean fillContents, Register threadRegister, OptionValues options, Counters counters, Class nonNullType) { KlassPointer hub = ClassGetHubNode.readClass(nonNullType); if (probability(FAST_PATH_PROBABILITY, !hub.isNull())) { KlassPointer nonNullHub = ClassGetHubNode.piCastNonNull(hub, SnippetAnchorNode.anchor()); @@ -277,10 +294,11 @@ public class NewObjectSnippets implements Snippets { return allocateInstanceHelper(layoutHelper, nonNullHub, prototypeMarkWord, fillContents, threadRegister, false, "", options, counters); } } else { - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(None, RuntimeConstraint); } } - return dynamicNewInstanceStub(type); + DeoptimizeNode.deopt(None, RuntimeConstraint); + return null; } /** @@ -307,13 +325,30 @@ public class NewObjectSnippets implements Snippets { } @Snippet - public static Object allocateArray(KlassPointer hub, int length, Word prototypeMarkWord, @ConstantParameter int headerSize, @ConstantParameter int log2ElementSize, - @ConstantParameter boolean fillContents, @ConstantParameter Register threadRegister, @ConstantParameter boolean maybeUnroll, @ConstantParameter String typeContext, - @ConstantParameter OptionValues options, @ConstantParameter Counters counters) { + public static Object allocateArray(KlassPointer hub, + int length, + Word prototypeMarkWord, + @ConstantParameter int headerSize, + @ConstantParameter int log2ElementSize, + @ConstantParameter boolean fillContents, + @ConstantParameter Register threadRegister, + @ConstantParameter boolean maybeUnroll, + @ConstantParameter String typeContext, + @ConstantParameter OptionValues options, + @ConstantParameter Counters counters) { Object result = allocateArrayImpl(hub, length, prototypeMarkWord, headerSize, log2ElementSize, fillContents, threadRegister, maybeUnroll, typeContext, false, options, counters); return piArrayCastToSnippetReplaceeStamp(verifyOop(result), length); } + /** + * When allocating on the slow path, determines whether to use a version of the runtime call + * that returns {@code null} on a failed allocation instead of raising an OutOfMemoryError. + */ + @Fold + static boolean useNullAllocationStubs(@InjectedParameter GraalHotSpotVMConfig config) { + return config.areNullAllocationStubsAvailable(); + } + private static Object allocateArrayImpl(KlassPointer hub, int length, Word prototypeMarkWord, int headerSize, int log2ElementSize, boolean fillContents, Register threadRegister, boolean maybeUnroll, String typeContext, boolean skipNegativeCheck, OptionValues options, Counters counters) { Object result; @@ -331,27 +366,41 @@ public class NewObjectSnippets implements Snippets { } result = formatArray(hub, allocationSize, length, headerSize, top, prototypeMarkWord, fillContents, maybeUnroll, counters); } else { - result = newArray(HotSpotBackend.NEW_ARRAY, hub, length); + result = newArrayStub(hub, length); } profileAllocation("array", allocationSize, typeContext, options); return result; } - @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true) - public static native Object newArray(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int length); - - public static final ForeignCallDescriptor DYNAMIC_NEW_ARRAY = new ForeignCallDescriptor("dynamic_new_array", Object.class, Class.class, int.class); - public static final ForeignCallDescriptor DYNAMIC_NEW_INSTANCE = new ForeignCallDescriptor("dynamic_new_instance", Object.class, Class.class); - - @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true) - public static native Object dynamicNewArrayStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Class elementType, int length); - - public static Object dynamicNewInstanceStub(Class elementType) { - return dynamicNewInstanceStubCall(DYNAMIC_NEW_INSTANCE, elementType); + public static Object newArrayStub(KlassPointer hub, int length) { + if (useNullAllocationStubs(INJECTED_VMCONFIG)) { + return nonNullOrDeopt(newArrayOrNull(NEW_ARRAY_OR_NULL, hub, length)); + } else { + return newArray(NEW_ARRAY, hub, length); + } } @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true) - public static native Object dynamicNewInstanceStubCall(@ConstantNodeParameter ForeignCallDescriptor descriptor, Class elementType); + private static native Object newArray(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int length); + + @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = false) + private static native Object newArrayOrNull(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int length); + + /** + * Deoptimizes if {@code obj == null} otherwise returns {@code obj}. + */ + private static Object nonNullOrDeopt(Object obj) { + if (obj == null) { + DeoptimizeNode.deopt(None, RuntimeConstraint); + } + return obj; + } + + @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true) + public static native Object dynamicNewInstance(@ConstantNodeParameter ForeignCallDescriptor descriptor, Class elementType); + + @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = false) + public static native Object dynamicNewInstanceOrNull(@ConstantNodeParameter ForeignCallDescriptor descriptor, Class elementType); @Snippet public static Object allocateArrayDynamic(Class elementType, Class voidClass, int length, @ConstantParameter boolean fillContents, @ConstantParameter Register threadRegister, @@ -369,17 +418,17 @@ public class NewObjectSnippets implements Snippets { */ staticAssert(knownElementKind != JavaKind.Void, "unsupported knownElementKind"); if (knownElementKind == JavaKind.Illegal && probability(SLOW_PATH_PROBABILITY, elementType == null || DynamicNewArrayNode.throwsIllegalArgumentException(elementType, voidClass))) { - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(None, RuntimeConstraint); } KlassPointer klass = loadKlassFromObject(elementType, arrayKlassOffset(INJECTED_VMCONFIG), CLASS_ARRAY_KLASS_LOCATION); if (klass.isNull()) { - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(None, RuntimeConstraint); } KlassPointer nonNullKlass = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor()); if (length < 0) { - DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint); + DeoptimizeNode.deopt(None, RuntimeConstraint); } int layoutHelper; if (knownElementKind == JavaKind.Illegal) { @@ -412,24 +461,35 @@ public class NewObjectSnippets implements Snippets { * Calls the runtime stub for implementing MULTIANEWARRAY. */ @Snippet - public static Object newmultiarray(KlassPointer hub, @ConstantParameter int rank, @VarargsParameter int[] dimensions) { + private static Object newmultiarray(KlassPointer hub, @ConstantParameter int rank, @VarargsParameter int[] dimensions) { Word dims = DimensionsNode.allocaDimsArray(rank); ExplodeLoopNode.explodeLoop(); for (int i = 0; i < rank; i++) { dims.writeInt(i * 4, dimensions[i], LocationIdentity.init()); } - return newArrayCall(HotSpotBackend.NEW_MULTI_ARRAY, hub, rank, dims); + return newMultiArrayStub(hub, rank, dims); + } + + private static Object newMultiArrayStub(KlassPointer hub, int rank, Word dims) { + if (useNullAllocationStubs(INJECTED_VMCONFIG)) { + return nonNullOrDeopt(newMultiArrayOrNull(NEW_MULTI_ARRAY_OR_NULL, hub, rank, dims)); + } else { + return newMultiArray(NEW_MULTI_ARRAY, hub, rank, dims); + } } @Snippet - public static Object newmultiarrayPIC(KlassPointer hub, @ConstantParameter int rank, @VarargsParameter int[] dimensions) { + private static Object newmultiarrayPIC(KlassPointer hub, @ConstantParameter int rank, @VarargsParameter int[] dimensions) { // Array type would be resolved by dominating resolution. KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub); return newmultiarray(picHub, rank, dimensions); } @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = true) - public static native Object newArrayCall(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int rank, Word dims); + private static native Object newMultiArray(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int rank, Word dims); + + @NodeIntrinsic(value = ForeignCallNode.class, injectedStampIsNonNull = false) + private static native Object newMultiArrayOrNull(@ConstantNodeParameter ForeignCallDescriptor descriptor, KlassPointer hub, int rank, Word dims); /** * Maximum number of long stores to emit when zeroing an object with a constant size. Larger @@ -508,18 +568,10 @@ public class NewObjectSnippets implements Snippets { fillMemory(0xfefefefefefefefeL, size, memory, constantSize, startOffset, manualUnroll, counters); } - /** - * Formats some allocated memory with an object header and zeroes out the rest. Disables asserts - * since they can't be compiled in stubs. - */ - public static Object formatObjectForStub(KlassPointer hub, int size, Word memory, Word compileTimePrototypeMarkWord) { - return formatObject(hub, size, memory, compileTimePrototypeMarkWord, true, false, null); - } - /** * Formats some allocated memory with an object header and zeroes out the rest. */ - protected static Object formatObject(KlassPointer hub, int size, Word memory, Word compileTimePrototypeMarkWord, boolean fillContents, boolean constantSize, Counters counters) { + private static Object formatObject(KlassPointer hub, int size, Word memory, Word compileTimePrototypeMarkWord, boolean fillContents, boolean constantSize, Counters counters) { Word prototypeMarkWord = useBiasedLocking(INJECTED_VMCONFIG) ? hub.readWord(prototypeMarkWordOffset(INJECTED_VMCONFIG), PROTOTYPE_MARK_WORD_LOCATION) : compileTimePrototypeMarkWord; initializeObjectHeader(memory, prototypeMarkWord, hub); if (fillContents) { @@ -532,7 +584,7 @@ public class NewObjectSnippets implements Snippets { } @Snippet - protected static void verifyHeap(@ConstantParameter Register threadRegister) { + private static void verifyHeap(@ConstantParameter Register threadRegister) { Word thread = registerAsWord(threadRegister); Word topValue = readTlabTop(thread); if (!topValue.equal(WordFactory.zero())) { @@ -546,7 +598,7 @@ public class NewObjectSnippets implements Snippets { /** * Formats some allocated memory with an object header and zeroes out the rest. */ - public static Object formatArray(KlassPointer hub, int allocationSize, int length, int headerSize, Word memory, Word prototypeMarkWord, boolean fillContents, boolean maybeUnroll, + private static Object formatArray(KlassPointer hub, int allocationSize, int length, int headerSize, Word memory, Word prototypeMarkWord, boolean fillContents, boolean maybeUnroll, Counters counters) { memory.writeInt(arrayLengthOffset(INJECTED_VMCONFIG), length, LocationIdentity.init()); /* From 4cd9401815f65157eb7a26b5319a57ec2e81e6d2 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Sun, 7 Oct 2018 14:35:00 -0400 Subject: [PATCH 024/124] 8211765: JarFile constructor throws undocumented exception Reviewed-by: lancea, sherman, alanb, chegar --- .../share/classes/java/util/zip/ZipFile.java | 12 +++++++++--- test/jdk/java/util/jar/JarFile/Constructor.java | 12 ++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java index 2c928086e27..601f8375e3f 100644 --- a/src/java.base/share/classes/java/util/zip/ZipFile.java +++ b/src/java.base/share/classes/java/util/zip/ZipFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,7 @@ import java.io.UncheckedIOException; import java.lang.ref.Cleaner.Cleanable; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.InvalidPathException; import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.Files; import java.util.ArrayDeque; @@ -1218,8 +1219,13 @@ class ZipFile implements ZipConstants, Closeable { static Source get(File file, boolean toDelete) throws IOException { - Key key = new Key(file, - Files.readAttributes(file.toPath(), BasicFileAttributes.class)); + final Key key; + try { + key = new Key(file, + Files.readAttributes(file.toPath(), BasicFileAttributes.class)); + } catch (InvalidPathException ipe) { + throw new IOException(ipe); + } Source src; synchronized (files) { src = files.get(key); diff --git a/test/jdk/java/util/jar/JarFile/Constructor.java b/test/jdk/java/util/jar/JarFile/Constructor.java index eb935cd048a..dda7c2b6676 100644 --- a/test/jdk/java/util/jar/JarFile/Constructor.java +++ b/test/jdk/java/util/jar/JarFile/Constructor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved. * 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 @@ /** * @test - * @bug 4842702 + * @bug 4842702 8211765 * @summary Check that constructors throw specified exceptions * @author Martin Buchholz */ @@ -63,5 +63,13 @@ public class Constructor { try { Unreached (new JarFile (new File ("NoSuchJar.jar"))); } catch (IOException e) {} + + // Test that an IOExcception is thrown when an invalid charater + // is part of the path on Windows and Unix + final String invalidOSPath = System.getProperty("os.name") + .startsWith("Windows") ? "C:\\*" : "foo\u0000bar"; + + try { Unreached (new JarFile (invalidOSPath)); } + catch (IOException e) {} } } From 5cf91fc60e90bf03e113966760666adaf6d65798 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Mon, 8 Oct 2018 13:25:39 +0800 Subject: [PATCH 025/124] 8210395: Add doc to SecurityTools.java Reviewed-by: mullan --- test/lib/jdk/test/lib/SecurityTools.java | 84 +++++++++++++++++++++--- test/lib/jdk/test/lib/util/JarUtils.java | 5 +- 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/test/lib/jdk/test/lib/SecurityTools.java b/test/lib/jdk/test/lib/SecurityTools.java index 240801fb87f..d6889402349 100644 --- a/test/lib/jdk/test/lib/SecurityTools.java +++ b/test/lib/jdk/test/lib/SecurityTools.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * 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,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -36,10 +35,23 @@ import java.util.stream.Stream; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; +/** + * Run security tools (including jarsigner and keytool) in a new process. + * The en_US locale is always used so a test can always match output to + * English text. {@code /dev/urandom} is used as entropy source so tool will + * not block because of entropy scarcity. {@code -Jvm-options} is supported + * as an argument. + */ public class SecurityTools { + /** + * The response file name for keytool. Use {@link #setResponse} to + * create one. Do NOT manipulate it directly. + */ public static final String RESPONSE_FILE = "security_tools_response.txt"; + private SecurityTools() {} + private static ProcessBuilder getProcessBuilder(String tool, List args) { JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool) .addVMArg("-Duser.language=en") @@ -57,8 +69,13 @@ public class SecurityTools { return new ProcessBuilder(launcher.getCommand()); } - // keytool - + /** + * Runs keytool. + * + * @param args arguments to keytool + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ public static OutputAnalyzer keytool(List args) throws Exception { @@ -77,15 +94,46 @@ public class SecurityTools { } } - // Only call this if there is no white space in every argument + /** + * Runs keytool. + * + * @param args arguments to keytool in a single string. Only call this if + * there is no white space inside an argument. This string will + * be split with {@code \s+}. + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ public static OutputAnalyzer keytool(String args) throws Exception { return keytool(args.split("\\s+")); } + /** + * Runs keytool. + * + * @param args arguments to keytool + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ public static OutputAnalyzer keytool(String... args) throws Exception { return keytool(List.of(args)); } + + /** + * Sets the responses (user input) for keytool. + *

+ * For example, if keytool requires entering a password twice, call + * {@code setResponse("password", "password")}. Do NOT append a newline + * character to each response. If there are useless responses at the end, + * they will be discarded silently. If there are less responses than + * necessary, keytool will read EOF. The responses will be written into + * {@linkplain #RESPONSE_FILE a local file} and will only be used by the + * next keytool run. After the run, the file is removed. Calling this + * method will always overwrite the previous response file (if exists). + * + * @param responses response to keytool + * @throws IOException if there is an error + */ public static void setResponse(String... responses) throws IOException { String text; if (responses.length > 0) { @@ -97,8 +145,13 @@ public class SecurityTools { Files.write(Paths.get(RESPONSE_FILE), text.getBytes()); } - // jarsigner - + /** + * Runs jarsigner. + * + * @param args arguments to jarsigner + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ public static OutputAnalyzer jarsigner(List args) throws Exception { return execute(getProcessBuilder("jarsigner", args)); @@ -118,12 +171,27 @@ public class SecurityTools { } } - // Only call this if there is no white space in every argument + /** + * Runs jarsigner. + * + * @param args arguments to jarsigner in a single string. Only call this if + * there is no white space inside an argument. This string will + * be split with {@code \s+}. + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ public static OutputAnalyzer jarsigner(String args) throws Exception { return jarsigner(args.split("\\s+")); } + /** + * Runs jarsigner. + * + * @param args arguments to jarsigner + * @return an {@link OutputAnalyzer} object + * @throws Exception if there is an error + */ public static OutputAnalyzer jarsigner(String... args) throws Exception { return jarsigner(List.of(args)); } diff --git a/test/lib/jdk/test/lib/util/JarUtils.java b/test/lib/jdk/test/lib/util/JarUtils.java index f86c3cfcf8d..6e89b2090fc 100644 --- a/test/lib/jdk/test/lib/util/JarUtils.java +++ b/test/lib/jdk/test/lib/util/JarUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -222,6 +222,7 @@ public final class JarUtils { * be either updated or added. The files in the 2nd group * will be removed. If no "-" exists, all files belong to * the 1st group. + * @throws IOException if there is an error */ @Deprecated public static void updateJar(String src, String dest, String... files) @@ -259,7 +260,7 @@ public final class JarUtils { * Value can be Path, byte[] or String. If key exists in * src but value is Boolean FALSE. The entry is removed. * Existing entries in src not a key is unmodified. - * @throws IOException + * @throws IOException if there is an error */ @Deprecated public static void updateJar(String src, String dest, From 90d6bbd01a8153f3fef514efeefdd2edbba79b77 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Fri, 5 Oct 2018 16:47:27 +0200 Subject: [PATCH 026/124] 8211776: 8210887 broke arraycopy optimization when ZGC is enabled Reviewed-by: kvn --- src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp | 4 ++++ src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp index 73817624fda..e20d7ae0036 100644 --- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp +++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp @@ -1427,6 +1427,10 @@ Node* ZBarrierSetC2::step_over_gc_barrier(Node* c) const { return c; } +bool ZBarrierSetC2::array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const { + return type == T_OBJECT || type == T_ARRAY; +} + // == Verification == #ifdef ASSERT diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp index a273360df71..fd90a9de4d4 100644 --- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp +++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp @@ -194,7 +194,7 @@ public: virtual void enqueue_useful_gc_barrier(Unique_Node_List &worklist, Node* node) const; virtual void register_potential_barrier_node(Node* node) const; virtual void unregister_potential_barrier_node(Node* node) const; - virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const { return true; } + virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, ArrayCopyPhase phase) const; virtual Node* step_over_gc_barrier(Node* c) const; // If the BarrierSetC2 state has kept macro nodes in its compilation unit state to be // expanded later, then now is the time to do so. From b658954d7e1273665380472af9d3da209af95847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20=C3=96sterlund?= Date: Mon, 8 Oct 2018 14:48:12 +0200 Subject: [PATCH 027/124] 8211718: Supporting multiple concurrent OopStorage iterators Reviewed-by: pliden, kbarrett --- src/hotspot/share/gc/shared/oopStorage.cpp | 18 +++++++-------- src/hotspot/share/gc/shared/oopStorage.hpp | 2 +- .../share/gc/shared/oopStorageParState.hpp | 23 +++++++------------ 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/hotspot/share/gc/shared/oopStorage.cpp b/src/hotspot/share/gc/shared/oopStorage.cpp index ad1e10799e2..f69305032e2 100644 --- a/src/hotspot/share/gc/shared/oopStorage.cpp +++ b/src/hotspot/share/gc/shared/oopStorage.cpp @@ -727,7 +727,7 @@ OopStorage::OopStorage(const char* name, _allocation_mutex(allocation_mutex), _active_mutex(active_mutex), _allocation_count(0), - _concurrent_iteration_active(false) + _concurrent_iteration_count(0) { _active_array->increment_refcount(); assert(_active_mutex->rank() < _allocation_mutex->rank(), @@ -769,7 +769,7 @@ void OopStorage::delete_empty_blocks_safepoint() { // blocks available for deletion. while (reduce_deferred_updates()) {} // Don't interfere with a concurrent iteration. - if (_concurrent_iteration_active) return; + if (_concurrent_iteration_count > 0) return; // Delete empty (and otherwise deletable) blocks from end of _allocation_list. for (Block* block = _allocation_list.tail(); (block != NULL) && block->is_deletable(); @@ -804,7 +804,7 @@ void OopStorage::delete_empty_blocks_concurrent() { { MutexLockerEx aml(_active_mutex, Mutex::_no_safepoint_check_flag); // Don't interfere with a concurrent iteration. - if (_concurrent_iteration_active) return; + if (_concurrent_iteration_count > 0) return; _active_array->remove(block); } // Remove block from _allocation_list and delete it. @@ -875,7 +875,7 @@ OopStorage::BasicParState::BasicParState(const OopStorage* storage, _concurrent(concurrent) { assert(estimated_thread_count > 0, "estimated thread count must be positive"); - update_iteration_state(true); + update_concurrent_iteration_count(1); // Get the block count *after* iteration state updated, so concurrent // empty block deletion is suppressed and can't reduce the count. But // ensure the count we use was written after the block with that count @@ -885,14 +885,14 @@ OopStorage::BasicParState::BasicParState(const OopStorage* storage, OopStorage::BasicParState::~BasicParState() { _storage->relinquish_block_array(_active_array); - update_iteration_state(false); + update_concurrent_iteration_count(-1); } -void OopStorage::BasicParState::update_iteration_state(bool value) { +void OopStorage::BasicParState::update_concurrent_iteration_count(int value) { if (_concurrent) { MutexLockerEx ml(_storage->_active_mutex, Mutex::_no_safepoint_check_flag); - assert(_storage->_concurrent_iteration_active != value, "precondition"); - _storage->_concurrent_iteration_active = value; + _storage->_concurrent_iteration_count += value; + assert(_storage->_concurrent_iteration_count >= 0, "invariant"); } } @@ -954,7 +954,7 @@ void OopStorage::print_on(outputStream* st) const { st->print("%s: " SIZE_FORMAT " entries in " SIZE_FORMAT " blocks (%.F%%), " SIZE_FORMAT " bytes", name(), allocations, blocks, alloc_percentage, total_memory_usage()); - if (_concurrent_iteration_active) { + if (_concurrent_iteration_count > 0) { st->print(", concurrent iteration active"); } } diff --git a/src/hotspot/share/gc/shared/oopStorage.hpp b/src/hotspot/share/gc/shared/oopStorage.hpp index 67216180839..a6415f75490 100644 --- a/src/hotspot/share/gc/shared/oopStorage.hpp +++ b/src/hotspot/share/gc/shared/oopStorage.hpp @@ -220,7 +220,7 @@ private: mutable SingleWriterSynchronizer _protect_active; // mutable because this gets set even for const iteration. - mutable bool _concurrent_iteration_active; + mutable int _concurrent_iteration_count; Block* find_block_or_null(const oop* ptr) const; void delete_empty_block(const Block& block); diff --git a/src/hotspot/share/gc/shared/oopStorageParState.hpp b/src/hotspot/share/gc/shared/oopStorageParState.hpp index bbeffde98ff..cc5a649d585 100644 --- a/src/hotspot/share/gc/shared/oopStorageParState.hpp +++ b/src/hotspot/share/gc/shared/oopStorageParState.hpp @@ -31,22 +31,16 @@ ////////////////////////////////////////////////////////////////////////////// // Support for parallel and optionally concurrent state iteration. // -// Parallel iteration is for the exclusive use of the GC. Other iteration -// clients must use serial iteration. -// // Concurrent Iteration // // Iteration involves the _active_array (an ActiveArray), which contains all // of the blocks owned by a storage object. // -// At most one concurrent ParState can exist at a time for a given storage -// object. -// -// A concurrent ParState sets the associated storage's -// _concurrent_iteration_active flag true when the state is constructed, and -// sets it false when the state is destroyed. These assignments are made with +// A concurrent ParState increments the associated storage's +// _concurrent_iteration_count when the state is constructed, and +// decrements it when the state is destroyed. These assignments are made with // _active_mutex locked. Meanwhile, empty block deletion is not done while -// _concurrent_iteration_active is true. The flag check and the dependent +// _concurrent_iteration_count is non-zero. The counter check and the dependent // removal of a block from the _active_array is performed with _active_mutex // locked. This prevents concurrent iteration and empty block deletion from // interfering with with each other. @@ -83,8 +77,8 @@ // scheduling both operations to run at the same time. // // ParState -// concurrent must be true if iteration is concurrent with the -// mutator, false if iteration is at a safepoint. +// concurrent must be true if iteration may be concurrent with the +// mutators. // // is_const must be true if the iteration is over a constant storage // object, false if the iteration may modify the storage object. @@ -92,8 +86,7 @@ // ParState([const] OopStorage* storage) // Construct an object for managing an iteration over storage. For a // concurrent ParState, empty block deletion for the associated storage -// is inhibited for the life of the ParState. There can be no more -// than one live concurrent ParState at a time for a given storage object. +// is inhibited for the life of the ParState. // // template void iterate(F f) // Repeatedly claims a block from the associated storage that has @@ -152,7 +145,7 @@ class OopStorage::BasicParState { struct IterationData; - void update_iteration_state(bool value); + void update_concurrent_iteration_count(int value); bool claim_next_segment(IterationData* data); bool finish_iteration(const IterationData* data) const; From 1ed6b88a9965efb2992f158bdb96b86d38cb9a45 Mon Sep 17 00:00:00 2001 From: Vicente Romero Date: Mon, 8 Oct 2018 06:52:41 -0700 Subject: [PATCH 028/124] 8209407: VerifyError is thrown for inner class with lambda Reviewed-by: mcimadamore --- .../com/sun/tools/javac/comp/Lower.java | 12 ++++-- .../VerifierErrorInnerPlusLambda.java | 42 +++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 test/langtools/tools/javac/lambda/T8209407/VerifierErrorInnerPlusLambda.java diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java index 9faffe19c5e..c211a2afcbe 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java @@ -1130,10 +1130,14 @@ public class Lower extends TreeTranslator { make.at(tree.pos); return makeLit(sym.type, cv); } - // Otherwise replace the variable by its proxy. - sym = proxies.get(sym); - Assert.check(sym != null && (sym.flags_field & FINAL) != 0); - tree = make.at(tree.pos).Ident(sym); + if (lambdaTranslationMap != null && lambdaTranslationMap.get(sym) != null) { + return make.at(tree.pos).Ident(lambdaTranslationMap.get(sym)); + } else { + // Otherwise replace the variable by its proxy. + sym = proxies.get(sym); + Assert.check(sym != null && (sym.flags_field & FINAL) != 0); + tree = make.at(tree.pos).Ident(sym); + } } JCExpression base = (tree.hasTag(SELECT)) ? ((JCFieldAccess) tree).selected : null; switch (sym.kind) { diff --git a/test/langtools/tools/javac/lambda/T8209407/VerifierErrorInnerPlusLambda.java b/test/langtools/tools/javac/lambda/T8209407/VerifierErrorInnerPlusLambda.java new file mode 100644 index 00000000000..892f1bb3d9c --- /dev/null +++ b/test/langtools/tools/javac/lambda/T8209407/VerifierErrorInnerPlusLambda.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8209407 + * @summary VerifyError is thrown for inner class with lambda + */ + +import java.util.function.Supplier; + +public class VerifierErrorInnerPlusLambda { + public static void main(String[] args) { + Object a = new Object(); + class Local { Object ref = a; } + new Object() { + void unused() { + Supplier s = () -> new Local(); + } + }; + } +} From 8791ea8dc07ea3ae3b7de9307113e89a9affd6ff Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Mon, 8 Oct 2018 17:41:44 +0200 Subject: [PATCH 029/124] 8211837: Creation of the default CDS Archive should depend on ENABLE_CDS Reviewed-by: shade, goetz, mdoerr, iklam --- make/autoconf/hotspot.m4 | 36 ++++++++++++++++++++++++++++-------- make/autoconf/jdk-options.m4 | 11 +++++------ 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4 index 92616649df1..39b681085fd 100644 --- a/make/autoconf/hotspot.m4 +++ b/make/autoconf/hotspot.m4 @@ -252,14 +252,6 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS], AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds]) fi - # Disable CDS on AIX. - if test "x$OPENJDK_TARGET_OS" = "xaix"; then - ENABLE_CDS="false" - if test "x$enable_cds" = "xyes"; then - AC_MSG_ERROR([CDS is currently not supported on AIX. Remove --enable-cds.]) - fi - fi - AC_SUBST(ENABLE_CDS) ]) @@ -489,6 +481,34 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], # All variants but minimal (and custom) get these features NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs" + # Disable CDS on AIX. + if test "x$OPENJDK_TARGET_OS" = "xaix"; then + ENABLE_CDS="false" + if test "x$enable_cds" = "xyes"; then + AC_MSG_ERROR([CDS is currently not supported on AIX. Remove --enable-cds.]) + fi + fi + + # Disable CDS if user requested it with --with-jvm-features=-cds. + DISABLE_CDS=`$ECHO $DISABLED_JVM_FEATURES | $GREP cds` + if test "x$DISABLE_CDS" = "xcds"; then + ENABLE_CDS="false" + if test "x$enable_cds" = "xyes"; then + AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.]) + fi + fi + + # Disable CDS for zero, minimal, core.. + if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(minimal) || HOTSPOT_CHECK_JVM_VARIANT(core); then + # ..except when the user explicitely requested it with --enable-jvm-features + if ! HOTSPOT_CHECK_JVM_FEATURE(cds); then + ENABLE_CDS="false" + if test "x$enable_cds" = "xyes"; then + AC_MSG_ERROR([CDS not implemented for variants zero, minimal, core. Remove --enable-cds.]) + fi + fi + fi + AC_MSG_CHECKING([if cds should be enabled]) if test "x$ENABLE_CDS" = "xtrue"; then if test "x$enable_cds" = "xyes"; then diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 4dcd3b86718..c6198e63a1a 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -527,7 +527,7 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST], # Check if it's likely that it's possible to generate the classlist. Depending # on exact jvm configuration it could be possible anyway. - if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client)); then + if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) || HOTSPOT_CHECK_JVM_FEATURE(cds)); then ENABLE_GENERATE_CLASSLIST_POSSIBLE="true" else ENABLE_GENERATE_CLASSLIST_POSSIBLE="false" @@ -610,7 +610,6 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES], # # Disable the default CDS archive generation # cross compilation - disabled -# zero - off by default (not a tested configuration) # AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE], [ @@ -618,15 +617,15 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE], [Set to disable generation of a default CDS archive in the product image @<:@enabled@:>@])]) AC_MSG_CHECKING([if a default CDS archive should be generated]) - if test "x$COMPILE_TYPE" = "xcross"; then + if test "x$ENABLE_CDS" = "xfalse"; then + AC_MSG_RESULT([no, because CDS is disabled]) + BUILD_CDS_ARCHIVE="false" + elif test "x$COMPILE_TYPE" = "xcross"; then AC_MSG_RESULT([no, not possible with cross compilation]) BUILD_CDS_ARCHIVE="false" elif test "x$enable_cds_archive" = "xyes"; then AC_MSG_RESULT([yes, forced]) BUILD_CDS_ARCHIVE="true" - elif HOTSPOT_CHECK_JVM_VARIANT(zero); then - AC_MSG_RESULT([no]) - BUILD_CDS_ARCHIVE="false" elif test "x$enable_cds_archive" = "x"; then AC_MSG_RESULT([yes]) BUILD_CDS_ARCHIVE="true" From d5d74f0e260d361a5a9e794abb847f06848671f6 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Mon, 8 Oct 2018 18:16:03 +0200 Subject: [PATCH 030/124] 8211860: Avoid reading security properties eagerly on Manifest class initialization Reviewed-by: mullan, alanb --- src/java.base/share/classes/java/util/jar/Manifest.java | 7 ++----- .../classes/sun/security/util/SecurityProperties.java | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/java.base/share/classes/java/util/jar/Manifest.java b/src/java.base/share/classes/java/util/jar/Manifest.java index a6eb27129fe..384da5c622f 100644 --- a/src/java.base/share/classes/java/util/jar/Manifest.java +++ b/src/java.base/share/classes/java/util/jar/Manifest.java @@ -49,9 +49,6 @@ import sun.security.util.SecurityProperties; */ public class Manifest implements Cloneable { - private static final boolean jarInfoInExceptionText = - SecurityProperties.includedInExceptions("jar"); - // manifest main attributes private Attributes attr = new Attributes(); @@ -203,10 +200,10 @@ public class Manifest implements Cloneable { } static String getErrorPosition(String filename, final int lineNumber) { - if (filename == null || !jarInfoInExceptionText) { + if (filename == null || + !SecurityProperties.INCLUDE_JAR_NAME_IN_EXCEPTIONS) { return "line " + lineNumber; } - return "manifest of " + filename + ":" + lineNumber; } diff --git a/src/java.base/share/classes/sun/security/util/SecurityProperties.java b/src/java.base/share/classes/sun/security/util/SecurityProperties.java index 763060632d1..9acad209e00 100644 --- a/src/java.base/share/classes/sun/security/util/SecurityProperties.java +++ b/src/java.base/share/classes/sun/security/util/SecurityProperties.java @@ -32,6 +32,9 @@ import java.security.Security; public class SecurityProperties { + public static final boolean INCLUDE_JAR_NAME_IN_EXCEPTIONS + = includedInExceptions("jar"); + /** * Returns the value of the security property propName, which can be overridden * by a system property of the same name From a95d0ac2d18343a1a6c31d038d577ab6e334bd68 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Mon, 8 Oct 2018 18:29:41 +0100 Subject: [PATCH 031/124] 8211863: Problem list test/jdk/javax/naming/module/RunBasic.java Reviewed-by: lancea --- test/jdk/ProblemList.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index b373980f18c..91fe51f3600 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -866,6 +866,8 @@ com/sun/jndi/ldap/LdapTimeoutTest.java 8151678 linux-al javax/rmi/ssl/SSLSocketParametersTest.sh 8162906 generic-all +javax/naming/module/RunBasic.java 8211850 generic-all + ############################################################################ ########################################################################### From 40d81d4bcc61206798c21b46a1cf8469b0c37d42 Mon Sep 17 00:00:00 2001 From: Gary Adams Date: Mon, 8 Oct 2018 07:18:40 -0400 Subject: [PATCH 032/124] 8036026: nsk/jvmti/scenarios/capability/CM02/cm02t001 fails intermittently Reviewed-by: cjplummer, dcubed --- .../nsk/jvmti/scenarios/capability/CM02/cm02t001.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001.java index b4ff3e8ddbe..e2d5581dd20 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001.java @@ -81,8 +81,8 @@ public class cm02t001 extends DebugeeClass { return status; thread.letFinish(); - // pause to provoke contention - Thread.sleep(100); + // pause to provoke contention on thread.endingMonitor + Thread.sleep(1000); } catch (InterruptedException e) { throw new Failure(e); } From f8d8a72a27ce669ebcca551f05e6d59faf1fb7f5 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Mon, 8 Oct 2018 11:14:59 -0700 Subject: [PATCH 033/124] 8211407: Bad links to non-existent entries on serialized-form page Reviewed-by: jlahoda --- .../javadoc/internal/tool/JavadocTool.java | 16 +- .../doclet/testSerialTag/TestSerialTag.java | 145 ++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 test/langtools/jdk/javadoc/doclet/testSerialTag/TestSerialTag.java diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java index 1df3667dea6..f319a7affee 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. * 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,6 +34,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; @@ -41,6 +43,7 @@ import com.sun.tools.javac.code.ClassFinder; import com.sun.tools.javac.code.DeferredCompletionFailureHandler; import com.sun.tools.javac.code.Symbol.Completer; import com.sun.tools.javac.code.Symbol.CompletionFailure; +import com.sun.tools.javac.code.Symbol.PackageSymbol; import com.sun.tools.javac.comp.Enter; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCClassDecl; @@ -213,6 +216,17 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler { dcfh.setHandler(dcfh.userCodeHandler); etable.analyze(); + + // Ensure that package-info is read for all included packages + for (Element e : etable.getIncludedElements()) { + if (e.getKind() == ElementKind.PACKAGE) { + PackageSymbol packge = (PackageSymbol) e; + if (packge.package_info != null) { + packge.package_info.complete(); + } + } + } + } catch (CompletionFailure cf) { throw new ToolException(ABNORMAL, cf.getMessage(), cf); } catch (Abort abort) { diff --git a/test/langtools/jdk/javadoc/doclet/testSerialTag/TestSerialTag.java b/test/langtools/jdk/javadoc/doclet/testSerialTag/TestSerialTag.java new file mode 100644 index 00000000000..1c017a0760b --- /dev/null +++ b/test/langtools/jdk/javadoc/doclet/testSerialTag/TestSerialTag.java @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8207214 + * @summary Test package-level at-serial tags + * @library /tools/lib ../lib + * @modules jdk.javadoc/jdk.javadoc.internal.tool + * @build JavadocTester toolbox.ToolBox + * @run main TestSerialTag + */ + +import java.io.IOException; +import java.nio.file.Path; + +import toolbox.ToolBox; + +public class TestSerialTag extends JavadocTester { + public static void main(String... args) throws Exception { + TestSerialTag tester = new TestSerialTag(); + tester.runTests(m -> new Object[] { Path.of(m.getName()) }); + } + + private final ToolBox tb; + + TestSerialTag() { + tb = new ToolBox(); + } + + @Test + public void testCombo(Path base) throws IOException { + boolean[] moduleValues = { false, true }; + String[] tagValues = { "", "@serial include", "@serial exclude" }; + for (boolean module : moduleValues ) { + for (String tag : tagValues ) { + String name = (module ? "module-" : "") + + (tag.isEmpty() ? "default" : tag.replace("@serial ", "")); + Path dir = base.resolve(name); + test(dir, module, tag); + } + } + + } + + void test(Path base, boolean module, String tag) throws IOException { + out.println("Test: module:" + module + ", tag:" + tag); + + Path srcDir = generateSource(base, module, tag); + + Path outDir = base.resolve("out"); + if (module) { + javadoc("-d", outDir.toString(), + "--module-source-path", srcDir.toString(), + "--module", "m"); + } else { + javadoc("-d", outDir.toString(), + "-sourcepath", srcDir.toString(), + "p", "q"); + } + checkExit(Exit.OK); + + boolean expectLink = !tag.equals("@serial exclude"); + checkSeeSerializedForm(module, expectLink); + } + + /** + * Generates source for a test case. + * Two classes are generated, in two different packages. + * One package has a variable at-serial tag to test; + * The other package is a control and always has no special tag. + * + * @param base the working directory for the test case + * @param module whether or not to enclose the packages in a module + * @param tag the at-serial tag to be tested + * @return the directory in which the source was created + */ + Path generateSource(Path base, boolean module, String tag) throws IOException { + Path srcDir = base.resolve("src"); + + Path dir; + if (module) { + dir = srcDir.resolve("m"); + tb.writeJavaFiles(dir, + "module m { exports p; exports q; }"); + } else { + dir = srcDir; + } + + tb.writeJavaFiles(dir, + "/** This is package p;\n * " + tag + "\n */\n" + + "package p;", + "/** This is class p.C1;\n */\n" + + "package p; public class C1 implements java.io.Serializable { }", + "/** This is package q;\n */\n" + + "package q;", + "/** This is class q.C2;\n */\n" + + "package q; public class C2 implements java.io.Serializable { }" + ); + + return srcDir; + } + + /** + * Checks the link to the serialized form page, + * and whether classes are documented on that page. + * + * @param module whether or not the output is module-oriented + * @param b whether or not class p.C1 should be documented as serializable + */ + void checkSeeSerializedForm(boolean module, boolean b) { + String prefix = module ? "m/" : ""; + + checkOutput(prefix + "p/C1.html", b, + "serialized-form.html"); + checkOutput("serialized-form.html", b, + "C1"); + + checkOutput(prefix + "q/C2.html", true, + "serialized-form.html"); + checkOutput("serialized-form.html", true, + "C2"); + } +} + From 57622ed115530a88571786b775751119d92b0937 Mon Sep 17 00:00:00 2001 From: Jean Christophe Beyler Date: Mon, 8 Oct 2018 13:54:43 -0700 Subject: [PATCH 034/124] 8211261: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[A-G]* Remove the NSK_CPP_STUB macros Reviewed-by: amenkov, cjplummer --- .../AddCapabilities/addcaps001/addcaps001.cpp | 10 +-- .../AddCapabilities/addcaps002/addcaps002.cpp | 13 ++-- .../AddCapabilities/addcaps003/addcaps003.cpp | 13 ++-- .../attach002/attach002Agent00.cpp | 8 +-- .../attach002a/attach002aAgent00.cpp | 4 +- .../attach008/attach008Agent00.cpp | 4 +- .../attach009/attach009Agent00.cpp | 5 +- .../attach012/attach012Agent00.cpp | 4 +- .../attach014/attach014Agent00.cpp | 4 +- .../attach015/attach015Agent00.cpp | 2 +- .../attach015/attach015Agent01.cpp | 2 +- .../attach015/attach015Target.cpp | 2 +- .../attach020/attach020Agent00.cpp | 25 +++---- .../attach021/attach021Agent00.cpp | 10 +-- .../attach022/attach022Agent00.cpp | 26 ++++---- .../attach037/attach037Agent00.cpp | 4 +- .../attach038/attach038Agent00.cpp | 2 +- .../attach039/attach039Agent00.cpp | 5 +- .../attach040/attach040Agent00.cpp | 11 ++-- .../attach041/attach041Agent00.cpp | 8 +-- .../attach042/attach042Agent00.cpp | 6 +- .../attach045/attach045Agent00.cpp | 9 ++- .../attach045/attach045Agent01.cpp | 11 ++-- .../attach045/attach045Agent02.cpp | 11 ++-- .../attach045/attach045Agent03.cpp | 13 ++-- .../attach046/attach046Agent00.cpp | 4 +- .../breakpoint001/breakpoint001.cpp | 54 +++++---------- .../classfloadhk001/classfloadhk001.cpp | 6 +- .../classfloadhk002/classfloadhk002.cpp | 27 +++----- .../classfloadhk003/classfloadhk003.cpp | 39 +++++------ .../classfloadhk004/classfloadhk004.cpp | 24 +++---- .../classfloadhk005/classfloadhk005.cpp | 24 +++---- .../classfloadhk006/classfloadhk006.cpp | 42 +++++------- .../classfloadhk007/classfloadhk007.cpp | 46 +++++-------- .../classfloadhk008/classfloadhk008.cpp | 40 +++++------- .../classfloadhk009/classfloadhk009.cpp | 40 +++++------- .../ClassLoad/classload001/classload001.cpp | 24 +++---- .../compmethload001/compmethload001.cpp | 24 +++---- .../compmethunload001/compmethunload001.cpp | 31 ++++----- .../datadumpreq001/datadumpreq001.cpp | 6 +- .../disposeenv001/disposeenv001.cpp | 3 +- .../disposeenv002/disposeenv002.cpp | 13 ++-- .../dyncodgen001/dyncodgen001.cpp | 7 +- .../ForceEarlyReturn001.cpp | 65 +++---------------- .../forcegc001/forcegc001.cpp | 3 +- .../forcegc002/forcegc002.cpp | 9 +-- .../gcfinish001/gcfinish001.cpp | 42 ++++-------- .../gcstart001/gcstart001.cpp | 18 ++--- .../gcstart002/gcstart002.cpp | 42 ++++-------- .../genevents001/genevents001.cpp | 13 ++-- 50 files changed, 308 insertions(+), 550 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp index 84582f82f9c..86626181ea3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp @@ -192,8 +192,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const memset(&caps, 0, sizeof(jvmtiCapabilities)); NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return NSK_FALSE; } @@ -216,8 +215,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const */ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) { NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... set\n"); @@ -314,9 +312,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp index 26be8b94978..54b85588f5c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp @@ -192,8 +192,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const memset(&caps, 0, sizeof(jvmtiCapabilities)); NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return NSK_FALSE; } @@ -216,8 +215,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const */ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) { NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... set\n"); @@ -231,8 +229,7 @@ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char */ static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) { return NSK_FALSE; } @@ -334,9 +331,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp index c991a153efd..0f5476edc1d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp @@ -57,8 +57,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const memset(&caps, 0, sizeof(jvmtiCapabilities)); NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return NSK_FALSE; } @@ -71,8 +70,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const */ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) { NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... set\n"); @@ -86,8 +84,7 @@ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char */ static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) { return NSK_FALSE; } @@ -183,9 +180,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp index 59773e7391c..e1e7ef19768 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp @@ -74,12 +74,12 @@ int registerNativeMethods(JNIEnv* jni) { jint nativeMethodsNumber = 1; if (!NSK_JNI_VERIFY(jni, (appClass = - NSK_CPP_STUB2(FindClass, jni, ATTACH002_TARGET_APP_CLASS_NAME)) != NULL)) { + jni->FindClass(ATTACH002_TARGET_APP_CLASS_NAME)) != NULL)) { return NSK_FALSE; } if (!NSK_JNI_VERIFY(jni, - (NSK_CPP_STUB4(RegisterNatives, jni, appClass, nativeMethods, nativeMethodsNumber) == 0))) { + (jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) { return NSK_FALSE; } @@ -205,7 +205,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { /* * If VM is run with -Xshare:on agent can't get required capabilities (see 6718407) */ @@ -222,7 +222,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) eventCallbacks.ClassLoad = classLoadHandler; eventCallbacks.ClassPrepare = classPrepareHandler; eventCallbacks.ClassFileLoadHook = classFileLoadHoockHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp index a87df8a8150..7cc40cc82fd 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp @@ -106,13 +106,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_redefine_classes = 1; caps.can_generate_vm_object_alloc_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.VMObjectAlloc = vmObjectAllocHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp index db609331bcf..f46eccf0cf1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp @@ -123,14 +123,14 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_generate_monitor_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.MonitorContendedEntered = monitorContentedEnteredHandler; eventCallbacks.MonitorContendedEnter = monitorContentedEnterHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp index 7f8159c4aa2..7a5be6d5784 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp @@ -82,8 +82,7 @@ classLoadHandler(jvmtiEnv *jvmti, return; } - if (!NSK_JVMTI_VERIFY( NSK_CPP_STUB4( - SetEventNotificationMode, jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread) ) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, thread) ) ) { NSK_COMPLAIN1("Failed to enable events for thread '%s'\n", mainThreadName); nsk_aod_agentFinished(jni, agentName, 0); return; @@ -142,7 +141,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassLoad = classLoadHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp index effc70e40f3..17ef6332a21 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp @@ -65,7 +65,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)) ) { return JNI_ERR; } @@ -75,7 +75,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) NSK_DISPLAY1("%s: trying to get all potential capabilities:\n", agentName); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp index 657f61a2103..67c5b53970b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp @@ -62,7 +62,7 @@ classLoadHandler(jvmtiEnv *jvmti, if (!nsk_jvmti_aod_disableEvent(jvmti, JVMTI_EVENT_CLASS_LOAD)) success = 0; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB1(DisposeEnvironment, jvmti))) { + if (!NSK_JVMTI_VERIFY(jvmti->DisposeEnvironment())) { success = 0; NSK_COMPLAIN1("%s: failed to dispose environment\n", agentName); } else { @@ -104,7 +104,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassLoad = classLoadHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp index e6d6178a2f7..562d36c4338 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp @@ -97,7 +97,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassPrepare = classPrepareHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp index c0343f515b7..26f92d03a5b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp @@ -97,7 +97,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassLoad = classLoadHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp index f94e3553f5b..f54427e3607 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp @@ -37,7 +37,7 @@ extern "C" { */ JNIEXPORT jboolean JNICALL Java_nsk_jvmti_AttachOnDemand_attach015_attach015Target_loadClassFromNative(JNIEnv * jni, jclass klass) { - return NSK_CPP_STUB2(FindClass, jni, LOADED_CLASS_NAME) ? JNI_TRUE : JNI_FALSE; + return jni->FindClass(LOADED_CLASS_NAME) ? JNI_TRUE : JNI_FALSE; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp index 7fff53ec853..6f12b7c26d5 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp @@ -71,17 +71,15 @@ void JNICALL garbageCollectionFinishHandler(jvmtiEnv *jvmti) { success = 0; } - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, gcFinishMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(gcFinishMonitor))) { gcFinishEventReceived = 1; - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorNotify, jvmti, gcFinishMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorNotify(gcFinishMonitor))) { auxiliaryThreadNotified = 1; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, gcFinishMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(gcFinishMonitor))) { success = 0; } } else { @@ -96,17 +94,15 @@ void JNICALL garbageCollectionFinishHandler(jvmtiEnv *jvmti) { void JNICALL auxiliaryThreadFunction(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("%s: auxiliary thread is running\n", agentName); - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, gcFinishMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(gcFinishMonitor))) { if (!gcFinishEventReceived) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3( - RawMonitorWait, jvmti, gcFinishMonitor, 0))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(gcFinishMonitor, 0))) { success = 0; } } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, gcFinishMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(gcFinishMonitor))) { success = 0; } } else { @@ -122,8 +118,7 @@ int startAuxiliaryThread(jvmtiEnv* jvmti, JNIEnv* jni) { if (!NSK_VERIFY((thread = nsk_jvmti_aod_createThread(jni)) != NULL)) return NSK_FALSE; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5( - RunAgentThread, jvmti, thread, auxiliaryThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY ))) { + if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, auxiliaryThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY ))) { return NSK_FALSE; } @@ -161,7 +156,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "GCFinishMonitor", &gcFinishMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("GCFinishMonitor", &gcFinishMonitor))) { return JNI_ERR; } @@ -170,14 +165,14 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_generate_garbage_collection_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.GarbageCollectionStart = garbageCollectionStartHandler; eventCallbacks.GarbageCollectionFinish = garbageCollectionFinishHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp index 4c4a0b32337..0428050acc4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp @@ -56,7 +56,7 @@ volatile int success = 0; JNIEXPORT jboolean JNICALL Java_nsk_jvmti_AttachOnDemand_attach021_attach021Target_setTagFor(JNIEnv * jni, jclass klass, jobject obj) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, obj, TAG_VALUE))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, TAG_VALUE))) { return JNI_FALSE; } @@ -95,12 +95,12 @@ int registerNativeMethods(JNIEnv* jni) { jint nativeMethodsNumber = 2; if (!NSK_JNI_VERIFY(jni, (appClass = - NSK_CPP_STUB2(FindClass, jni, ATTACH021_TARGET_APP_CLASS_NAME)) != NULL)) { + jni->FindClass(ATTACH021_TARGET_APP_CLASS_NAME)) != NULL)) { return NSK_FALSE; } if (!NSK_JNI_VERIFY(jni, - (NSK_CPP_STUB4(RegisterNatives, jni, appClass, nativeMethods, nativeMethodsNumber) == 0))) { + (jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) { return NSK_FALSE; } @@ -142,13 +142,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = objectFreeHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp index 456772afc9a..fe99b80dc03 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp @@ -84,12 +84,10 @@ Java_nsk_jvmti_AttachOnDemand_attach022_attach022Target_shutdownAgent(JNIEnv * j void JNICALL objectFreeHandler(jvmtiEnv *jvmti, jlong tag) { NSK_DISPLAY2("%s: ObjectFree event received (object tag: %ld)\n", agentName, tag); - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, objectFreeMonitor))) { - + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(objectFreeMonitor))) { freedObjectsCounter++; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, objectFreeMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(objectFreeMonitor))) { success = 0; } } else { @@ -107,12 +105,12 @@ int registerNativeMethods(JNIEnv* jni) { jint nativeMethodsNumber = 1; if (!NSK_JNI_VERIFY(jni, (appClass = - NSK_CPP_STUB2(FindClass, jni, ATTACH022_TARGET_APP_CLASS_NAME)) != NULL)) { + jni->FindClass(ATTACH022_TARGET_APP_CLASS_NAME)) != NULL)) { return NSK_FALSE; } if (!NSK_JNI_VERIFY(jni, - (NSK_CPP_STUB4(RegisterNatives, jni, appClass, nativeMethods, nativeMethodsNumber) == 0))) { + (jni->RegisterNatives(appClass, nativeMethods, nativeMethodsNumber) == 0))) { return NSK_FALSE; } @@ -136,12 +134,10 @@ void JNICALL vmObjectAllocHandler(jvmtiEnv * jvmti, NSK_DISPLAY2("%s: ObjectAlloc event received (object class: %s)\n", agentName, className); if (!strcmp(className, OBJECTS_FOR_ALLOCATION_TEST_CLASS_NAME)) { - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, objectTagMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(objectTagMonitor))) { jlong tagValue = taggedObjectsCounter + 1; - - if (!NSK_JVMTI_VERIFY( NSK_CPP_STUB3(SetTag, jvmti, object, tagValue))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(object, tagValue))) { NSK_COMPLAIN1("%s: failed to set tag\n", agentName); success = 0; } else { @@ -149,7 +145,7 @@ void JNICALL vmObjectAllocHandler(jvmtiEnv * jvmti, taggedObjectsCounter++; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, objectTagMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(objectTagMonitor))) { success = 0; } } else { @@ -195,11 +191,11 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) return JNI_ERR; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "ObjectTagMonitor", &objectTagMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("ObjectTagMonitor", &objectTagMonitor))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "ObjectFreeMonitor", &objectFreeMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("ObjectFreeMonitor", &objectFreeMonitor))) { return JNI_ERR; } @@ -207,14 +203,14 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; caps.can_generate_vm_object_alloc_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = objectFreeHandler; eventCallbacks.VMObjectAlloc = vmObjectAllocHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp index 242fc2439eb..b56383f6c96 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp @@ -122,14 +122,14 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_generate_monitor_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.MonitorWaited = monitorWaitedHandler; eventCallbacks.MonitorWait = monitorWaitHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp index 4400bc9771f..b6b24a5331e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp @@ -119,7 +119,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ThreadEnd = threadEndHandler; eventCallbacks.ThreadStart = threadStartHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp index 97498e3c632..52178d35085 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp @@ -68,8 +68,7 @@ int startNewThread(jvmtiEnv* jvmti, JNIEnv* jni) { if (!NSK_VERIFY((thread = nsk_jvmti_aod_createThreadWithName(jni, STARTED_THREAD_NAME)) != NULL)) return NSK_FALSE; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5( - RunAgentThread, jvmti, thread, startedThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY ))) { + if (!NSK_JVMTI_VERIFY(jvmti->RunAgentThread(thread, startedThreadFunction, NULL, JVMTI_THREAD_NORM_PRIORITY ))) { return NSK_FALSE; } @@ -155,7 +154,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ThreadEnd = threadEndHandler; eventCallbacks.ThreadStart = threadStartHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp index 69d18add5af..bf3aa7b4f1e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp @@ -66,7 +66,7 @@ void JNICALL threadStartHandler(jvmtiEnv *jvmti, NSK_DISPLAY2("%s: ThreadStart event was received for thread '%s'\n", agentName, startedThreadName); - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetAllThreads, jvmti, &threadsCount, &threads))) { + if (NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threadsCount, &threads))) { int startedThreadWasFound = 0; for (i = 0; i < threadsCount; i++) { @@ -94,8 +94,7 @@ void JNICALL threadStartHandler(jvmtiEnv *jvmti, } if (strstr(startedThreadName, TEST_THREAD_NAME_PREFIX)) { - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, threadsCounterMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(threadsCounterMonitor))) { testThreadsCounter++; @@ -103,7 +102,7 @@ void JNICALL threadStartHandler(jvmtiEnv *jvmti, nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_THREAD_START, success, jvmti, jni); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, threadsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(threadsCounterMonitor))) { success = 0; } } else { @@ -145,13 +144,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "threadsCounterMonitor", &threadsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("threadsCounterMonitor", &threadsCounterMonitor))) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ThreadStart = threadStartHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp index 33154062acb..e1129d05095 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp @@ -52,7 +52,7 @@ int tryFindThread(jvmtiEnv *jvmti, jthreadGroup group, const char* threadNameToF int i; char threadGroupName[MAX_STRING_LENGTH]; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadGroupInfo, jvmti, group, &groupInfo))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetThreadGroupInfo(group, &groupInfo))) { return 0; } @@ -61,7 +61,7 @@ int tryFindThread(jvmtiEnv *jvmti, jthreadGroup group, const char* threadNameToF NSK_DISPLAY3("%s: trying to find thread '%s' in group '%s'\n", agentName, threadNameToFind, threadGroupName); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB6(GetThreadGroupChildren, jvmti, group, &threadsCount, &threads, &groupsCount, &groups))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetThreadGroupChildren(group, &threadsCount, &threads, &groupsCount, &groups))) { return 0; } @@ -118,7 +118,7 @@ void JNICALL threadStartHandler(jvmtiEnv *jvmti, jthreadGroup *topGroups; int i; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetTopThreadGroups, jvmti, &groupsCount, &topGroups))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetTopThreadGroups(&groupsCount, &topGroups))) { NSK_COMPLAIN1("%s: failed to get top thread groups\n", agentName); nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_THREAD_START, 0, jvmti, jni); return; @@ -172,7 +172,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ThreadStart = threadStartHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp index 1c87c3389c4..df8dc63ed8b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp @@ -62,7 +62,7 @@ void JNICALL threadStartHandler(jvmtiEnv *jvmti, int i; int startedThreadWasFound = 0; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetAllThreads, jvmti, &threadsCount, &threads))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threadsCount, &threads))) { NSK_COMPLAIN1("%s: failed to get all threads\n", agentName); nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_THREAD_START, 0, jvmti, jni); return; @@ -85,7 +85,7 @@ void JNICALL threadStartHandler(jvmtiEnv *jvmti, startedThreadWasFound = 1; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadState, jvmti, threads[i], &threadState))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threads[i], &threadState))) { NSK_COMPLAIN2("%s: failed to get status of thread '%s'\n", agentName, threadName); nsk_jvmti_aod_deallocate(jvmti, (unsigned char*)threads); nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_THREAD_START, 0, jvmti, jni); @@ -136,7 +136,7 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ThreadStart = threadStartHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp index 1e850f6559d..31369ce892e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp @@ -57,8 +57,7 @@ void JNICALL classLoadHandler( return; } - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, eventsCounterMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(eventsCounterMonitor))) { eventsCounter++; @@ -69,7 +68,7 @@ void JNICALL classLoadHandler( nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_CLASS_LOAD, success, jvmti, jni); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(eventsCounterMonitor))) { success = 0; } } else { @@ -109,13 +108,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "attach045-agent00-eventsCounterMonitor", &eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("attach045-agent00-eventsCounterMonitor", &eventsCounterMonitor))) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassLoad = classLoadHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp index 8cad9b3b5cd..93ec8bc6d10 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp @@ -59,7 +59,7 @@ void JNICALL classPrepareHandler( return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetLoadedClasses, jvmti, &loadedClassesCount, &loadedClasses))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetLoadedClasses(&loadedClassesCount, &loadedClasses))) { NSK_COMPLAIN1("%s: failed to get loaded classes\n", agentName); nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_CLASS_PREPARE, 0, jvmti, jni); return; @@ -67,8 +67,7 @@ void JNICALL classPrepareHandler( nsk_jvmti_aod_deallocate(jvmti, (unsigned char*)loadedClasses); - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, eventsCounterMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(eventsCounterMonitor))) { eventsCounter++; @@ -80,7 +79,7 @@ void JNICALL classPrepareHandler( nsk_jvmti_aod_disableEventAndFinish(agentName, JVMTI_EVENT_CLASS_PREPARE, success, jvmti, jni); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(eventsCounterMonitor))) { success = 0; } } else { @@ -120,13 +119,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "attach045-agent01-eventsCounterMonitor", &eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("attach045-agent01-eventsCounterMonitor", &eventsCounterMonitor))) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassPrepare = classPrepareHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp index 370c270acbb..c18df3e7264 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp @@ -62,7 +62,7 @@ void eventHandler(jvmtiEnv *jvmti, return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetAllThreads, jvmti, &threadsCount, &threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threadsCount, &threads))) { NSK_COMPLAIN1("%s: failed to get all threads\n", agentName); nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, 0, jvmti, jni); return; @@ -70,8 +70,7 @@ void eventHandler(jvmtiEnv *jvmti, nsk_jvmti_aod_deallocate(jvmti, (unsigned char*)threads); - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, eventsCounterMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(eventsCounterMonitor))) { eventsCounter++; @@ -86,7 +85,7 @@ void eventHandler(jvmtiEnv *jvmti, nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, success, jvmti, jni); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(eventsCounterMonitor))) { success = 0; } } else { @@ -140,14 +139,14 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "attach045-agent02-eventsCounterMonitor", &eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("attach045-agent02-eventsCounterMonitor", &eventsCounterMonitor))) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ThreadStart = threadStartHandler; eventCallbacks.ThreadEnd = threadEndHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp index 6042462e31c..6db7f98556b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp @@ -68,8 +68,7 @@ VMObjectAllocHandler(jvmtiEnv *jvmti, return; } - if (NSK_JVMTI_VERIFY(NSK_CPP_STUB2( - RawMonitorEnter, jvmti, eventsCounterMonitor))) { + if (NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(eventsCounterMonitor))) { eventsCounter++; @@ -79,7 +78,7 @@ VMObjectAllocHandler(jvmtiEnv *jvmti, if ((eventsCounter % 10) == 0) { NSK_DISPLAY1("%s: force garbage collection\n", agentName); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB1(ForceGarbageCollection, jvmti))) + if (!NSK_JVMTI_VERIFY(jvmti->ForceGarbageCollection())) success = 0; } @@ -89,7 +88,7 @@ VMObjectAllocHandler(jvmtiEnv *jvmti, nsk_jvmti_aod_disableEventsAndFinish(agentName, testEvents, testEventsNumber, success, jvmti, jni); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(eventsCounterMonitor))) { success = 0; } } else { @@ -130,19 +129,19 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, jvmti, "attach045-agent03-eventsCounterMonitor", &eventsCounterMonitor))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("attach045-agent03-eventsCounterMonitor", &eventsCounterMonitor))) { return JNI_ERR; } memset(&caps, 0, sizeof(caps)); caps.can_generate_vm_object_alloc_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.VMObjectAlloc = VMObjectAllocHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp index ba4a31c8125..2325e16b38b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp @@ -113,13 +113,13 @@ Agent_OnAttach(JavaVM *vm, char *optionsString, void *reserved) memset(&caps, 0, sizeof(caps)); caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)) ) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)) ) { return JNI_ERR; } memset(&eventCallbacks,0, sizeof(eventCallbacks)); eventCallbacks.ClassLoad = classLoadHandler; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti, &eventCallbacks, sizeof(eventCallbacks))) ) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))) ) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp index a9e7360f65b..636040d2a51 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Breakpoint/breakpoint001/breakpoint001.cpp @@ -67,15 +67,11 @@ static void setBP(jvmtiEnv *jvmti_env, JNIEnv *env, jclass klass) { int i; for (i=0; iGetMethodID(klass, METHODS[i][0], METHODS[i][1])) != NULL)) + env->FatalError("failed to get ID for the java method\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetBreakpoint, - jvmti_env, mid, 0))) - NSK_CPP_STUB2(FatalError, env, - "failed to set breakpoint\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->SetBreakpoint(mid, 0))) + env->FatalError("failed to set breakpoint\n"); } } @@ -88,10 +84,8 @@ ClassLoad(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread, jclass klass) { if (vm_started) { // GetClassSignature may be called only during the start or the live phase - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti_env, klass, &sig, &generic))) - NSK_CPP_STUB2(FatalError, env, - "failed to obtain a class signature\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &sig, &generic))) + env->FatalError("failed to obtain a class signature\n"); if (sig != NULL && (strcmp(sig, CLASS_SIG) == 0)) { NSK_DISPLAY1( @@ -117,8 +111,7 @@ Breakpoint(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, NSK_DISPLAY0(">>>> Breakpoint event received\n"); /* checking thread info */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, - jvmti_env, thread, &thr_info))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &thr_info))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get thread info during Breakpoint callback\n\n"); return; @@ -148,14 +141,12 @@ Breakpoint(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, (long) location); /* checking method info */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, - jvmti_env, method, &klass))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(method, &klass))) { result = checkStatus = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get method declaring class during Breakpoint callback\n\n"); return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti_env, klass, &clsSig, &generic))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &clsSig, &generic))) { result = checkStatus = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to obtain a class signature during Breakpoint callback\n\n"); return; @@ -172,8 +163,7 @@ Breakpoint(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, NSK_DISPLAY1("CHECK PASSED: class signature: \"%s\"\n", clsSig); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &methNam, &methSig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &methNam, &methSig, NULL))) { result = checkStatus = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get method name during Breakpoint callback\n\n"); return; @@ -189,13 +179,11 @@ Breakpoint(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, break; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methNam))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methNam))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method name\n\n"); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methSig))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methSig))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method signature\n\n"); } @@ -265,12 +253,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_breakpoint_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_single_step_events) @@ -282,20 +268,16 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.ClassLoad = &ClassLoad; callbacks.Breakpoint = &Breakpoint; callbacks.VMStart = &VMStart; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_START, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_START, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp index 3a4ba0a5090..ef6c10fc9fc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp @@ -93,13 +93,11 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { NSK_DISPLAY0("setting event callbacks ...\n"); (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling ClassFileLoadHook event ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling ClassFileLoadHook event done\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp index c4b2d25c9e4..520563f459f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp @@ -122,7 +122,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -130,14 +130,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -145,17 +144,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -167,7 +163,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -190,7 +186,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -240,8 +236,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Deallocate bytecode array: 0x%p\n", (void*)origClassBytes); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, origClassBytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(origClassBytes))) { nsk_jvmti_setFailStatus(); } } @@ -318,8 +313,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -332,8 +326,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp index f7091dadfef..b9a11398753 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp @@ -127,7 +127,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -135,14 +135,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -150,17 +149,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -172,7 +168,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -187,23 +183,21 @@ static jobject getObject(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)fieldID); NSK_DISPLAY1("Get object from static field: %s\n", fieldName); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)obj); NSK_DISPLAY1("Make global reference to object: 0x%p\n", obj); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->NewGlobalRef(obj)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } @@ -229,7 +223,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Obtain debuggee class\n"); NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -286,11 +280,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete global reference to classloader object: 0x%p\n", (void*)classLoader); - NSK_CPP_STUB2(DeleteGlobalRef, jni, classLoader); + jni->DeleteGlobalRef(classLoader); NSK_DISPLAY1("Deallocate classfile bytes array: 0x%p\n", (void*)origClassBytes); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, origClassBytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(origClassBytes))) { nsk_jvmti_setFailStatus(); } } @@ -331,7 +324,7 @@ callbackClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, NSK_COMPLAIN1("Unexpected NULL classloader in CLASS_FILE_LOAD_HOOK: 0x%p\n", (void*)loader); nsk_jvmti_setFailStatus(); - } else if (!NSK_CPP_STUB3(IsSameObject, jni, loader, classLoader)) { + } else if (!jni->IsSameObject(loader, classLoader)) { NSK_COMPLAIN2("Unexpected classloader in CLASS_FILE_LOAD_HOOK for tested class:\n" "# got classloder: 0x%p\n" "# expected same as: 0x%p\n", @@ -380,8 +373,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -394,8 +386,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp index 236729dfc5a..7fe5d9b89d1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp @@ -61,7 +61,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -69,14 +69,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -84,17 +83,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -106,7 +102,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -129,7 +125,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -271,8 +267,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -285,8 +280,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp index 34e47603e34..937d8d4a3e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp @@ -123,7 +123,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -131,14 +131,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -146,17 +145,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -168,7 +164,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -191,7 +187,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -333,8 +329,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -347,8 +342,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp index 4422f34f21b..41d48e5a484 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp @@ -128,7 +128,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -136,14 +136,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -151,17 +150,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -173,7 +169,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -188,23 +184,21 @@ static jobject getObject(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)fieldID); NSK_DISPLAY1("Get object from static field: %s\n", fieldName); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)obj); NSK_DISPLAY1("Make global reference to object: 0x%p\n", obj); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->NewGlobalRef(obj)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } @@ -223,8 +217,7 @@ static int redefineClass(jvmtiEnv* jvmti, jclass klass, const char className[], classDef.class_bytes = bytes; NSK_DISPLAY1("Redefine class: %s\n", className); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -250,7 +243,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Obtain debuggee class\n"); NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -309,11 +302,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete global reference to tested class object: 0x%p\n", (void*)testedClass); - NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass); + jni->DeleteGlobalRef(testedClass); NSK_DISPLAY1("Deallocate redefined bytecode array: 0x%p\n", (void*)redefClassBytes); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, redefClassBytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(redefClassBytes))) { nsk_jvmti_setFailStatus(); } } @@ -347,7 +339,7 @@ callbackClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, NSK_COMPLAIN1("Unexpected NULL class_being_redefined in CLASS_FILE_LOAD_HOOK: 0x%p\n", (void*)class_being_redefined); nsk_jvmti_setFailStatus(); - } else if (!NSK_CPP_STUB3(IsSameObject, jni, class_being_redefined, testedClass)) { + } else if (!jni->IsSameObject(class_being_redefined, testedClass)) { NSK_COMPLAIN2("Unexpected class_being_redefined in CLASS_FILE_LOAD_HOOK:\n" "# got class: 0x%p\n" "# expected same as: 0x%p\n", @@ -397,8 +389,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -411,8 +402,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp index f0daec6533c..8c1f686361a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp @@ -132,7 +132,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -140,14 +140,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -155,17 +154,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -177,7 +173,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -192,23 +188,21 @@ static jobject getObject(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)fieldID); NSK_DISPLAY1("Get object from static field: %s\n", fieldName); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)obj); NSK_DISPLAY1("Make global reference to object: 0x%p\n", obj); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->NewGlobalRef(obj)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } @@ -227,8 +221,7 @@ static int redefineClass(jvmtiEnv* jvmti, jclass klass, const char className[], classDef.class_bytes = bytes; NSK_DISPLAY1("Redefine class: %s\n", className); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -254,7 +247,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Obtain debuggee class\n"); NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -319,14 +312,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete global reference to classloader object: 0x%p\n", (void*)classLoader); - NSK_CPP_STUB2(DeleteGlobalRef, jni, classLoader); + jni->DeleteGlobalRef(classLoader); NSK_DISPLAY1("Delete global reference to tested class object: 0x%p\n", (void*)testedClass); - NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass); + jni->DeleteGlobalRef(testedClass); NSK_DISPLAY1("Deallocate redefined bytecode array: 0x%p\n", (void*)redefClassBytes); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, redefClassBytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(redefClassBytes))) { nsk_jvmti_setFailStatus(); } } @@ -360,7 +352,7 @@ callbackClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, NSK_COMPLAIN1("Unexpected NULL classloader in CLASS_FILE_LOAD_HOOK: 0x%p\n", (void*)loader); nsk_jvmti_setFailStatus(); - } else if (!NSK_CPP_STUB3(IsSameObject, jni, loader, classLoader)) { + } else if (!jni->IsSameObject(loader, classLoader)) { NSK_COMPLAIN2("Unexpected classloader in CLASS_FILE_LOAD_HOOK:\n" "# got classloder: 0x%p\n" "# expected same as: 0x%p\n", @@ -373,7 +365,7 @@ callbackClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, NSK_COMPLAIN1("Unexpected NULL class_being_redefined in CLASS_FILE_LOAD_HOOK: 0x%p\n", (void*)class_being_redefined); nsk_jvmti_setFailStatus(); - } else if (!NSK_CPP_STUB3(IsSameObject, jni, class_being_redefined, testedClass)) { + } else if (!jni->IsSameObject(class_being_redefined, testedClass)) { NSK_COMPLAIN2("Unexpected class_being_redefined in CLASS_FILE_LOAD_HOOK:\n" "# got class: 0x%p\n" "# expected same as: 0x%p\n", @@ -423,8 +415,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -437,8 +428,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp index d6d43cf07e3..7f18912194d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp @@ -70,7 +70,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -78,14 +78,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -93,17 +92,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -115,7 +111,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -130,23 +126,21 @@ static jobject getObject(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)fieldID); NSK_DISPLAY1("Get object from static field: %s\n", fieldName); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)obj); NSK_DISPLAY1("Make global reference to object: 0x%p\n", obj); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->NewGlobalRef(obj)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } @@ -165,8 +159,7 @@ static int redefineClass(jvmtiEnv* jvmti, jclass klass, const char className[], classDef.class_bytes = bytes; NSK_DISPLAY1("Redefine class: %s\n", className); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -192,7 +185,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Obtain debuggee class\n"); NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -258,11 +251,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete global reference to tested class object: 0x%p\n", (void*)testedClass); - NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass); + jni->DeleteGlobalRef(testedClass); NSK_DISPLAY1("Deallocate redefined bytecode array: 0x%p\n", (void*)redefClassBytes); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, redefClassBytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(redefClassBytes))) { nsk_jvmti_setFailStatus(); } } @@ -359,8 +351,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -373,8 +364,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp index 40572a3ef6a..e4a2067772c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp @@ -70,7 +70,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -78,14 +78,13 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: 0x%p\n", (void*)array); - if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + if (!NSK_JNI_VERIFY(jni, (*size = jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -93,17 +92,14 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, { jboolean isCopy; - if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (elements = jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } } NSK_DISPLAY1(" ... got elements list: 0x%p\n", (void*)elements); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -115,7 +111,7 @@ static int getBytecode(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: 0x%p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -130,23 +126,21 @@ static jobject getObject(jvmtiEnv* jvmti, JNIEnv* jni, jclass cls, NSK_DISPLAY1("Find static field: %s\n", fieldName); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, cls, fieldName, fieldSig)) != NULL)) { + jni->GetStaticFieldID(cls, fieldName, fieldSig)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)fieldID); NSK_DISPLAY1("Get object from static field: %s\n", fieldName); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetStaticObjectField, jni, cls, fieldID)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetStaticObjectField(cls, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)obj); NSK_DISPLAY1("Make global reference to object: 0x%p\n", obj); - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->NewGlobalRef(obj)) != NULL)) { nsk_jvmti_setFailStatus(); return NULL; } @@ -165,8 +159,7 @@ static int redefineClass(jvmtiEnv* jvmti, jclass klass, const char className[], classDef.class_bytes = bytes; NSK_DISPLAY1("Redefine class: %s\n", className); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -192,7 +185,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Obtain debuggee class\n"); NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -258,11 +251,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete global reference to tested class object: 0x%p\n", (void*)testedClass); - NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass); + jni->DeleteGlobalRef(testedClass); NSK_DISPLAY1("Deallocate redefined bytecode array: 0x%p\n", (void*)redefClassBytes); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, redefClassBytes))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(redefClassBytes))) { nsk_jvmti_setFailStatus(); } } @@ -359,8 +351,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -373,8 +364,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = callbackClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassLoad/classload001/classload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassLoad/classload001/classload001.cpp index e6650ea6d1c..2b90eb8df46 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassLoad/classload001/classload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassLoad/classload001/classload001.cpp @@ -98,17 +98,13 @@ static int findSig(char *sig, int expected) { } static void lock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to enter a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(countLock))) + jni_env->FatalError("failed to enter a raw monitor\n"); } static void unlock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to exit a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(countLock))) + jni_env->FatalError("failed to exit a raw monitor\n"); } /** callback functions **/ @@ -119,8 +115,7 @@ ClassLoad(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thread, jclass klass) { lock(jvmti_env, env); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti_env, klass, &sig, &generic))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &sig, &generic))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILURE: unable to obtain a class signature\n"); } @@ -185,20 +180,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { initCounters(); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti, "_counter_lock", &countLock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_counter_lock", &countLock))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks ...\n"); (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassLoad = &ClassLoad; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling ClassLoad event ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL))) return JNI_ERR; NSK_DISPLAY0("the event enabled\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp index 3abd4af50fb..fda4fcf00a9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp @@ -45,8 +45,7 @@ void JNICALL VMInit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thr) { NSK_DISPLAY0("VMInit event received\n\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GenerateEvents, - jvmti_env, JVMTI_EVENT_COMPILED_METHOD_LOAD))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) { NSK_COMPLAIN0("TEST FAILED: unable to generate events to represent the current state of the VM\n"); result = STATUS_FAILED; } @@ -63,8 +62,7 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size, NSK_DISPLAY0("CompiledMethodLoad event received for:\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &name, &sig, &generic))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, &generic))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILURE: unable to obtain method info\n"); return; @@ -72,8 +70,7 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size, NSK_DISPLAY4("\tmethod: name=\"%s\" signature=\"%s\"\n\tcompiled code size=%d\n\tnumber of address location map entries=%d\n", name, sig, code_size, map_length); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, - jvmti_env, &phase))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILURE: unable to obtain phase of the VM execution\n"); return; @@ -122,12 +119,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_compiled_method_load_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_compiled_method_load_events) @@ -138,16 +133,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMInit = &VMInit; callbacks.CompiledMethodLoad = &CompiledMethodLoad; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling VMInit, CompiledMethodLoad event ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp index 968f0f24a0b..c5cc7e21d16 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp @@ -47,8 +47,7 @@ void JNICALL VMInit(jvmtiEnv *jvmti_env, JNIEnv *env, jthread thr) { NSK_DISPLAY0("VMInit event received\n\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GenerateEvents, - jvmti_env, JVMTI_EVENT_COMPILED_METHOD_LOAD))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) { NSK_COMPLAIN0("TEST FAILED: unable to generate events to represent the current state of the VM\n"); result = STATUS_FAILED; } @@ -64,8 +63,7 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size, NSK_DISPLAY0("CompiledMethodLoad event received for:\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &name, &sig, &generic))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, &generic))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILURE: unable to obtain method info\n\n"); return; @@ -94,8 +92,8 @@ CompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method, if (err == JVMTI_ERROR_NONE) { NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n", name, sig, code_addr); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig); + jvmti_env->Deallocate((unsigned char*)name); + jvmti_env->Deallocate((unsigned char*)sig); } else { // The class metadata has been completely unloaded so the name is not available. NSK_DISPLAY0("for: \tmethod: name=\n"); @@ -104,8 +102,7 @@ CompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method, // Count unloaded events class_unloaded++; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, - jvmti_env, &phase))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILURE: unable to obtain phase of the VM execution\n"); return; @@ -166,12 +163,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_compiled_method_load_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_compiled_method_load_events) @@ -183,19 +178,15 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.VMInit = &VMInit; callbacks.CompiledMethodLoad = &CompiledMethodLoad; callbacks.CompiledMethodUnload = &CompiledMethodUnload; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp index e2ad959ddc7..61994f9b6a6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp @@ -118,13 +118,11 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { NSK_DISPLAY0("setting event callbacks ...\n"); (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.DataDumpRequest = &DataDumpRequest; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_DATA_DUMP_REQUEST, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_DATA_DUMP_REQUEST, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp index 68b5ac416c1..43dc539ab3f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp @@ -54,8 +54,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; NSK_DISPLAY0(">>> Testcase #1: Dispose JVMTI environment in Agent_OnLoad()\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB1(DisposeEnvironment, jvmti))) { + if (!NSK_JVMTI_VERIFY(jvmti->DisposeEnvironment())) { return JNI_ERR; } NSK_DISPLAY0(" ... disposed\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp index 066d71390c7..c804a2ca64c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp @@ -45,16 +45,14 @@ callbackVMDeath(jvmtiEnv* jvmti, JNIEnv* jni) { NSK_DISPLAY0("Disable VM_DEATH event in VM_DEATH callback\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE, - JVMTI_EVENT_VM_DEATH, NULL))) { + jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_VM_DEATH, NULL))) { success = NSK_FALSE; } else { NSK_DISPLAY0(" ... disabled\n"); } NSK_DISPLAY0(">>> Testcase #1: Dispose JVMTI environment in VM_DEATH callback\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB1(DisposeEnvironment, jvmti))) { + if (!NSK_JVMTI_VERIFY(jvmti->DisposeEnvironment())) { success = NSK_FALSE; } else { NSK_DISPLAY0(" ... disposed\n"); @@ -95,16 +93,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } NSK_DISPLAY0("Enable VM_DEATH event in JVM_OnLoad()\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_VM_DEATH, NULL))) { + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) { return JNI_ERR; } NSK_DISPLAY0(" ... enabled\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp index 02f162a9f52..9de2b542633 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp @@ -116,15 +116,12 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.DynamicCodeGenerated = &DynamicCodeGenerated; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* enable DynamicCodeGenerated event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_DYNAMIC_CODE_GENERATED, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_DYNAMIC_CODE_GENERATED, NULL))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp index b3ae2cb79b9..dac37905695 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp @@ -45,11 +45,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_suspendThread ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - SuspendThread - , jvmti - , earlyReturnThread - ) + jvmti ->SuspendThread (earlyReturnThread ) ) ) return JNI_FALSE; @@ -67,11 +63,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_resumeThread ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - ResumeThread - , jvmti - , earlyReturnThread - ) + jvmti ->ResumeThread (earlyReturnThread ) ) ) return JNI_FALSE; @@ -90,12 +82,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_doForceEarlyReturnObject ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - ForceEarlyReturnObject - , jvmti - , earlyReturnThread - , valueToReturn - ) + jvmti ->ForceEarlyReturnObject (earlyReturnThread , valueToReturn ) ) ) return JNI_FALSE; @@ -114,12 +101,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_doForceEarlyReturnInt( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - ForceEarlyReturnInt - , jvmti - , earlyReturnThread - , valueToReturn - ) + jvmti ->ForceEarlyReturnInt (earlyReturnThread , valueToReturn ) ) ) return JNI_FALSE; @@ -138,12 +120,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_doForceEarlyReturnLong ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - ForceEarlyReturnLong - , jvmti - , earlyReturnThread - , valueToReturn - ) + jvmti ->ForceEarlyReturnLong (earlyReturnThread , valueToReturn ) ) ) return JNI_FALSE; @@ -162,12 +139,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_doForceEarlyReturnFloat ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - ForceEarlyReturnFloat - , jvmti - , earlyReturnThread - , valueToReturn - ) + jvmti ->ForceEarlyReturnFloat (earlyReturnThread , valueToReturn ) ) ) return JNI_FALSE; @@ -186,12 +158,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_doForceEarlyReturnDouble ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - ForceEarlyReturnDouble - , jvmti - , earlyReturnThread - , valueToReturn - ) + jvmti ->ForceEarlyReturnDouble (earlyReturnThread , valueToReturn ) ) ) return JNI_FALSE; @@ -209,11 +176,7 @@ Java_nsk_jvmti_ForceEarlyReturn_ForceEarlyReturn001_doForceEarlyReturnVoid ( ) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - ForceEarlyReturnVoid - , jvmti - , earlyReturnThread - ) + jvmti ->ForceEarlyReturnVoid (earlyReturnThread ) ) ) return JNI_FALSE; @@ -245,11 +208,7 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) ) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetCapabilities - , jvmti - , &caps) + if (!NSK_JVMTI_VERIFY(jvmti ->GetCapabilities (&caps) ) ) return JNI_ERR; @@ -258,11 +217,7 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) caps.can_force_early_return = 1; caps.can_suspend = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - AddCapabilities - , jvmti - , &caps) + if (!NSK_JVMTI_VERIFY(jvmti ->AddCapabilities (&caps) ) ) return JNI_ERR; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp index ae2e6400698..d7d1d712550 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp @@ -45,8 +45,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Testcase #1: force GC to collect sofly reachable objects\n"); { NSK_DISPLAY0("Call ForceGarbageCollection()\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB1(ForceGarbageCollection, jvmti))) { + if (!NSK_JVMTI_VERIFY(jvmti->ForceGarbageCollection())) { nsk_jvmti_setFailStatus(); return; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp index 0502ac8279f..a069c099e50 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp @@ -54,8 +54,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Call ForceGarbageCollection()\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB1(ForceGarbageCollection, jvmti))) { + if (!NSK_JVMTI_VERIFY(jvmti->ForceGarbageCollection())) { nsk_jvmti_setFailStatus(); return; } @@ -114,7 +113,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiCapabilities caps; memset(&caps, 0, sizeof(caps)); caps.can_generate_garbage_collection_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; } @@ -122,9 +121,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiEventCallbacks eventCallbacks; memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.GarbageCollectionStart = callbackGarbageCollectionStart; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp index c81ff96e98a..e247fbdbd00 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp @@ -51,8 +51,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: creating a raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti_env, "_lock", &_lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->CreateRawMonitor("_lock", &_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to create a raw monitor\n\n", msg); @@ -63,8 +62,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: entering the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to enter the raw monitor\n\n", msg); @@ -75,8 +73,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: waiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RawMonitorWait, - jvmti_env, _lock, (jlong)10))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorWait(_lock, (jlong)10))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to wait the raw monitor\n\n", msg); @@ -87,8 +84,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: notifying a single thread waiting on the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorNotify, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorNotify(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to notify single thread\n\n", msg); @@ -99,8 +95,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: notifying all threads waiting on the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorNotifyAll, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorNotifyAll(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to notify all threads\n\n", msg); @@ -111,8 +106,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: exiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to exit the raw monitor\n\n", msg); @@ -123,8 +117,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: destroying the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(DestroyRawMonitor, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->DestroyRawMonitor(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to destroy a raw monitor\n", msg); @@ -137,8 +130,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: allocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, - jvmti_env, MEM_SIZE, &mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(MEM_SIZE, &mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to allocate memory\n\n", msg); @@ -150,8 +142,7 @@ static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: deallocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate(mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to deallocate memory\n\n", msg); @@ -209,12 +200,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_garbage_collection_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_garbage_collection_events) @@ -225,16 +214,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMDeath = &VMDeath; callbacks.GarbageCollectionFinish = &GarbageCollectionFinish; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp index b771e021901..d9dab1b0c7d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp @@ -120,12 +120,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_garbage_collection_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_garbage_collection_events) @@ -137,19 +135,15 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.VMDeath = &VMDeath; callbacks.GarbageCollectionStart = &GarbageCollectionStart; callbacks.GarbageCollectionFinish = &GarbageCollectionFinish; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp index fa1a6319916..fb9d69ddd08 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp @@ -51,8 +51,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: creating a raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti_env, "_lock", &_lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->CreateRawMonitor("_lock", &_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to create a raw monitor\n\n", msg); @@ -63,8 +62,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: entering the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to enter the raw monitor\n\n", msg); @@ -76,8 +74,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: waiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RawMonitorWait, - jvmti_env, _lock, (jlong)10))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorWait(_lock, (jlong)10))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to wait the raw monitor\n\n", msg); @@ -88,8 +85,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: notifying a single thread waiting on the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorNotify, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorNotify(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to notify single thread\n\n", msg); @@ -100,8 +96,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: notifying all threads waiting on the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorNotifyAll, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorNotifyAll(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to notify all threads\n\n", msg); @@ -112,8 +107,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: exiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to exit the raw monitor\n\n", msg); @@ -124,8 +118,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: destroying the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(DestroyRawMonitor, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->DestroyRawMonitor(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to destroy a raw monitor\n", msg); @@ -138,8 +131,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: allocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, - jvmti_env, MEM_SIZE, &mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(MEM_SIZE, &mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to allocate memory\n\n", msg); @@ -151,8 +143,7 @@ static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: deallocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate(mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to deallocate memory\n\n", msg); @@ -210,12 +201,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_garbage_collection_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_garbage_collection_events) @@ -226,16 +215,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMDeath = &VMDeath; callbacks.GarbageCollectionStart = &GarbageCollectionStart; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp index b4acfb038b5..f208bcdfb42 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp @@ -99,13 +99,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Call GenerateEvents() to send missed events\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) { + if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_DYNAMIC_CODE_GENERATED))) { + if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_DYNAMIC_CODE_GENERATED))) { nsk_jvmti_setFailStatus(); } @@ -195,8 +193,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiCapabilities caps; memset(&caps, 0, sizeof(caps)); caps.can_generate_compiled_method_load_events = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; } @@ -207,9 +204,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.CompiledMethodLoad = callbackCompiledMethodLoad; eventCallbacks.CompiledMethodUnload = callbackCompiledMethodUnload; eventCallbacks.DynamicCodeGenerated = callbackDynamicCodeGenerated; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } From 85c6642e38aed1b42732355f20790d397d9f9a70 Mon Sep 17 00:00:00 2001 From: Jean Christophe Beyler Date: Mon, 8 Oct 2018 13:56:28 -0700 Subject: [PATCH 035/124] 8211131: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[G-I]* Remove the NSK_CPP_STUB macros Reviewed-by: amenkov, sspitsyn --- .../getavailproc001/getavailproc001.cpp | 7 +- .../GetCapabilities/getcaps002/getcaps002.cpp | 7 +- .../clsldrclss002/clsldrclss002.cpp | 34 ++++----- .../getclsig006/getclsig006.cpp | 12 ++-- .../curthrcputime001/curthrcputime001.cpp | 16 ++--- .../curthrtimerinfo001/curthrtimerinfo001.cpp | 7 +- .../nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp | 45 ++---------- .../getenvstor001/getenvstor001.cpp | 7 +- .../geterrname001/geterrname001.cpp | 31 ++++---- .../geterrname002/geterrname002.cpp | 4 +- .../extevents001/extevents001.cpp | 6 +- .../extfuncs001/extfuncs001.cpp | 6 +- .../GetFieldName/getfldnm005/getfldnm005.cpp | 23 ++---- .../getjlocfmt001/getjlocfmt001.cpp | 34 ++++----- .../getjlocfmt002/getjlocfmt002.cpp | 3 +- .../loadedclss002/loadedclss002.cpp | 12 ++-- .../localtab004/localtab004.cpp | 20 ++---- .../localtab005/localtab005.cpp | 23 ++---- .../GetMethodName/methname003/methname003.cpp | 23 ++---- .../objhashcode001/objhashcode001.cpp | 22 +++--- .../GetObjectSize/objsize001/objsize001.cpp | 23 +++--- .../objwithtags001/objwithtags001.cpp | 50 +++++-------- .../GetPhase/getphase001/getphase001.cpp | 71 +++++++++---------- .../GetPhase/getphase002/getphase002.cpp | 2 +- .../getpotcaps001/getpotcaps001.cpp | 5 +- .../getsysprops001/getsysprops001.cpp | 4 +- .../getsysprops002/getsysprops002.cpp | 4 +- .../getsysprop001/getsysprop001.cpp | 8 +-- .../getsysprop002/getsysprop002.cpp | 4 +- .../nsk/jvmti/GetTag/gettag001/gettag001.cpp | 16 ++--- .../thrcputime001/thrcputime001.cpp | 11 ++- .../thrcputime002/thrcputime002.cpp | 21 ++---- .../thrtimerinfo001/thrtimerinfo001.cpp | 7 +- .../getthrdgrpchld001/getthrdgrpchld001.cpp | 29 ++++---- .../getthrdstor001/getthrdstor001.cpp | 6 +- .../jvmti/GetTime/gettime001/gettime001.cpp | 5 +- .../timerinfo001/timerinfo001.cpp | 5 +- .../intrpthrd001/intrpthrd001.cpp | 17 ++--- .../isobsolete001/isobsolete001.cpp | 51 ++++++------- .../iterheap001/iterheap001.cpp | 42 +++++------ .../iterheap002/iterheap002.cpp | 42 +++++------ .../iterheap003/iterheap003.cpp | 42 +++++------ .../iterheap004/iterheap004.cpp | 33 +++------ .../iterheap005/iterheap005.cpp | 26 +++---- .../iterheap006/iterheap006.cpp | 12 ++-- .../iterheap007/iterheap007.cpp | 16 ++--- .../iterinstcls001/iterinstcls001.cpp | 48 +++++-------- .../iterinstcls002/iterinstcls002.cpp | 48 +++++-------- .../iterinstcls003/iterinstcls003.cpp | 48 +++++-------- .../iterinstcls004/iterinstcls004.cpp | 23 ++---- 50 files changed, 393 insertions(+), 668 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp index 88aab5d2786..28d4ad2a91a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp @@ -53,8 +53,7 @@ static int checkProcessors(jvmtiEnv* jvmti, const char where[]) { jint processors = 0; NSK_DISPLAY0("GetAvailableProcessors() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetAvailableProcessors, jvmti, &processors))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetAvailableProcessors(&processors))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got processors: %d\n", (int)processors); @@ -157,9 +156,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp index 3c18ded3ec6..d3ddec8ad80 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp @@ -190,8 +190,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, const char where[]) { memset(&caps, 0, sizeof(jvmtiCapabilities)); NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return NSK_FALSE; } @@ -297,9 +296,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp index 2efd2d8dd2e..65116a118a3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp @@ -58,18 +58,15 @@ static int prepare(JNIEnv* jni) { NSK_DISPLAY0("Obtain tested object from a static field of debugee class\n"); NSK_DISPLAY1("Find class: %s\n", CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (testedClass = - NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (testedClass = jni->FindClass(CLASS_NAME)) != NULL)) return NSK_FALSE; - if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) jni->NewGlobalRef(testedClass)) != NULL)) return NSK_FALSE; NSK_DISPLAY2("Find field: %s:%s\n", FIELD_NAME, FIELD_SIGNATURE); if (!NSK_JNI_VERIFY(jni, (testedFieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, testedClass, - FIELD_NAME, FIELD_SIGNATURE)) != NULL)) + jni->GetStaticFieldID(testedClass, FIELD_NAME, FIELD_SIGNATURE)) != NULL)) return NSK_FALSE; return NSK_TRUE; @@ -82,8 +79,7 @@ static int lookup(jvmtiEnv* jvmti, jint i; for (i = 0; i < classCount && !found; i++) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti, - classes[i], &signature, &generic))) + if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(classes[i], &signature, &generic))) break; if (signature != NULL && strcmp(signature, exp_sig) == 0) { @@ -92,10 +88,10 @@ static int lookup(jvmtiEnv* jvmti, } if (signature != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature); + jvmti->Deallocate((unsigned char*)signature); if (generic != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)generic); + jvmti->Deallocate((unsigned char*)generic); } return found; @@ -119,13 +115,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Testcase #1: check on default classloader\n"); if (!NSK_JNI_VERIFY(jni, (testedClassLoader = - NSK_CPP_STUB3(GetStaticObjectField, jni, - testedClass, testedFieldID)) != NULL)) { + jni->GetStaticObjectField(testedClass, testedFieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassLoaderClasses, jvmti, - testedClassLoader, &classCount, &classes))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetClassLoaderClasses(testedClassLoader, &classCount, &classes))) { nsk_jvmti_setFailStatus(); return; } @@ -143,7 +137,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; } if (classes != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)classes); + jvmti->Deallocate((unsigned char*)classes); if (!nsk_jvmti_resumeSync()) return; @@ -152,13 +146,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Testcase #2: check on custom classloader\n"); if (!NSK_JNI_VERIFY(jni, (testedClassLoader = - NSK_CPP_STUB3(GetStaticObjectField, jni, - testedClass, testedFieldID)) != NULL)) { + jni->GetStaticObjectField(testedClass, testedFieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassLoaderClasses, jvmti, - testedClassLoader, &classCount, &classes))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetClassLoaderClasses(testedClassLoader, &classCount, &classes))) { nsk_jvmti_setFailStatus(); return; } @@ -183,9 +175,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { nsk_jvmti_setFailStatus(); } if (classes != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)classes); + jvmti->Deallocate((unsigned char*)classes); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass)); + NSK_TRACE(jni->DeleteGlobalRef(testedClass)); if (!nsk_jvmti_resumeSync()) return; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp index fb9f45b75b2..7364a3a7cf9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp @@ -58,8 +58,7 @@ static int checkSig(JNIEnv *jni_env, jclass testedCls, int idx) { char *sign; char *gen_sign; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti, testedCls, &sign, &gen_sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(testedCls, &sign, &gen_sign))) { NSK_COMPLAIN1("TEST FAILED: unable to get class signature for \"%s\"\n\n", class_sig[idx][0]); return STATUS_FAILED; @@ -85,13 +84,11 @@ static int checkSig(JNIEnv *jni_env, jclass testedCls, int idx) { sign, (gen_sign==NULL)?"NULL":gen_sign); NSK_DISPLAY0("Deallocating the signature array\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) sign))) { totRes = STATUS_FAILED; } if (gen_sign!=NULL) - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) gen_sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) gen_sign))) { totRes = STATUS_FAILED; } @@ -108,8 +105,7 @@ Java_nsk_jvmti_GetClassSignature_getclsig006_check( jclass testedCls; for (i=0; iFindClass(class_sig[i][1])) != NULL)) { NSK_COMPLAIN1("TEST FAILURE: unable to find class \"%s\"\n\n", class_sig[i][0]); res = STATUS_FAILED; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp index e2264774b55..3e7fcdd1b17 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp @@ -70,8 +70,7 @@ static int checkCpuTime(jvmtiEnv* jvmti, jthread thread, julong* time, int success = NSK_TRUE; NSK_DISPLAY1("GetCurrentThreadCpuTime() for current thread: 0x%p\n", (void*)thread); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, (jlong *)time))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentThreadCpuTime((jlong *)time))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got cpu time: %s\n", julong_to_string(*time, buf)); @@ -260,8 +259,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { jvmtiThreadInfo threadInfo; { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) { nsk_jvmti_setFailStatus(); return; } @@ -284,8 +282,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { jvmtiThreadInfo threadInfo; { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) { nsk_jvmti_setFailStatus(); return; } @@ -337,8 +334,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_get_current_thread_cpu_time = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -353,9 +349,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.VMDeath = callbackVMDeath; eventCallbacks.ThreadStart = callbackThreadStart; eventCallbacks.ThreadEnd = callbackThreadEnd; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp index 5173e6d2b29..cf22a491b08 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp @@ -66,7 +66,7 @@ static int checkTimerInfo(jvmtiEnv* jvmti, jvmtiTimerInfo* info, NSK_DISPLAY0("GetCurrentThreadCpuTimerInfo() for current JVMTI env\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, info))) { + jvmti->GetCurrentThreadCpuTimerInfo(info))) { return NSK_FALSE; } NSK_DISPLAY0("Got timer info:\n"); @@ -260,7 +260,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_get_current_thread_cpu_time = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -276,8 +276,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.ThreadStart = callbackThreadStart; eventCallbacks.ThreadEnd = callbackThreadEnd; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp index 41d27f20235..0a6ba80bf70 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp @@ -87,64 +87,29 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) return JNI_ERR; } - if (NSK_CPP_STUB3( - GetEnv - , vm - , (void **) &jvmti - , JVMTI_VERSION_1_1 - ) != JNI_OK || jvmti == NULL) - { + if (vm->GetEnv((void **) &jvmti, JVMTI_VERSION_1_1) != JNI_OK || jvmti == NULL) { NSK_COMPLAIN0("JVMTI_VERSION_1_1 isn't supported."); return JNI_OK; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; caps.can_retransform_classes = 1; // Register all necessary JVM capabilities - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - AddCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; // Register all necessary event callbacks memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - SetEventCallbacks - , jvmti - , &callbacks - , sizeof(callbacks) - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; // Enable class retransformation - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - SetEventNotificationMode - , jvmti - , JVMTI_ENABLE - , JVMTI_EVENT_CLASS_FILE_LOAD_HOOK - , NULL - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) return JNI_ERR; return JNI_OK; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp index 28a671ff64f..c196ea89f1d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp @@ -53,8 +53,7 @@ static int checkEnvStorage(jvmtiEnv* jvmti, const char where[]) { void* storage = NULL; NSK_DISPLAY0("GetEnvironmentLocalStorage() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, jvmti, &storage))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetEnvironmentLocalStorage(&storage))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got storage: 0x%p\n", (void*)storage); @@ -158,9 +157,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp index 4fd7f4364c9..cc0aa8ba792 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp @@ -152,15 +152,14 @@ static int checkGetErrorName(jvmtiEnv *jvmti) { for (i = 0; i < sizeof(errors)/sizeof(error_info); i++) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetErrorName, jvmti, errors[i].err, &name))) + jvmti->GetErrorName(errors[i].err, &name))) return NSK_FALSE; if (strcmp(name, errors[i].name) != 0) { NSK_COMPLAIN2("Error: function returns \"%s\", expected \"%s\"\n", name, errors[i].name); return_value = NSK_FALSE; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)name))) return NSK_FALSE; } @@ -172,7 +171,7 @@ static int checkGetErrorName(jvmtiEnv *jvmti) { void JNICALL VMInit(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); NSK_DISPLAY1("Phase: %s\n", TranslatePhase(phase)); @@ -194,10 +193,10 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, unsigned char** new_class_data) { jvmtiPhase curr_phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &curr_phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&curr_phase))) nsk_jvmti_setFailStatus(); if (phase != curr_phase) { @@ -210,7 +209,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -224,7 +223,7 @@ agentProc(jvmtiEnv *jvmti, JNIEnv* jni, void* arg) { if (!nsk_jvmti_waitForSync(timeout)) return; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); NSK_DISPLAY1("Phase: %s\n", TranslatePhase(phase)); @@ -270,12 +269,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; /* Create data access lock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, - "_access_lock", &access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_access_lock", &access_lock))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) return JNI_ERR; NSK_DISPLAY1("Phase: %s\n", TranslatePhase(phase)); @@ -288,21 +285,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMInit = &VMInit; callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* enable VMInit event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_VM_INIT, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) return JNI_ERR; /* enable ClassFileLoadHook event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp index 79e19d0bd58..05937d62892 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp @@ -48,12 +48,12 @@ agentProc(jvmtiEnv *jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Testcase #1: check on JVMTI_ERROR_ILLEGAL_ARGUMENT\n"); if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_ILLEGAL_ARGUMENT, - NSK_CPP_STUB3(GetErrorName, jvmti, (jvmtiError)(-1), &name))) + jvmti->GetErrorName((jvmtiError)(-1), &name))) nsk_jvmti_setFailStatus(); NSK_DISPLAY0("Testcase #2: check on JVMTI_ERROR_NULL_POINTER\n"); if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_NULL_POINTER, - NSK_CPP_STUB3(GetErrorName, jvmti, JVMTI_ERROR_NONE, NULL))) + jvmti->GetErrorName(JVMTI_ERROR_NONE, NULL))) nsk_jvmti_setFailStatus(); /* resume debugee after last sync */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp index b06ee126480..24edbbbd494 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp @@ -54,8 +54,7 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) { int i; NSK_DISPLAY0("Get extension events list\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetExtensionEvents, jvmti, &extCount, &extList))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetExtensionEvents(&extCount, &extList))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got count: %d\n", (int)extCount); @@ -219,8 +218,7 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) { } NSK_DISPLAY1("Deallocate extension events list: 0x%p\n", (void*)extList); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)extList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)extList))) { return NSK_FALSE; } NSK_DISPLAY0(" ... deallocated\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp index 522a21f7cc5..60f573c2b71 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp @@ -53,8 +53,7 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) { int i; NSK_DISPLAY0("Get extension functions list\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetExtensionFunctions, jvmti, &extCount, &extList))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetExtensionFunctions(&extCount, &extList))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got count: %d\n", (int)extCount); @@ -230,8 +229,7 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) { } NSK_DISPLAY1("Deallocate extension functions list: 0x%p\n", (void*)extList); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)extList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)extList))) { return NSK_FALSE; } NSK_DISPLAY0(" ... deallocated\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp index c28d5a2e8ba..262702b3165 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp @@ -92,8 +92,7 @@ static int checkSig(JNIEnv *jni_env, jclass testedCls, char *sign; char *gen_sign; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB6(GetFieldName, - jvmti, testedCls, testedFld, &name, &sign, &gen_sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetFieldName(testedCls, testedFld, &name, &sign, &gen_sign))) { NSK_COMPLAIN1("TEST FAILED: unable to get field name & signature for \"%s\"\n\n", fld_sig[idx][0]); return STATUS_FAILED; @@ -120,15 +119,12 @@ static int checkSig(JNIEnv *jni_env, jclass testedCls, sign, (gen_sign==NULL)?"NULL":gen_sign); NSK_DISPLAY0("Deallocating name & signature arrays\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) name))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) name))) totRes = STATUS_FAILED; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) sign))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) sign))) totRes = STATUS_FAILED; if (gen_sign!=NULL) - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) gen_sign))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) gen_sign))) totRes = STATUS_FAILED; } @@ -140,8 +136,7 @@ Java_nsk_jvmti_GetFieldName_getfldnm005_check( JNIEnv *jni, jobject obj) { int res = PASSED, i, instance; jfieldID testedFld = NULL; - jclass objCls = NSK_CPP_STUB2(GetObjectClass, - jni, obj); + jclass objCls = jni->GetObjectClass(obj); for (i=0; iGetFieldID(objCls, fld_sig[i][0], fld_sig[i][2])) != NULL)) { NSK_COMPLAIN1("TEST FAILERE: unable to get field ID for \"%s\"\n\n", fld_sig[i][0]); res = STATUS_FAILED; @@ -160,9 +153,7 @@ Java_nsk_jvmti_GetFieldName_getfldnm005_check( } } else - if (!NSK_JNI_VERIFY(jni, (testedFld = NSK_CPP_STUB4( - GetStaticFieldID, jni, objCls, - fld_sig[i][0], fld_sig[i][2])) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (testedFld = jni->GetStaticFieldID(objCls, fld_sig[i][0], fld_sig[i][2])) != NULL)) { NSK_COMPLAIN1("TEST FAILERE: unable to get field ID for \"%s\"\n\n", fld_sig[i][0]); res = STATUS_FAILED; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp index a111e8e1f03..b604af51f8a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp @@ -57,14 +57,14 @@ void JNICALL VMInit(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) { jvmtiJlocationFormat format; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); NSK_DISPLAY1("Phase: %s\n", TranslatePhase(phase)); /* testcase #3: check GetJLocationFormat in VMInit */ NSK_DISPLAY0("Testcase #3: check GetJLocationFormat in VMInit\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetJLocationFormat, jvmti, &format))) + if (!NSK_JVMTI_VERIFY(jvmti->GetJLocationFormat(&format))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY((format == JVMTI_JLOCATION_JVMBCI) || (format == JVMTI_JLOCATION_MACHINEPC) @@ -85,10 +85,10 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, jvmtiJlocationFormat format; jvmtiPhase curr_phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &curr_phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&curr_phase))) nsk_jvmti_setFailStatus(); if (phase != curr_phase) { @@ -97,7 +97,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, /* testcase #2: check GetJLocationFormat in ClassFileLoadHook */ NSK_DISPLAY0("Testcase #2: check GetJLocationFormat in ClassFileLoadHook\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetJLocationFormat, jvmti, &format))) + if (!NSK_JVMTI_VERIFY(jvmti->GetJLocationFormat(&format))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY((format == JVMTI_JLOCATION_JVMBCI) || (format == JVMTI_JLOCATION_MACHINEPC) @@ -106,7 +106,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, NSK_DISPLAY1("JlocationFormat: %s\n", TranslateJlocationFormat(format)); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -121,14 +121,14 @@ agentProc(jvmtiEnv *jvmti, JNIEnv* jni, void* arg) { if (!nsk_jvmti_waitForSync(timeout)) return; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); NSK_DISPLAY1("Phase: %s\n", TranslatePhase(phase)); /* testcase #4: check GetJLocationFormat in agentProc */ NSK_DISPLAY0("Testcase #4: check GetJLocationFormat in agentProc\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetJLocationFormat, jvmti, &format))) + if (!NSK_JVMTI_VERIFY(jvmti->GetJLocationFormat(&format))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY((format == JVMTI_JLOCATION_JVMBCI) || (format == JVMTI_JLOCATION_MACHINEPC) @@ -173,19 +173,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; /* Create data access lock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, - "_access_lock", &access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_access_lock", &access_lock))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) return JNI_ERR; NSK_DISPLAY1("Phase: %s\n", TranslatePhase(phase)); /* testcase #1: check GetJLocationFormat in Agent_OnLoad */ NSK_DISPLAY0("Testcase #1: check GetJLocationFormat in Agent_OnLoad\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetJLocationFormat, jvmti, &format))) + if (!NSK_JVMTI_VERIFY(jvmti->GetJLocationFormat(&format))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY((format == JVMTI_JLOCATION_JVMBCI) || (format == JVMTI_JLOCATION_MACHINEPC) @@ -196,21 +194,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMInit = &VMInit; callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* enable VMInit event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_VM_INIT, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) return JNI_ERR; /* enable ClassFileLoadHook event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp index fca44365614..b8125340a95 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp @@ -46,8 +46,7 @@ agentProc(jvmtiEnv *jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Check if GetJLocationFormat(NULL) returns JVMTI_ERROR_NULL_POINTER\n"); - if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_NULL_POINTER, - NSK_CPP_STUB2(GetJLocationFormat, jvmti, NULL))) + if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_NULL_POINTER, jvmti->GetJLocationFormat(NULL))) nsk_jvmti_setFailStatus(); /* resume debugee after last sync */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp index 5af7c06c77a..8a65e34cfd4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp @@ -60,8 +60,7 @@ static int lookup(jvmtiEnv* jvmti, jint i; for (i = 0; i < classCount && !found; i++) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti, - classes[i], &signature, &generic))) + if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(classes[i], &signature, &generic))) break; if (signature != NULL && strcmp(signature, exp_sig) == 0) { @@ -70,10 +69,10 @@ static int lookup(jvmtiEnv* jvmti, } if (signature != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature); + jvmti->Deallocate((unsigned char*)signature); if (generic != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)generic); + jvmti->Deallocate((unsigned char*)generic); } return found; @@ -91,8 +90,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { if (!nsk_jvmti_waitForSync(timeout)) return; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetLoadedClasses, jvmti, - &classCount, &classes))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetLoadedClasses(&classCount, &classes))) { nsk_jvmti_setFailStatus(); return; } @@ -124,7 +122,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } if (classes != NULL) - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)classes); + jvmti->Deallocate((unsigned char*)classes); if (!nsk_jvmti_resumeSync()) return; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp index ccbe7fe9bd5..d53c9aba4be 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp @@ -99,13 +99,9 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { /* get the JNI method ID for a method with name m_name and signature m_sign */ if (methInfo[i].inst) /* an instance method */ - methInfo[i].mid = NSK_CPP_STUB4(GetMethodID, - jni_env, testedCls, - methInfo[i].m_name, methInfo[i].m_sign); + methInfo[i].mid = jni_env->GetMethodID(testedCls, methInfo[i].m_name, methInfo[i].m_sign); else /* a static method */ - methInfo[i].mid = NSK_CPP_STUB4(GetStaticMethodID, - jni_env, testedCls, - methInfo[i].m_name, methInfo[i].m_sign); + methInfo[i].mid = jni_env->GetStaticMethodID(testedCls, methInfo[i].m_name, methInfo[i].m_sign); if (methInfo[i].mid == NULL) { NSK_COMPLAIN3("TEST FAILURE: unable to get the method ID for the %s method \"%s\", signature \"%s\"\n\n", methInfo[i].inst?"instance":"static", @@ -114,8 +110,7 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { } /* get the LocalVariableTable attribute */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetLocalVariableTable, - jvmti, methInfo[i].mid, &count, &lv_table))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetLocalVariableTable(methInfo[i].mid, &count, &lv_table))) { NSK_COMPLAIN3("TEST FAILED: unable to get local variable table\n\tfor the %s method \"%s\", signature \"%s\"\n\n", methInfo[i].inst?"instance":"static", methInfo[i].m_name, methInfo[i].m_sign); @@ -175,8 +170,7 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { JNIEXPORT jint JNICALL Java_nsk_jvmti_GetLocalVariableTable_localtab004_check( JNIEnv *env, jobject obj, jobject testedObj) { - jclass testedCls = NSK_CPP_STUB2(GetObjectClass, - env, testedObj); + jclass testedCls = env->GetObjectClass(testedObj); if (!caps.can_access_local_variables) return PASSED; @@ -208,12 +202,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to access local variables */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_access_local_variables = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_access_local_variables) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp index b1ea519a7a0..db54e33fc73 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp @@ -107,13 +107,9 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { /* get the JNI method ID for a method with name m_name and signature m_sign */ if (methInfo[i].inst) /* an instance method */ - methInfo[i].mid = NSK_CPP_STUB4(GetMethodID, - jni_env, testedCls, - methInfo[i].m_name, methInfo[i].m_sign); + methInfo[i].mid = jni_env->GetMethodID(testedCls, methInfo[i].m_name, methInfo[i].m_sign); else /* a static method */ - methInfo[i].mid = NSK_CPP_STUB4(GetStaticMethodID, - jni_env, testedCls, - methInfo[i].m_name, methInfo[i].m_sign); + methInfo[i].mid = jni_env->GetStaticMethodID(testedCls, methInfo[i].m_name, methInfo[i].m_sign); if (methInfo[i].mid == NULL) { NSK_COMPLAIN3("TEST FAILURE: unable to get the method ID for the %s method \"%s\", signature \"%s\"\n\n", methInfo[i].inst?"instance":"static", @@ -122,8 +118,7 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { } /* get the LocalVariableTable attribute */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetLocalVariableTable, - jvmti, methInfo[i].mid, &count, &lv_table))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetLocalVariableTable(methInfo[i].mid, &count, &lv_table))) { NSK_COMPLAIN3("TEST FAILED: unable to get local variable table\n\tfor the %s method \"%s\", signature \"%s\"\n\n", methInfo[i].inst?"instance":"static", methInfo[i].m_name, methInfo[i].m_sign); @@ -185,8 +180,7 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { } } NSK_DISPLAY0("Deallocating the local variable table entries\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) lv_table))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) lv_table))) { totRes = STATUS_FAILED; } @@ -200,8 +194,7 @@ static int checkAttr(JNIEnv *jni_env, jclass testedCls) { JNIEXPORT jint JNICALL Java_nsk_jvmti_GetLocalVariableTable_localtab005_check( JNIEnv *env, jobject obj, jobject testedObj) { - jclass testedCls = NSK_CPP_STUB2(GetObjectClass, - env, testedObj); + jclass testedCls = env->GetObjectClass(testedObj); if (!caps.can_access_local_variables) return PASSED; @@ -233,12 +226,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* add capability to access local variables */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_access_local_variables = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_access_local_variables) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp index 35724ac4511..eb6243de54c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp @@ -89,8 +89,7 @@ static int checkSig(JNIEnv *jni_env, jmethodID testedMeth, char *sign; char *gen_sign; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti, testedMeth, &name, &sign, &gen_sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(testedMeth, &name, &sign, &gen_sign))) { NSK_COMPLAIN1("TEST FAILED: unable to get class signature for \"%s\"\n\n", meth_sig[clsIdx][methIdx][0]); return STATUS_FAILED; @@ -112,17 +111,14 @@ has\n\tsignature: \"%s\"\n\tgeneric signature: \"%s\"\n\n\tExpected: \"%s\"\n\t\ sign, (gen_sign==NULL)?"NULL":gen_sign); NSK_DISPLAY0("Deallocating name & signature arrays\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) name))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) name))) { totRes = STATUS_FAILED; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) sign))) { totRes = STATUS_FAILED; } if (gen_sign!=NULL) - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti, (unsigned char*) gen_sign))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*) gen_sign))) { totRes = STATUS_FAILED; } } @@ -135,8 +131,7 @@ Java_nsk_jvmti_GetMethodName_methname003_check( JNIEnv *jni, jobject obj, jobject testedObj, jint clsIdx) { int res = PASSED, i, instance; jmethodID testedMeth = NULL; - jclass objCls = NSK_CPP_STUB2(GetObjectClass, - jni, testedObj); + jclass objCls = jni->GetObjectClass(testedObj); for (i=0; iGetMethodID(objCls, meth_sig[clsIdx][i][0], meth_sig[clsIdx][i][2])) != NULL)) { NSK_COMPLAIN2("TEST FAILERE: unable to get method ID for \"%s\" \"%s\"\n\n", meth_sig[clsIdx][i][0], meth_sig[clsIdx][i][2]); res = STATUS_FAILED; @@ -155,9 +148,7 @@ Java_nsk_jvmti_GetMethodName_methname003_check( } } else - if (!NSK_JNI_VERIFY(jni, (testedMeth = NSK_CPP_STUB4(GetStaticMethodID, - jni, objCls, meth_sig[clsIdx][i][0], - meth_sig[clsIdx][i][2])) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (testedMeth = jni->GetStaticMethodID(objCls, meth_sig[clsIdx][i][0], meth_sig[clsIdx][i][2])) != NULL)) { NSK_COMPLAIN2("TEST FAILERE: unable to get method ID for \"%s\" \"%s\"\n\n", meth_sig[clsIdx][i][0], meth_sig[clsIdx][i][2]); res = STATUS_FAILED; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp index d60bcc0645f..da85ff4c539 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp @@ -60,8 +60,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jfieldID objectField = NULL; NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -69,8 +68,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -78,16 +76,14 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (testedObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1(" ... got object: %p\n", (void*)testedObject); NSK_DISPLAY1("Create global reference for object: %p\n", (void*)testedObject); - if (!NSK_JNI_VERIFY(jni, (testedObject = - NSK_CPP_STUB2(NewGlobalRef, jni, testedObject)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (testedObject = jni->NewGlobalRef(testedObject)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -97,8 +93,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Testcase #1: get initial hash code of the object\n"); { NSK_DISPLAY1("Get hashcode for object: %p\n", (void*)testedObject); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetObjectHashCode, jvmti, testedObject, &objectHashCode))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetObjectHashCode(testedObject, &objectHashCode))) { nsk_jvmti_setFailStatus(); return; } @@ -110,8 +105,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jint hashCode = 0; NSK_DISPLAY1("Get hashcode for object: %p\n", (void*)testedObject); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetObjectHashCode, jvmti, testedObject, &hashCode))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetObjectHashCode(testedObject, &hashCode))) { nsk_jvmti_setFailStatus(); return; } @@ -141,7 +135,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get hashcode for object: %p\n", (void*)testedObject); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetObjectHashCode, jvmti, testedObject, &hashCode))) { + jvmti->GetObjectHashCode(testedObject, &hashCode))) { nsk_jvmti_setFailStatus(); return; } @@ -162,7 +156,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete object reference: %p\n", (void*)testedObject); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedObject)); + NSK_TRACE(jni->DeleteGlobalRef(testedObject)); } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp index 79150b73f50..10860792e17 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp @@ -57,8 +57,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jfieldID objectField = NULL; NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -66,8 +65,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -75,16 +73,14 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (testedObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)testedObject); NSK_DISPLAY1("Create global reference for object: 0x%p\n", (void*)testedObject); - if (!NSK_JNI_VERIFY(jni, (testedObject = - NSK_CPP_STUB2(NewGlobalRef, jni, testedObject)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (testedObject = jni->NewGlobalRef(testedObject)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -94,8 +90,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Testcase #1: get initial size of the object\n"); { NSK_DISPLAY1("Get size for object: 0x%p\n", (void*)testedObject); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetObjectSize, jvmti, testedObject, &objectSize))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetObjectSize(testedObject, &objectSize))) { nsk_jvmti_setFailStatus(); return; } @@ -113,8 +108,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jlong size = 0; NSK_DISPLAY1("Get size for object: 0x%p\n", (void*)testedObject); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetObjectSize, jvmti, testedObject, &size))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetObjectSize(testedObject, &size))) { nsk_jvmti_setFailStatus(); return; } @@ -142,8 +136,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY1("Get size for object: 0x%p\n", (void*)testedObject); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetObjectSize, jvmti, testedObject, &size))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetObjectSize(testedObject, &size))) { nsk_jvmti_setFailStatus(); return; } @@ -163,7 +156,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete object reference: 0x%p\n", (void*)testedObject); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedObject)); + NSK_TRACE(jni->DeleteGlobalRef(testedObject)); } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp index aa8dc7c15c0..d6ea8445774 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp @@ -63,17 +63,13 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int obj NSK_DISPLAY2("Allocate memory for lists: %d objects for %d tags\n", objectsCount, tagsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (size * sizeof(jobject)), - (unsigned char**)objects))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((size * sizeof(jobject)), (unsigned char**)objects))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... allocated objects list: 0x%p\n", (void*)objects); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (tagsCount * sizeof(jlong)), - (unsigned char**)tags))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((tagsCount * sizeof(jlong)), (unsigned char**)tags))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -91,8 +87,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int obj } NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -100,8 +95,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int obj NSK_DISPLAY1("Find static field: %s\n", OBJECTS_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECTS_FIELD_NAME, OBJECTS_FIELD_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECTS_FIELD_NAME, OBJECTS_FIELD_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -109,8 +103,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int obj NSK_DISPLAY1("Get objects array from static field: %s\n", OBJECTS_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (arrayObject = (jobjectArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -120,8 +113,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int obj jsize arrayLen = 0; jsize k; - if (!NSK_JNI_VERIFY(jni, (arrayLen = - NSK_CPP_STUB2(GetArrayLength, jni, arrayObject)) == size)) { + if (!NSK_JNI_VERIFY(jni, (arrayLen = jni->GetArrayLength(arrayObject)) == size)) { NSK_DISPLAY1(" ... got array length: %d\n", (int)size); nsk_jvmti_setFailStatus(); return NSK_FALSE; @@ -131,13 +123,11 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int obj for (k = 0; k < size; k++) { jobject object = NULL; - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetObjectArrayElement, jni, arrayObject, k)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (object = jni->GetObjectArrayElement(arrayObject, k)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB2(NewGlobalRef, jni, object)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (object = jni->NewGlobalRef(object)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -162,14 +152,14 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int NSK_DISPLAY1("Release objects references: %d objects\n", size); for (k = 0; k < size; k++) { if (objects[k] != NULL) { - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, objects[k])); + NSK_TRACE(jni->DeleteGlobalRef(objects[k])); } } NSK_DISPLAY1(" ... object references released: %d objects\n", size); NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objects); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objects))) { + jvmti->Deallocate((unsigned char*)objects))) { nsk_jvmti_setFailStatus(); } @@ -178,7 +168,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int NSK_DISPLAY1("Deallocate tags list: 0x%p\n", (void*)tags); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)tags))) { + jvmti->Deallocate((unsigned char*)tags))) { nsk_jvmti_setFailStatus(); } @@ -197,8 +187,7 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int o NSK_DISPLAY1("Get tagged objects: %d tags\n", tagsCount); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB6(GetObjectsWithTags, jvmti, tagsCount, tags, - &taggedObjectsCount, &taggedObjectsList, &taggedObjectsTags))) { + jvmti->GetObjectsWithTags(tagsCount, tags, &taggedObjectsCount, &taggedObjectsList, &taggedObjectsTags))) { nsk_jvmti_setFailStatus(); return NSK_TRUE; } @@ -258,7 +247,7 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int o for (j = 0; j < objectsCount; j++) { jobject foundObject = ITEM(objects, i, j); - if (NSK_CPP_STUB3(IsSameObject, jni, object, foundObject)) { + if (jni->IsSameObject(object, foundObject)) { objectsFound++; if (expectedCount > 0) @@ -295,12 +284,12 @@ static int checkTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int tagsCount, int o NSK_DISPLAY1("Deallocate got objects list: 0x%p\n", (void*)taggedObjectsList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)taggedObjectsList))) { + jvmti->Deallocate((unsigned char*)taggedObjectsList))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY1("Deallocate got tags list: 0x%p\n", (void*)taggedObjectsTags); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)taggedObjectsTags))) { + jvmti->Deallocate((unsigned char*)taggedObjectsTags))) { nsk_jvmti_setFailStatus(); } @@ -338,8 +327,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY3(" #%d: object: 0x%p, tag: %ld\n", j, (void*)object, (long)tags[i]); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, object, tags[i]))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(object, tags[i]))) { nsk_jvmti_setFailStatus(); return; } @@ -384,8 +372,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY3(" #%d: object: 0x%p, tag: %ld\n", j, (void*)object, (long)tag); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, object, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(object, tag))) { nsk_jvmti_setFailStatus(); return; } @@ -455,8 +442,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp index 45062daeadd..e3c4df42cba 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp @@ -45,14 +45,14 @@ static void JNICALL VMStart(jvmtiEnv *jvmti, JNIEnv* jni) { jvmtiPhase phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); NSK_DISPLAY0("VMStart\n"); /* testcase #2: check JVMTI_PHASE_START */ NSK_DISPLAY0("Testcase #2: check if GetPhase returns JVMTI_PHASE_START\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_START)) @@ -60,7 +60,7 @@ VMStart(jvmtiEnv *jvmti, JNIEnv* jni) { was_VMStart = JNI_TRUE; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -68,14 +68,14 @@ static void JNICALL VMInit(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) { jvmtiPhase phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); NSK_DISPLAY0("VMInit\n"); /* testcase #3: check JVMTI_PHASE_LIVE */ NSK_DISPLAY0("Testcase #3: check if GetPhase returns JVMTI_PHASE_LIVE\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_LIVE)) @@ -83,7 +83,7 @@ VMInit(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) { was_VMInit = JNI_TRUE; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -93,7 +93,7 @@ NativeMethodBind(jvmtiEnv* jvmti, JNIEnv *jni, void* address, void** new_address_ptr) { jvmtiPhase phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); NSK_DISPLAY0("NativeMethodBind\n"); @@ -102,7 +102,7 @@ NativeMethodBind(jvmtiEnv* jvmti, JNIEnv *jni, /* testcase #5: check JVMTI_PHASE_PRIMORDIAL */ NSK_DISPLAY0("Testcase #2: check if GetPhase returns JVMTI_PHASE_PRIMORDIAL\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_PRIMORDIAL)) @@ -112,7 +112,7 @@ NativeMethodBind(jvmtiEnv* jvmti, JNIEnv *jni, /* testcase #2: check JVMTI_PHASE_START */ NSK_DISPLAY0("Testcase #2: check if GetPhase returns JVMTI_PHASE_START\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_START)) @@ -122,7 +122,7 @@ NativeMethodBind(jvmtiEnv* jvmti, JNIEnv *jni, /* testcase #3: check JVMTI_PHASE_LIVE */ NSK_DISPLAY0("Testcase #3: check if GetPhase returns JVMTI_PHASE_LIVE\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_LIVE)) @@ -132,14 +132,14 @@ NativeMethodBind(jvmtiEnv* jvmti, JNIEnv *jni, /* testcase #4: check JVMTI_PHASE_DEAD */ NSK_DISPLAY0("Testcase #4: check if GetPhase returns JVMTI_PHASE_DEAD\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_DEAD)) nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -154,7 +154,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, unsigned char** new_class_data) { jvmtiPhase phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); NSK_DISPLAY1("ClassFileLoadHook: %s\n", name); @@ -163,7 +163,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, /* testcase #5: check JVMTI_PHASE_PRIMORDIAL */ NSK_DISPLAY0("Testcase #2: check if GetPhase returns JVMTI_PHASE_PRIMORDIAL\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_PRIMORDIAL)) @@ -173,7 +173,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, /* testcase #2: check JVMTI_PHASE_START */ NSK_DISPLAY0("Testcase #2: check if GetPhase returns JVMTI_PHASE_START\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_START)) @@ -183,7 +183,7 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, /* testcase #3: check JVMTI_PHASE_LIVE */ NSK_DISPLAY0("Testcase #3: check if GetPhase returns JVMTI_PHASE_LIVE\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_LIVE)) @@ -193,14 +193,14 @@ ClassFileLoadHook(jvmtiEnv *jvmti, JNIEnv *jni, /* testcase #4: check JVMTI_PHASE_DEAD */ NSK_DISPLAY0("Testcase #4: check if GetPhase returns JVMTI_PHASE_DEAD\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_DEAD)) nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -208,14 +208,14 @@ static void JNICALL VMDeath(jvmtiEnv *jvmti, JNIEnv* jni) { jvmtiPhase phase; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(access_lock))) nsk_jvmti_setFailStatus(); NSK_DISPLAY0("VMDeath\n"); /* testcase #3: check JVMTI_PHASE_LIVE */ NSK_DISPLAY0("Testcase #3: check if GetPhase returns JVMTI_PHASE_LIVE\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_LIVE)) @@ -223,7 +223,7 @@ VMDeath(jvmtiEnv *jvmti, JNIEnv* jni) { was_VMDeath = JNI_TRUE; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, access_lock))) + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(access_lock))) nsk_jvmti_setFailStatus(); } @@ -242,7 +242,7 @@ agentProc(jvmtiEnv *jvmti, JNIEnv* jni, void* arg) { /* testcase #3: check JVMTI_PHASE_LIVE */ NSK_DISPLAY0("Testcase #3: check if GetPhase returns JVMTI_PHASE_LIVE\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_LIVE)) @@ -289,13 +289,12 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { /* Create data access lock */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, - "_access_lock", &access_lock))) + jvmti->CreateRawMonitor("_access_lock", &access_lock))) return JNI_ERR; /* testcase #1: check JVMTI_PHASE_ONLOAD */ NSK_DISPLAY0("Testcase #1: check if GetPhase returns JVMTI_PHASE_ONLOAD\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) nsk_jvmti_setFailStatus(); if (!NSK_VERIFY(phase == JVMTI_PHASE_ONLOAD)) @@ -305,7 +304,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_generate_all_class_hook_events = 1; caps.can_generate_native_method_bind_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; memset(&callbacks, 0, sizeof(callbacks)); @@ -315,38 +314,32 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.NativeMethodBind = &NativeMethodBind; callbacks.ClassFileLoadHook = &ClassFileLoadHook; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* enable VMStart event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_VM_START, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_START, NULL))) return JNI_ERR; /* enable VMInit event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_VM_INIT, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL))) return JNI_ERR; /* enable NativeMethodBind event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_NATIVE_METHOD_BIND, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL))) return JNI_ERR; /* enable ClassFileLoadHook event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) return JNI_ERR; /* enable VMDeath event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_VM_DEATH, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) return JNI_ERR; /* register agent proc and arg */ @@ -373,7 +366,7 @@ Agent_OnUnload(JavaVM *jvm) /* testcase #4: check JVMTI_PHASE_DEAD */ NSK_DISPLAY0("Testcase #4: check if GetPhase returns JVMTI_PHASE_DEAD\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) exit(97); if (!NSK_VERIFY(phase == JVMTI_PHASE_DEAD)) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp index 9812b874d24..e1d03830f70 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp @@ -47,7 +47,7 @@ agentProc(jvmtiEnv *jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Check if GetPhase(NULL) returns JVMTI_ERROR_NULL_POINTER\n"); if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_NULL_POINTER, - NSK_CPP_STUB2(GetPhase, jvmti, NULL))) + jvmti->GetPhase(NULL))) nsk_jvmti_setFailStatus(); /* resume debugee after last sync */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp index ec2014da6fb..0e5d7159d27 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp @@ -130,7 +130,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, const char where[]) { NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps))) { + jvmti->GetPotentialCapabilities(&caps))) { return NSK_FALSE; } @@ -233,8 +233,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp index 5097087bd6e..ec770b75655 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp @@ -42,7 +42,7 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[]) { NSK_DISPLAY0("Invoke GetSystemProperties()\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetSystemProperties, jvmti, &count, &properties))) { + jvmti->GetSystemProperties(&count, &properties))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -75,7 +75,7 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[]) { } NSK_DISPLAY0("Deallocate properties list\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)properties))) { + jvmti->Deallocate((unsigned char*)properties))) { return NSK_FALSE; } NSK_DISPLAY0(" ... deallocated\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp index bdc12a3063a..acf1bee445e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp @@ -56,7 +56,7 @@ static int checkProperties (jvmtiEnv* jvmti, const char phase[]) { NSK_DISPLAY0("Get system properties list\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetSystemProperties, jvmti, &count, &properties))) { + jvmti->GetSystemProperties(&count, &properties))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got properties: %d\n", (int)count); @@ -108,7 +108,7 @@ static int checkProperties (jvmtiEnv* jvmti, const char phase[]) { NSK_DISPLAY0("Deallocate properties list\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)properties))) { + jvmti->Deallocate((unsigned char*)properties))) { return NSK_FALSE; } NSK_DISPLAY0(" ... deallocated\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp index 06cd87d2071..126712c66f8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp @@ -42,7 +42,7 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[]) { NSK_DISPLAY0("Get system properties names\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetSystemProperties, jvmti, &count, &properties))) { + jvmti->GetSystemProperties(&count, &properties))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got properties: %d\n", (int)count); @@ -65,7 +65,7 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[]) { } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetSystemProperty, jvmti, properties[i], &value))) { + jvmti->GetSystemProperty(properties[i], &value))) { success = NSK_FALSE; continue; } @@ -81,7 +81,7 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[]) { } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)value))) { + jvmti->Deallocate((unsigned char*)value))) { success = NSK_FALSE; } } @@ -90,7 +90,7 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[]) { NSK_DISPLAY0("Deallocate properties list\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)properties))) { + jvmti->Deallocate((unsigned char*)properties))) { success = NSK_FALSE; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp index d25db73a4ba..7123214f201 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp @@ -53,7 +53,7 @@ static int checkProperty(jvmtiEnv* jvmti, const char phase[], PropertyDesc* desc NSK_DISPLAY1("Get value of tested property: %s\n", desc->name); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetSystemProperty, jvmti, desc->name, &value))) { + jvmti->GetSystemProperty(desc->name, &value))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got value: \"%s\"\n", nsk_null_string(value)); @@ -73,7 +73,7 @@ static int checkProperty(jvmtiEnv* jvmti, const char phase[], PropertyDesc* desc } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)value))) { + jvmti->Deallocate((unsigned char*)value))) { success = NSK_FALSE; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp index c03711cab02..801d210de35 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp @@ -61,7 +61,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -69,8 +69,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Find static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -78,8 +77,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (testedObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -87,7 +85,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Create global reference for object: 0x%p\n", (void*)testedObject); if (!NSK_JNI_VERIFY(jni, (testedObject = - NSK_CPP_STUB2(NewGlobalRef, jni, testedObject)) != NULL)) { + jni->NewGlobalRef(testedObject)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -100,7 +98,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetTag, jvmti, testedObject, &objectTag))) { + jvmti->GetTag(testedObject, &objectTag))) { nsk_jvmti_setFailStatus(); return; } @@ -120,7 +118,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Clean used data\n"); { NSK_DISPLAY1("Delete object reference: 0x%p\n", (void*)testedObject); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedObject)); + NSK_TRACE(jni->DeleteGlobalRef(testedObject)); } } @@ -164,7 +162,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp index 81603c51ae7..4effa902072 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp @@ -71,7 +71,7 @@ static int checkCpuTime(jvmtiEnv* jvmti, jthread thread, julong* time, NSK_DISPLAY1("GetThreadCpuTime() for current thread (passing NULL): 0x%p\n", (void*)thread); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadCpuTime, jvmti, NULL, (jlong *)time))) { + jvmti->GetThreadCpuTime(NULL, (jlong *)time))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got cpu time: %s\n", julong_to_string(*time, buf)); @@ -261,7 +261,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { jvmtiThreadInfo threadInfo; { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) { + jvmti->GetThreadInfo(thread, &threadInfo))) { nsk_jvmti_setFailStatus(); return; } @@ -285,7 +285,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { jvmtiThreadInfo threadInfo; { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) { + jvmti->GetThreadInfo(thread, &threadInfo))) { nsk_jvmti_setFailStatus(); return; } @@ -338,7 +338,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_get_thread_cpu_time = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -354,8 +354,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.ThreadStart = callbackThreadStart; eventCallbacks.ThreadEnd = callbackThreadEnd; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp index 3c98719caa5..2782c060621 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp @@ -73,8 +73,7 @@ static int checkCpuTime(jvmtiEnv* jvmti, jthread thread, julong* time, int success = NSK_TRUE; NSK_DISPLAY1("GetThreadCpuTime() for thread: 0x%p\n", (void*)thread); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, (jlong *)time))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTime(thread, (jlong *)time))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got cpu time: %s\n", julong_to_string(*time, buf)); @@ -265,8 +264,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { jvmtiThreadInfo threadInfo; { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) { nsk_jvmti_setFailStatus(); return; } @@ -282,8 +280,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { } if (threadInfo.name != NULL && strcmp(threadInfo.name, TESTED_THREAD_NAME) == 0) { - if (!NSK_JNI_VERIFY(jni, (testedThread = - NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (testedThread = jni->NewGlobalRef(thread)) != NULL)) { nsk_jvmti_setFailStatus(); } @@ -302,8 +299,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { jvmtiThreadInfo threadInfo; { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &threadInfo))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) { nsk_jvmti_setFailStatus(); return; } @@ -324,7 +320,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { if (!checkCpuTime(jvmti, thread, &time, &prevTestedThreadTime, "THREAD_END callback")) { nsk_jvmti_setFailStatus(); } - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedThread)); + NSK_TRACE(jni->DeleteGlobalRef(testedThread)); testedThread = NULL; } } @@ -365,8 +361,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_get_thread_cpu_time = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -381,9 +376,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.VMDeath = callbackVMDeath; eventCallbacks.ThreadStart = callbackThreadStart; eventCallbacks.ThreadEnd = callbackThreadEnd; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp index 1eb594217e5..81bfb416b58 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp @@ -66,7 +66,7 @@ static int checkTimerInfo(jvmtiEnv* jvmti, jvmtiTimerInfo* info, NSK_DISPLAY0("GetThreadCpuTimerInfo() for current JVMTI env\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, info))) { + jvmti->GetThreadCpuTimerInfo(info))) { return NSK_FALSE; } NSK_DISPLAY0("Got timer info:\n"); @@ -260,7 +260,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_get_thread_cpu_time = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -276,8 +276,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.ThreadStart = callbackThreadStart; eventCallbacks.ThreadEnd = callbackThreadEnd; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp index 364f9b53158..c7d89289d0c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp @@ -81,7 +81,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Get top level thread groups\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetTopThreadGroups, jvmti, &topGroupsCount, &topGroups))) { + jvmti->GetTopThreadGroups(&topGroupsCount, &topGroups))) { nsk_jvmti_setFailStatus(); return; } @@ -110,8 +110,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get children of root thread group: %p\n", (void*)rootGroup); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB6(GetThreadGroupChildren, jvmti, rootGroup, - &threadsCount, &threads, &groupsCount, &groups))) { + jvmti->GetThreadGroupChildren(rootGroup, &threadsCount, &threads, &groupsCount, &groups))) { nsk_jvmti_setFailStatus(); return; } @@ -142,7 +141,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jvmtiThreadGroupInfo info; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadGroupInfo, jvmti, groups[i], &info))) { + jvmti->GetThreadGroupInfo(groups[i], &info))) { nsk_jvmti_setFailStatus(); continue; } @@ -221,11 +220,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { /* deallocate arrays */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)groups))) { + jvmti->Deallocate((unsigned char*)groups))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); } } @@ -258,8 +257,7 @@ static int checkThreadGroup(jvmtiEnv* jvmti, JNIEnv* jni, jthreadGroup* groups = NULL; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB6(GetThreadGroupChildren, jvmti, group, - &threadsCount, &threads, &groupsCount, &groups))) { + jvmti->GetThreadGroupChildren(group, &threadsCount, &threads, &groupsCount, &groups))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -290,7 +288,7 @@ static int checkThreadGroup(jvmtiEnv* jvmti, JNIEnv* jni, jvmtiThreadInfo info; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) { + jvmti->GetThreadInfo(threads[i], &info))) { nsk_jvmti_setFailStatus(); continue; } @@ -314,11 +312,11 @@ static int checkThreadGroup(jvmtiEnv* jvmti, JNIEnv* jni, /* deallocate arrays */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)groups))) { + jvmti->Deallocate((unsigned char*)groups))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); } } @@ -339,8 +337,7 @@ static jthreadGroup findThreadGroupByName(jvmtiEnv* jvmti, JNIEnv* jni, const ch jthreadGroup * groups = NULL; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB6(GetThreadGroupChildren, jvmti, groupsList[i], - &threadsCount, &threads, &groupsCount, &groups))) { + jvmti->GetThreadGroupChildren(groupsList[i], &threadsCount, &threads, &groupsCount, &groups))) { nsk_jvmti_setFailStatus(); return NULL; } @@ -357,7 +354,7 @@ static jthreadGroup findThreadGroupByName(jvmtiEnv* jvmti, JNIEnv* jni, const ch if (groups[i] != NULL) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadGroupInfo, jvmti, groups[i], &info))) { + jvmti->GetThreadGroupInfo(groups[i], &info))) { nsk_jvmti_setFailStatus(); continue; } @@ -376,11 +373,11 @@ static jthreadGroup findThreadGroupByName(jvmtiEnv* jvmti, JNIEnv* jni, const ch /* deallocate arrays */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)groups))) { + jvmti->Deallocate((unsigned char*)groups))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp index 34d8badd412..a37007735d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp @@ -59,7 +59,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("GetThreadLocalStorage() for tested thread: %p\n", (void*)testedThread); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadLocalStorage, jvmti, testedThread, &storage))) { + jvmti->GetThreadLocalStorage(testedThread, &storage))) { nsk_jvmti_setFailStatus(); return; } @@ -76,7 +76,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("GetThreadLocalStorage() for current agent thread\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadLocalStorage, jvmti, NULL, &storage))) { + jvmti->GetThreadLocalStorage(NULL, &storage))) { nsk_jvmti_setFailStatus(); return; } @@ -91,7 +91,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Delete thread reference\n"); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedThread)); + NSK_TRACE(jni->DeleteGlobalRef(testedThread)); } NSK_DISPLAY0("Let debugee to finish\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp index d41dbe2ad6b..e6bea8bef89 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp @@ -59,7 +59,7 @@ static int checkTime(jvmtiEnv* jvmti, julong* time, NSK_DISPLAY0("GetTime() for current JVMTI env\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, jvmti, (jlong *)time))) { + jvmti->GetTime((jlong *)time))) { return NSK_FALSE; } NSK_DISPLAY1(" ... got time: %s\n", julong_to_string(*time, buf)); @@ -186,8 +186,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp index 4584b4f922f..670a526e7a7 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp @@ -59,7 +59,7 @@ static int checkTimerInfo(jvmtiEnv* jvmti, jvmtiTimerInfo* info, NSK_DISPLAY0("GetTimerInfo() for current JVMTI env\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, jvmti, info))) { + jvmti->GetTimerInfo(info))) { return NSK_FALSE; } NSK_DISPLAY0("Got timer info:\n"); @@ -203,8 +203,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp index bb147cec424..2bdfea11a6f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp @@ -57,7 +57,7 @@ static int prepare(jvmtiEnv* jvmti) { /* get all live threads */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads))) + jvmti->GetAllThreads(&threads_count, &threads))) return NSK_FALSE; if (!NSK_VERIFY(threads_count > 0 && threads != NULL)) @@ -70,7 +70,7 @@ static int prepare(jvmtiEnv* jvmti) { /* get thread information */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) + jvmti->GetThreadInfo(threads[i], &info))) return NSK_FALSE; NSK_DISPLAY3(" thread #%d (%s): %p\n", i, info.name, threads[i]); @@ -89,7 +89,7 @@ static int prepare(jvmtiEnv* jvmti) { /* deallocate threads list */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) + jvmti->Deallocate((unsigned char*)threads))) return NSK_FALSE; return NSK_TRUE; @@ -112,8 +112,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { if (!NSK_VERIFY(runningThread != NULL)) { nsk_jvmti_setFailStatus(); } else { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(InterruptThread, - jvmti, runningThread))) + if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(runningThread))) nsk_jvmti_setFailStatus(); } @@ -121,8 +120,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { if (!NSK_VERIFY(waitingThread != NULL)) { nsk_jvmti_setFailStatus(); } else { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(InterruptThread, - jvmti, waitingThread))) + if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(waitingThread))) nsk_jvmti_setFailStatus(); } @@ -130,8 +128,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { if (!NSK_VERIFY(sleepingThread != NULL)) { nsk_jvmti_setFailStatus(); } else { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(InterruptThread, - jvmti, sleepingThread))) + if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(sleepingThread))) nsk_jvmti_setFailStatus(); } @@ -173,7 +170,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_signal_thread = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp index 1eca2ee30f7..399d894f9b4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp @@ -60,7 +60,7 @@ static void checkMethodObsolete(jvmtiEnv* jvmti, jmethodID method, const char na NSK_DISPLAY3("Call IsObsolete() for %s method: %p (%s)\n", kind, (void*)method, name); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(IsMethodObsolete, jvmti, method, &obsolete))) { + jvmti->IsMethodObsolete(method, &obsolete))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY1(" ... got obsolete: %d\n", (int)obsolete); @@ -83,8 +83,7 @@ static void checkStackMethodsObsolete(jvmtiEnv* jvmti, jthread thread, NSK_DISPLAY1("Get stack frames for thread: %p\n", (void*)thread); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB6(GetStackTrace, jvmti, thread, 0, MAX_STACK_DEPTH, - frameStack, &frameCount))) { + jvmti->GetStackTrace(thread, 0, MAX_STACK_DEPTH, frameStack, &frameCount))) { nsk_jvmti_setFailStatus(); return; } @@ -104,8 +103,7 @@ static void checkStackMethodsObsolete(jvmtiEnv* jvmti, jthread thread, NSK_DISPLAY1(" frame #%i:\n", i); NSK_DISPLAY1(" methodID: %p\n", (void*)frameStack[i].method); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(GetMethodName, jvmti, frameStack[i].method, - &name, &signature, &generic))) { + jvmti->GetMethodName(frameStack[i].method, &name, &signature, &generic))) { nsk_jvmti_setFailStatus(); continue; } @@ -122,15 +120,15 @@ static void checkStackMethodsObsolete(jvmtiEnv* jvmti, jthread thread, } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name))) { + jvmti->Deallocate((unsigned char*)name))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature))) { + jvmti->Deallocate((unsigned char*)signature))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)generic))) { + jvmti->Deallocate((unsigned char*)generic))) { nsk_jvmti_setFailStatus(); } } @@ -156,7 +154,7 @@ static int redefineClass(jvmtiEnv* jvmti, jclass klass, const char className[], NSK_DISPLAY1("Redefine class: %s\n", className); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &classDef))) { + jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -176,7 +174,7 @@ static int getClassfileBytes(JNIEnv* jni, jvmtiEnv* jvmti, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -184,8 +182,7 @@ static int getClassfileBytes(JNIEnv* jni, jvmtiEnv* jvmti, NSK_DISPLAY1("Find static field: %s\n", CLASSFILE_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (fieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - CLASSFILE_FIELD_NAME, CLASSFILE_FIELD_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, CLASSFILE_FIELD_NAME, CLASSFILE_FIELD_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -193,15 +190,14 @@ static int getClassfileBytes(JNIEnv* jni, jvmtiEnv* jvmti, NSK_DISPLAY1("Get classfile bytes array from static field: %s\n", CLASSFILE_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (array = (jbyteArray) - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - fieldID)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, fieldID)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got array object: %p\n", (void*)array); if (!NSK_JNI_VERIFY(jni, (*size = - NSK_CPP_STUB2(GetArrayLength, jni, array)) > 0)) { + jni->GetArrayLength(array)) > 0)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -210,8 +206,7 @@ static int getClassfileBytes(JNIEnv* jni, jvmtiEnv* jvmti, { jboolean isCopy; if (!NSK_JNI_VERIFY(jni, (elements = - NSK_CPP_STUB3(GetByteArrayElements, jni, array, - &isCopy)) != NULL)) { + jni->GetByteArrayElements(array, &isCopy)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -219,7 +214,7 @@ static int getClassfileBytes(JNIEnv* jni, jvmtiEnv* jvmti, NSK_DISPLAY1(" ... got elements list: %p\n", (void*)elements); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, *size, bytes))) { + jvmti->Allocate(*size, bytes))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -231,7 +226,7 @@ static int getClassfileBytes(JNIEnv* jni, jvmtiEnv* jvmti, NSK_DISPLAY1(" ... copied bytecode: %d bytes\n", (int)*size); NSK_DISPLAY1("Release elements list: %p\n", (void*)elements); - NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni, array, elements, JNI_ABORT)); + NSK_TRACE(jni->ReleaseByteArrayElements(array, elements, JNI_ABORT)); NSK_DISPLAY0(" ... released\n"); return NSK_TRUE; @@ -264,7 +259,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { { NSK_DISPLAY1("Find tested class: %s\n", TESTED_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (testedClass = - NSK_CPP_STUB2(FindClass, jni, TESTED_CLASS_NAME)) != NULL)) { + jni->FindClass(TESTED_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -272,7 +267,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Make global reference for class object: %p\n", (void*)testedClass); if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL)) { + jni->NewGlobalRef(testedClass)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -280,8 +275,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get static methodID: %s\n", STATIC_METHOD_NAME); if (!NSK_JNI_VERIFY(jni, (staticMethodID = - NSK_CPP_STUB4(GetStaticMethodID, jni, testedClass, - STATIC_METHOD_NAME, STATIC_METHOD_SIG)) != NULL)) { + jni->GetStaticMethodID(testedClass, STATIC_METHOD_NAME, STATIC_METHOD_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -289,8 +283,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1("Get instance methodID: %s\n", INSTANCE_METHOD_NAME); if (!NSK_JNI_VERIFY(jni, (instanceMethodID = - NSK_CPP_STUB4(GetMethodID, jni, testedClass, - INSTANCE_METHOD_NAME, INSTANCE_METHOD_SIG)) != NULL)) { + jni->GetMethodID(testedClass, INSTANCE_METHOD_NAME, INSTANCE_METHOD_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return; } @@ -342,15 +335,15 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { { NSK_DISPLAY1("Deallocate classfile bytes array: %p\n", (void*)classfileBytes); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, classfileBytes))) { + jvmti->Deallocate(classfileBytes))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY1("Delete global eference to thread: %p\n", (void*)testedThread); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedThread)); + NSK_TRACE(jni->DeleteGlobalRef(testedThread)); NSK_DISPLAY1("Delete global reference to class: %p\n", (void*)testedClass); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass)); + NSK_TRACE(jni->DeleteGlobalRef(testedClass)); } } @@ -394,7 +387,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_redefine_classes = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp index 2ae98736fe6..3d54b28b6c8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp @@ -92,14 +92,14 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, tag++; if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -111,7 +111,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -134,9 +134,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -153,7 +151,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -161,7 +159,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -169,7 +167,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -177,8 +175,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -186,8 +183,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -195,8 +191,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -204,8 +199,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -213,8 +207,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -312,7 +305,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -430,9 +423,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Iterate over all object in heap with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, - &fakeUserData))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -542,7 +533,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -552,8 +543,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = callbackObjectFree; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp index c398e214ef2..9d4171ef71c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp @@ -92,14 +92,14 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, tag++; if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -111,7 +111,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -134,9 +134,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -153,7 +151,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -161,7 +159,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -169,7 +167,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -177,8 +175,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -186,8 +183,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -195,8 +191,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -204,8 +199,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -213,8 +207,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -312,7 +305,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -438,9 +431,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Iterate over all object in heap with filter JVMTI_HEAP_OBJECT_TAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallback, - &fakeUserData))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -550,7 +541,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -560,8 +551,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = callbackObjectFree; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp index 21ff9a1e290..a485c4bb6ee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp @@ -92,14 +92,14 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, tag++; if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -111,7 +111,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -134,9 +134,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -153,7 +151,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -161,7 +159,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -169,7 +167,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -177,8 +175,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -186,8 +183,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -195,8 +191,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -204,8 +199,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -213,8 +207,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -312,7 +305,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -439,9 +432,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Iterate over all object in heap with filter JVMTI_HEAP_OBJECT_UNTAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback, - &fakeUserData))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -551,7 +542,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -561,8 +552,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = callbackObjectFree; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp index 28470777ba6..3450ad6705c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp @@ -65,9 +65,7 @@ heapObjectCallbackForFirstIteration(jlong class_tag, *tag_ptr = (jlong)++objectDescCount; /* Allocate memory for next list element*/ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((sizeof(ObjectDesc)), (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("heapObjectCallbackForFirstIteration: Allocation failed. Iteration aborted.\n"); @@ -97,7 +95,7 @@ heapObjectCallbackForSecondIteration(jlong class_tag, /* Deallocate memory of list element*/ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr[ind]))) { + jvmti->Deallocate((unsigned char*)objectDescArr[ind]))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("heapObjectCallbackForSecondIteration: Deallocation failed. Iteration aborted.\n"); @@ -133,9 +131,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_UNTAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallbackForFirstIteration, - &fakeUserData))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallbackForFirstIteration, &fakeUserData))) { nsk_jvmti_setFailStatus(); break; } @@ -151,17 +147,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } /* Allocate memory for array to save pointers to ObjectDescList elements */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (objectDescCount * sizeof(ObjectDesc*)), - (unsigned char**)&objectDescArr))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((objectDescCount * sizeof(ObjectDesc*)), (unsigned char**)&objectDescArr))) { nsk_jvmti_setFailStatus(); break; } /* Allocate memory for flags array and fill with false values */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (objectDescCount * sizeof(unsigned char)), - &deallocatedFlagsArr))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((objectDescCount * sizeof(unsigned char)), &deallocatedFlagsArr))) { nsk_jvmti_setFailStatus(); break; } @@ -186,9 +178,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_TAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallbackForSecondIteration, - &fakeUserData))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallbackForSecondIteration, &fakeUserData))) { nsk_jvmti_setFailStatus(); } } @@ -202,7 +192,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { for (ind = 0; ind < objectDescCount; ind++) { if (!deallocatedFlagsArr[ind]) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr[ind]))) { + jvmti->Deallocate((unsigned char*)objectDescArr[ind]))) { NSK_COMPLAIN1("Unable to deallocate descriptor. Index = %d \n", ind); nsk_jvmti_setFailStatus(); return; @@ -211,12 +201,12 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr))) { + jvmti->Deallocate((unsigned char*)objectDescArr))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)deallocatedFlagsArr))) { + jvmti->Deallocate((unsigned char*)deallocatedFlagsArr))) { nsk_jvmti_setFailStatus(); } @@ -258,12 +248,11 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp index b04b1f855cc..d2ccacfe2d2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp @@ -51,54 +51,54 @@ heapObjectCallback(jlong class_tag, objCounter++; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, st_jvmti, name, &monitor_ptr))) { + st_jvmti->CreateRawMonitor(name, &monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Enter second time */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, st_jvmti, monitor_ptr, (jlong)100))) { + st_jvmti->RawMonitorWait(monitor_ptr, (jlong)100))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, st_jvmti, monitor_ptr))) { + st_jvmti->RawMonitorNotify(monitor_ptr))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotifyAll, st_jvmti, monitor_ptr))) { + st_jvmti->RawMonitorNotifyAll(monitor_ptr))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Exit second time */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(DestroyRawMonitor, st_jvmti, monitor_ptr))) { + st_jvmti->DestroyRawMonitor(monitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -119,11 +119,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, - jvmti, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - &fakeUserData))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); } } @@ -174,7 +170,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp index 10d5d1dccf0..ec9bf6e9aa9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp @@ -46,12 +46,12 @@ heapObjectCallback(jlong class_tag, void* storage_data) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SetEnvironmentLocalStorage, st_jvmti, storage_data ))) { + st_jvmti->SetEnvironmentLocalStorage(storage_data ))) { nsk_jvmti_setFailStatus(); } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, st_jvmti, &storage_ptr))) { + st_jvmti->GetEnvironmentLocalStorage(&storage_ptr))) { nsk_jvmti_setFailStatus(); } @@ -73,11 +73,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, - jvmti, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - (void *)storage_data))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, (void *)storage_data))) { nsk_jvmti_setFailStatus(); } } @@ -135,7 +131,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp index 3798c5a9e42..3d818cd32ae 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp @@ -46,7 +46,7 @@ heapObjectCallback(jlong class_tag, void* user_data) { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, st_jvmti, &timer_info1 ))) { + st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1 ))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -65,13 +65,13 @@ heapObjectCallback(jlong class_tag, /* ---------------------------------------------------------------------- */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, st_jvmti, &nanos ))) { + st_jvmti->GetCurrentThreadCpuTime(&nanos ))) { nsk_jvmti_setFailStatus(); } /* ---------------------------------------------------------------------- */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, st_jvmti, &timer_info2 ))) { + st_jvmti->GetTimerInfo(&timer_info2 ))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -91,7 +91,7 @@ heapObjectCallback(jlong class_tag, nanos = 0; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, st_jvmti, &nanos ))) { + st_jvmti->GetTime(&nanos ))) { nsk_jvmti_setFailStatus(); } @@ -113,11 +113,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, - jvmti, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - (void *)user_data))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, (void *)user_data))) { nsk_jvmti_setFailStatus(); } } @@ -164,7 +160,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_get_current_thread_cpu_time = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp index c8c6fdab442..c9a0acc33ee 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp @@ -92,14 +92,14 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, tag++; if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -111,7 +111,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -136,9 +136,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -155,7 +153,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -163,7 +161,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -171,7 +169,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -179,7 +177,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Create global ref to tested class: 0x%p\n", chainObjectClass); if (!NSK_JNI_VERIFY(jni, (*testedClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, chainObjectClass)) != NULL)) { + jni->NewGlobalRef(chainObjectClass)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -187,8 +185,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -196,8 +193,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -205,8 +201,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -214,8 +209,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -223,8 +217,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -234,7 +227,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY0(" tested class object:\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, *testedClass, testedClassTag))) { + jvmti->SetTag(*testedClass, testedClassTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -329,13 +322,13 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, ObjectDesc* objectDescList, jclass testedClass) { if (testedClass != NULL) { NSK_DISPLAY1("Release object reference to tested class: 0x%p\n", testedClass); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass)); + NSK_TRACE(jni->DeleteGlobalRef(testedClass)); } if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -450,9 +443,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Iterate over instances of tested class with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, - testedClass, JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, &fakeUserData))) { + jvmti->IterateOverInstancesOfClass(testedClass, JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -561,7 +552,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -571,8 +562,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = callbackObjectFree; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp index 367cb8a8a63..13288e2fd5e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp @@ -92,14 +92,14 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, tag++; if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -111,7 +111,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -136,9 +136,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -155,7 +153,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -163,7 +161,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -171,7 +169,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -179,7 +177,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Create global ref to tested class: 0x%p\n", chainObjectClass); if (!NSK_JNI_VERIFY(jni, (*testedClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, chainObjectClass)) != NULL)) { + jni->NewGlobalRef(chainObjectClass)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -187,8 +185,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -196,8 +193,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -205,8 +201,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -214,8 +209,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -223,8 +217,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -234,7 +227,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY0(" tested class object:\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, *testedClass, testedClassTag))) { + jvmti->SetTag(*testedClass, testedClassTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -329,13 +322,13 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, ObjectDesc* objectDescList, jclass testedClass) { if (testedClass != NULL) { NSK_DISPLAY1("Release object reference to tested class: 0x%p\n", testedClass); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass)); + NSK_TRACE(jni->DeleteGlobalRef(testedClass)); } if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -458,9 +451,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Iterate over instances of tested class with filter JVMTI_HEAP_OBJECT_TAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, - testedClass, JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, &fakeUserData))) { + jvmti->IterateOverInstancesOfClass(testedClass, JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -569,7 +560,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -579,8 +570,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = callbackObjectFree; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp index 6d054e160bf..e552dc0b3b9 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp @@ -92,14 +92,14 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, tag++; if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -111,7 +111,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -136,9 +136,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -155,7 +153,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -163,7 +161,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -171,7 +169,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -179,7 +177,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Create global ref to tested class: 0x%p\n", chainObjectClass); if (!NSK_JNI_VERIFY(jni, (*testedClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, chainObjectClass)) != NULL)) { + jni->NewGlobalRef(chainObjectClass)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -187,8 +185,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -196,8 +193,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -205,8 +201,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -214,8 +209,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -223,8 +217,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -234,7 +227,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY0(" tested class object:\n"); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, *testedClass, testedClassTag))) { + jvmti->SetTag(*testedClass, testedClassTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -329,13 +322,13 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, ObjectDesc* objectDescList, jclass testedClass) { if (testedClass != NULL) { NSK_DISPLAY1("Release object reference to tested class: 0x%p\n", testedClass); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass)); + NSK_TRACE(jni->DeleteGlobalRef(testedClass)); } if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -459,9 +452,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Iterate over instances of tested class with filter JVMTI_HEAP_OBJECT_UNTAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, - testedClass, JVMTI_HEAP_OBJECT_UNTAGGED, - heapObjectCallback, &fakeUserData))) { + jvmti->IterateOverInstancesOfClass(testedClass, JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -570,7 +561,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } @@ -580,8 +571,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.ObjectFree = callbackObjectFree; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) + jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp index 1da333ffaae..43e378571f4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp @@ -61,9 +61,7 @@ heapObjectCallback1(jlong class_tag, /* Set tag */ *tag_ptr = objectCount; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, st_jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->Allocate((sizeof(ObjectDesc)), (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); allocationError = 1; } @@ -83,8 +81,7 @@ heapObjectCallback2(jlong class_tag, objectCount--; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, st_jvmti, (unsigned char*)objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->Deallocate((unsigned char*)objectDescBuf))) { nsk_jvmti_setFailStatus(); } @@ -115,12 +112,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_UNTAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_UNTAGGED, - heapObjectCallback1, - &userData))) { + jvmti->IterateOverInstancesOfClass(debugeeClass, JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback1, &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -139,12 +131,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_TAGGED\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback2, - &userData))) { + jvmti->IterateOverInstancesOfClass(debugeeClass, JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallback2, &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -200,7 +187,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } From 859d3764943a2a2b7c61fc33ac981dc089fe2f14 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Mon, 8 Oct 2018 14:14:52 -0700 Subject: [PATCH 036/124] 8211728: JarFile::versionedStream() does not filter META-INF resources in versioned stream Reviewed-by: alanb --- src/java.base/share/classes/java/util/jar/JarFile.java | 3 ++- .../util/jar/JarFile/mrjar/TestVersionedStream.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java index bc8805ee14f..0acfc189abf 100644 --- a/src/java.base/share/classes/java/util/jar/JarFile.java +++ b/src/java.base/share/classes/java/util/jar/JarFile.java @@ -556,7 +556,8 @@ class JarFile extends ZipFile { return JUZFA.entryNameStream(this).map(this::getBasename) .filter(Objects::nonNull) .distinct() - .map(this::getJarEntry); + .map(this::getJarEntry) + .filter(Objects::nonNull); } return stream(); } diff --git a/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java b/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java index 8f4109ee767..91c0421b207 100644 --- a/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java +++ b/test/jdk/java/util/jar/JarFile/mrjar/TestVersionedStream.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8163798 8189611 + * @bug 8163798 8189611 8211728 * @summary basic tests for multi-release jar versioned streams * @library /test/lib * @modules jdk.jartool/sun.tools.jar java.base/jdk.internal.util.jar @@ -82,7 +82,8 @@ public class TestVersionedStream { "v10/p/Foo.class", "v10/q/Bar.class", "v" + LATEST_VERSION + "/p/Bar.class", - "v" + LATEST_VERSION + "/p/Foo.class" + "v" + LATEST_VERSION + "/p/Foo.class", + "v" + LATEST_VERSION + "/META-INF/Foo.class" ); jar("cf mmr.jar -C base . " + @@ -224,6 +225,11 @@ public class TestVersionedStream { throw new UncheckedIOException(x); } }); + + if (!unversionedEntryNames.contains("META-INF/Foo.class") || + versionedNames.indexOf("META-INF/Foo.class") != -1) { + Assert.fail("versioned META-INF/Foo.class test failed"); + } } } From 2f82ed4f1db6dfb6937519f0094dac2a0ecf7b97 Mon Sep 17 00:00:00 2001 From: Ioi Lam Date: Mon, 8 Oct 2018 16:29:10 -0700 Subject: [PATCH 037/124] 8210388: Use hash table to store archived subgraph_info records Reviewed-by: jiangli --- .../share/classfile/compactHashtable.cpp | 2 +- .../share/classfile/compactHashtable.hpp | 13 +- src/hotspot/share/classfile/stringTable.cpp | 30 +- src/hotspot/share/classfile/stringTable.hpp | 6 +- src/hotspot/share/classfile/symbolTable.cpp | 52 ++-- src/hotspot/share/classfile/symbolTable.hpp | 6 +- src/hotspot/share/memory/heapShared.cpp | 256 +++++++----------- src/hotspot/share/memory/heapShared.hpp | 59 ++-- src/hotspot/share/memory/metaspaceShared.cpp | 42 +-- 9 files changed, 220 insertions(+), 246 deletions(-) diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp index eabe87a213b..9cdc09375a4 100644 --- a/src/hotspot/share/classfile/compactHashtable.cpp +++ b/src/hotspot/share/classfile/compactHashtable.cpp @@ -174,7 +174,7 @@ void CompactHashtableWriter::dump(SimpleCompactHashtable *cht, const char* table // The CompactHashtable implementation // -void SimpleCompactHashtable::serialize(SerializeClosure* soc) { +void SimpleCompactHashtable::serialize_header(SerializeClosure* soc) { soc->do_ptr((void**)&_base_address); soc->do_u4(&_entry_count); soc->do_u4(&_bucket_count); diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp index 0c2ffe209a9..ed8e8dd5656 100644 --- a/src/hotspot/share/classfile/compactHashtable.hpp +++ b/src/hotspot/share/classfile/compactHashtable.hpp @@ -123,6 +123,15 @@ private: public: void dump(SimpleCompactHashtable *cht, const char* table_name); + + static int default_num_buckets(size_t num_entries) { + return default_num_buckets((int)num_entries); + } + static int default_num_buckets(int num_entries) { + int num_buckets = num_entries / SharedSymbolTableBucketSize; + // calculation of num_buckets can result in zero buckets, we need at least one + return (num_buckets < 1) ? 1 : num_buckets; + } }; #endif // INCLUDE_CDS @@ -213,8 +222,8 @@ public: _entries = entries; } - // For reading from/writing to the CDS archive - void serialize(SerializeClosure* soc) NOT_CDS_RETURN; + // Read/Write the table's header from/to the CDS archive + void serialize_header(SerializeClosure* soc) NOT_CDS_RETURN; inline bool empty() { return (_entry_count == 0); diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp index 3759f1a02b9..1231e3729ac 100644 --- a/src/hotspot/share/classfile/stringTable.cpp +++ b/src/hotspot/share/classfile/stringTable.cpp @@ -819,18 +819,9 @@ oop StringTable::create_archived_string(oop s, Thread* THREAD) { return new_s; } -class CompactStringTableWriter: public CompactHashtableWriter { -public: - CompactStringTableWriter(int num_entries, CompactHashtableStats* stats) : - CompactHashtableWriter(num_entries, stats) {} - void add(unsigned int hash, oop string) { - CompactHashtableWriter::add(hash, CompressedOops::encode(string)); - } -}; - struct CopyToArchive : StackObj { - CompactStringTableWriter* _writer; - CopyToArchive(CompactStringTableWriter* writer) : _writer(writer) {} + CompactHashtableWriter* _writer; + CopyToArchive(CompactHashtableWriter* writer) : _writer(writer) {} bool operator()(WeakHandle* val) { oop s = val->peek(); if (s == NULL) { @@ -838,6 +829,7 @@ struct CopyToArchive : StackObj { } unsigned int hash = java_lang_String::hash_code(s); if (hash == 0) { + // We do not archive Strings with a 0 hashcode because ...... return true; } @@ -849,12 +841,12 @@ struct CopyToArchive : StackObj { val->replace(new_s); // add to the compact table - _writer->add(hash, new_s); + _writer->add(hash, CompressedOops::encode(new_s)); return true; } }; -void StringTable::copy_shared_string_table(CompactStringTableWriter* writer) { +void StringTable::copy_shared_string_table(CompactHashtableWriter* writer) { assert(MetaspaceShared::is_heap_object_archiving_allowed(), "must be"); CopyToArchive copy(writer); @@ -865,18 +857,18 @@ void StringTable::write_to_archive() { assert(MetaspaceShared::is_heap_object_archiving_allowed(), "must be"); _shared_table.reset(); - int num_buckets = the_table()->_items_count / SharedSymbolTableBucketSize; - // calculation of num_buckets can result in zero buckets, we need at least one - CompactStringTableWriter writer(num_buckets > 1 ? num_buckets : 1, - &MetaspaceShared::stats()->string); + int num_buckets = CompactHashtableWriter::default_num_buckets( + StringTable::the_table()->_items_count); + CompactHashtableWriter writer(num_buckets, + &MetaspaceShared::stats()->string); // Copy the interned strings into the "string space" within the java heap copy_shared_string_table(&writer); writer.dump(&_shared_table, "string"); } -void StringTable::serialize(SerializeClosure* soc) { - _shared_table.serialize(soc); +void StringTable::serialize_shared_table_header(SerializeClosure* soc) { + _shared_table.serialize_header(soc); if (soc->writing()) { // Sanity. Make sure we don't use the shared table at dump time diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp index 15f98302c34..ccd0c043512 100644 --- a/src/hotspot/share/classfile/stringTable.hpp +++ b/src/hotspot/share/classfile/stringTable.hpp @@ -33,7 +33,7 @@ #include "oops/weakHandle.hpp" #include "utilities/concurrentHashTable.hpp" -class CompactStringTableWriter; +class CompactHashtableWriter; class SerializeClosure; class StringTable; @@ -163,14 +163,14 @@ private: // Sharing private: oop lookup_shared(const jchar* name, int len, unsigned int hash) NOT_CDS_JAVA_HEAP_RETURN_(NULL); - static void copy_shared_string_table(CompactStringTableWriter* ch_table) NOT_CDS_JAVA_HEAP_RETURN; + static void copy_shared_string_table(CompactHashtableWriter* ch_table) NOT_CDS_JAVA_HEAP_RETURN; public: static oop create_archived_string(oop s, Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN_(NULL); static void set_shared_string_mapped() { _shared_string_mapped = true; } static bool shared_string_mapped() { return _shared_string_mapped; } static void shared_oops_do(OopClosure* f) NOT_CDS_JAVA_HEAP_RETURN; static void write_to_archive() NOT_CDS_JAVA_HEAP_RETURN; - static void serialize(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; + static void serialize_shared_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; // Jcmd static void dump(outputStream* st, bool verbose=false); diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp index 25305313498..f556de6db1d 100644 --- a/src/hotspot/share/classfile/symbolTable.cpp +++ b/src/hotspot/share/classfile/symbolTable.cpp @@ -627,43 +627,31 @@ void SymbolTable::dump(outputStream* st, bool verbose) { } #if INCLUDE_CDS -class CompactSymbolTableWriter: public CompactHashtableWriter { -public: - CompactSymbolTableWriter(int num_buckets, CompactHashtableStats* stats) : - CompactHashtableWriter(num_buckets, stats) {} - void add(unsigned int hash, Symbol *symbol) { - uintx deltax = MetaspaceShared::object_delta(symbol); +struct CopyToArchive : StackObj { + CompactHashtableWriter* _writer; + CopyToArchive(CompactHashtableWriter* writer) : _writer(writer) {} + bool operator()(Symbol** value) { + assert(value != NULL, "expected valid value"); + assert(*value != NULL, "value should point to a symbol"); + Symbol* sym = *value; + unsigned int fixed_hash = hash_shared_symbol((const char*)sym->bytes(), sym->utf8_length()); + assert(fixed_hash == hash_symbol((const char*)sym->bytes(), sym->utf8_length(), false), + "must not rehash during dumping"); + + uintx deltax = MetaspaceShared::object_delta(sym); // When the symbols are stored into the archive, we already check that // they won't be more than MAX_SHARED_DELTA from the base address, or // else the dumping would have been aborted. assert(deltax <= MAX_SHARED_DELTA, "must not be"); u4 delta = u4(deltax); - CompactHashtableWriter::add(hash, delta); - } -}; - -struct CopyToArchive : StackObj { - CompactSymbolTableWriter* _writer; - CopyToArchive(CompactSymbolTableWriter* writer) : _writer(writer) {} - bool operator()(Symbol** value) { - assert(value != NULL, "expected valid value"); - assert(*value != NULL, "value should point to a symbol"); - Symbol* sym = *value; - unsigned int fixed_hash = hash_shared_symbol((const char*)sym->bytes(), sym->utf8_length()); - if (fixed_hash == 0) { - return true; - } - assert(fixed_hash == hash_symbol((const char*)sym->bytes(), sym->utf8_length(), false), - "must not rehash during dumping"); - // add to the compact table - _writer->add(fixed_hash, sym); + _writer->add(fixed_hash, delta); return true; } }; -void SymbolTable::copy_shared_symbol_table(CompactSymbolTableWriter* writer) { +void SymbolTable::copy_shared_symbol_table(CompactHashtableWriter* writer) { CopyToArchive copy(writer); SymbolTable::the_table()->_local_table->do_scan(Thread::current(), copy); } @@ -671,10 +659,10 @@ void SymbolTable::copy_shared_symbol_table(CompactSymbolTableWriter* writer) { void SymbolTable::write_to_archive() { _shared_table.reset(); - int num_buckets = (int)(SymbolTable::the_table()->_items_count / SharedSymbolTableBucketSize); - // calculation of num_buckets can result in zero buckets, we need at least one - CompactSymbolTableWriter writer(num_buckets > 1 ? num_buckets : 1, - &MetaspaceShared::stats()->symbol); + int num_buckets = CompactHashtableWriter::default_num_buckets( + SymbolTable::the_table()->_items_count); + CompactHashtableWriter writer(num_buckets, + &MetaspaceShared::stats()->symbol); copy_shared_symbol_table(&writer); writer.dump(&_shared_table, "symbol"); @@ -686,8 +674,8 @@ void SymbolTable::write_to_archive() { assert(sym == _shared_table.lookup(name, hash, len), "sanity"); } -void SymbolTable::serialize(SerializeClosure* soc) { - _shared_table.serialize(soc); +void SymbolTable::serialize_shared_table_header(SerializeClosure* soc) { + _shared_table.serialize_header(soc); if (soc->writing()) { // Sanity. Make sure we don't use the shared table at dump time diff --git a/src/hotspot/share/classfile/symbolTable.hpp b/src/hotspot/share/classfile/symbolTable.hpp index 239c12a1c3c..3d3b27e1fb9 100644 --- a/src/hotspot/share/classfile/symbolTable.hpp +++ b/src/hotspot/share/classfile/symbolTable.hpp @@ -84,7 +84,7 @@ public: operator Symbol*() { return _temp; } }; -class CompactSymbolTableWriter; +class CompactHashtableWriter; class SerializeClosure; class SymbolTableConfig; @@ -240,10 +240,10 @@ public: // Sharing private: - static void copy_shared_symbol_table(CompactSymbolTableWriter* ch_table); + static void copy_shared_symbol_table(CompactHashtableWriter* ch_table); public: static void write_to_archive() NOT_CDS_RETURN; - static void serialize(SerializeClosure* soc) NOT_CDS_RETURN; + static void serialize_shared_table_header(SerializeClosure* soc) NOT_CDS_RETURN; static void metaspace_pointers_do(MetaspaceClosure* it); // Jcmd diff --git a/src/hotspot/share/memory/heapShared.cpp b/src/hotspot/share/memory/heapShared.cpp index 2837a30b277..c55415caf78 100644 --- a/src/hotspot/share/memory/heapShared.cpp +++ b/src/hotspot/share/memory/heapShared.cpp @@ -41,49 +41,26 @@ #include "utilities/bitMap.inline.hpp" #if INCLUDE_CDS_JAVA_HEAP -KlassSubGraphInfo* HeapShared::_subgraph_info_list = NULL; -int HeapShared::_num_archived_subgraph_info_records = 0; -Array* HeapShared::_archived_subgraph_info_records = NULL; - -KlassSubGraphInfo* HeapShared::find_subgraph_info(Klass* k) { - KlassSubGraphInfo* info = _subgraph_info_list; - while (info != NULL) { - if (info->klass() == k) { - return info; - } - info = info->next(); - } - return NULL; -} +address HeapShared::_narrow_oop_base; +int HeapShared::_narrow_oop_shift; +HeapShared::DumpTimeKlassSubGraphInfoTable* HeapShared::_dump_time_subgraph_info_table = NULL; +HeapShared::RunTimeKlassSubGraphInfoTable HeapShared::_run_time_subgraph_info_table; // Get the subgraph_info for Klass k. A new subgraph_info is created if // there is no existing one for k. The subgraph_info records the relocated // Klass* of the original k. KlassSubGraphInfo* HeapShared::get_subgraph_info(Klass* k) { + assert(DumpSharedSpaces, "dump time only"); Klass* relocated_k = MetaspaceShared::get_relocated_klass(k); - KlassSubGraphInfo* info = find_subgraph_info(relocated_k); - if (info != NULL) { - return info; + KlassSubGraphInfo* info = _dump_time_subgraph_info_table->get(relocated_k); + if (info == NULL) { + _dump_time_subgraph_info_table->put(relocated_k, KlassSubGraphInfo(relocated_k)); + info = _dump_time_subgraph_info_table->get(relocated_k); + ++ _dump_time_subgraph_info_table->_count; } - - info = new KlassSubGraphInfo(relocated_k, _subgraph_info_list); - _subgraph_info_list = info; return info; } -address HeapShared::_narrow_oop_base; -int HeapShared::_narrow_oop_shift; - -int HeapShared::num_of_subgraph_infos() { - int num = 0; - KlassSubGraphInfo* info = _subgraph_info_list; - while (info != NULL) { - num ++; - info = info->next(); - } - return num; -} - // Add an entry field to the current KlassSubGraphInfo. void KlassSubGraphInfo::add_subgraph_entry_field(int static_field_offset, oop v) { assert(DumpSharedSpaces, "dump time only"); @@ -156,7 +133,6 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k, Klass *relocate // Initialize an archived subgraph_info_record from the given KlassSubGraphInfo. void ArchivedKlassSubGraphInfoRecord::init(KlassSubGraphInfo* info) { _k = info->klass(); - _next = NULL; _entry_field_records = NULL; _subgraph_object_klasses = NULL; @@ -191,6 +167,26 @@ void ArchivedKlassSubGraphInfoRecord::init(KlassSubGraphInfo* info) { } } +struct CopyKlassSubGraphInfoToArchive : StackObj { + CompactHashtableWriter* _writer; + CopyKlassSubGraphInfoToArchive(CompactHashtableWriter* writer) : _writer(writer) {} + + bool do_entry(Klass* klass, KlassSubGraphInfo& info) { + if (info.subgraph_object_klasses() != NULL || info.subgraph_entry_fields() != NULL) { + ArchivedKlassSubGraphInfoRecord* record = + (ArchivedKlassSubGraphInfoRecord*)MetaspaceShared::read_only_space_alloc(sizeof(ArchivedKlassSubGraphInfoRecord)); + record->init(&info); + + unsigned int hash = primitive_hash(klass); + uintx deltax = MetaspaceShared::object_delta(record); + guarantee(deltax <= MAX_SHARED_DELTA, "must not be"); + u4 delta = u4(deltax); + _writer->add(hash, delta); + } + return true; // keep on iterating + } +}; + // Build the records of archived subgraph infos, which include: // - Entry points to all subgraphs from the containing class mirror. The entry // points are static fields in the mirror. For each entry point, the field @@ -198,145 +194,97 @@ void ArchivedKlassSubGraphInfoRecord::init(KlassSubGraphInfo* info) { // back to the corresponding field at runtime. // - A list of klasses that need to be loaded/initialized before archived // java object sub-graph can be accessed at runtime. -// -// The records are saved in the archive file and reloaded at runtime. -// -// Layout of the archived subgraph info records: -// -// records_size | num_records | records* -// ArchivedKlassSubGraphInfoRecord | entry_fields | subgraph_object_klasses -size_t HeapShared::build_archived_subgraph_info_records(int num_records) { - // remember the start address - char* start_p = MetaspaceShared::read_only_space_top(); +void HeapShared::write_subgraph_info_table() { + // Allocate the contents of the hashtable(s) inside the RO region of the CDS archive. + DumpTimeKlassSubGraphInfoTable* d_table = _dump_time_subgraph_info_table; + CompactHashtableStats stats; - // now populate the archived subgraph infos, which will be saved in the - // archive file - _archived_subgraph_info_records = - MetaspaceShared::new_ro_array(num_records); - KlassSubGraphInfo* info = _subgraph_info_list; - int i = 0; - while (info != NULL) { - assert(i < _archived_subgraph_info_records->length(), "sanity"); - ArchivedKlassSubGraphInfoRecord* record = - _archived_subgraph_info_records->adr_at(i); - record->init(info); - info = info->next(); - i ++; - } + _run_time_subgraph_info_table.reset(); - // _subgraph_info_list is no longer needed - delete _subgraph_info_list; - _subgraph_info_list = NULL; + int num_buckets = CompactHashtableWriter::default_num_buckets(d_table->_count); + CompactHashtableWriter writer(num_buckets, &stats); + CopyKlassSubGraphInfoToArchive copy(&writer); + _dump_time_subgraph_info_table->iterate(©); - char* end_p = MetaspaceShared::read_only_space_top(); - size_t records_size = end_p - start_p; - return records_size; + writer.dump(&_run_time_subgraph_info_table, "subgraphs"); } -// Write the subgraph info records in the shared _ro region -void HeapShared::write_archived_subgraph_infos() { - assert(DumpSharedSpaces, "dump time only"); - - Array* records_header = MetaspaceShared::new_ro_array(3); - - _num_archived_subgraph_info_records = num_of_subgraph_infos(); - size_t records_size = build_archived_subgraph_info_records( - _num_archived_subgraph_info_records); - - // Now write the header information: - // records_size, num_records, _archived_subgraph_info_records - assert(records_header != NULL, "sanity"); - intptr_t* p = (intptr_t*)(records_header->data()); - *p = (intptr_t)records_size; - p ++; - *p = (intptr_t)_num_archived_subgraph_info_records; - p ++; - *p = (intptr_t)_archived_subgraph_info_records; -} - -char* HeapShared::read_archived_subgraph_infos(char* buffer) { - Array* records_header = (Array*)buffer; - intptr_t* p = (intptr_t*)(records_header->data()); - size_t records_size = (size_t)(*p); - p ++; - _num_archived_subgraph_info_records = *p; - p ++; - _archived_subgraph_info_records = - (Array*)(*p); - - buffer = (char*)_archived_subgraph_info_records + records_size; - return buffer; +void HeapShared::serialize_subgraph_info_table_header(SerializeClosure* soc) { + _run_time_subgraph_info_table.serialize_header(soc); } void HeapShared::initialize_from_archived_subgraph(Klass* k) { if (!MetaspaceShared::open_archive_heap_region_mapped()) { return; // nothing to do } + assert(!DumpSharedSpaces, "Should not be called with DumpSharedSpaces"); - if (_num_archived_subgraph_info_records == 0) { - return; // no subgraph info records - } + unsigned int hash = primitive_hash(k); + ArchivedKlassSubGraphInfoRecord* record = _run_time_subgraph_info_table.lookup(k, hash, 0); // Initialize from archived data. Currently this is done only // during VM initialization time. No lock is needed. - Thread* THREAD = Thread::current(); - for (int i = 0; i < _archived_subgraph_info_records->length(); i++) { - ArchivedKlassSubGraphInfoRecord* record = _archived_subgraph_info_records->adr_at(i); - if (record->klass() == k) { - int i; - // Found the archived subgraph info record for the requesting klass. - // Load/link/initialize the klasses of the objects in the subgraph. - // NULL class loader is used. - Array* klasses = record->subgraph_object_klasses(); - if (klasses != NULL) { - for (i = 0; i < klasses->length(); i++) { - Klass* obj_k = klasses->at(i); - Klass* resolved_k = SystemDictionary::resolve_or_null( - (obj_k)->name(), THREAD); - if (resolved_k != obj_k) { - return; - } - if ((obj_k)->is_instance_klass()) { - InstanceKlass* ik = InstanceKlass::cast(obj_k); - ik->initialize(THREAD); - } else if ((obj_k)->is_objArray_klass()) { - ObjArrayKlass* oak = ObjArrayKlass::cast(obj_k); - oak->initialize(THREAD); - } + if (record != NULL) { + Thread* THREAD = Thread::current(); + if (log_is_enabled(Info, cds, heap)) { + ResourceMark rm; + log_info(cds, heap)("initialize_from_archived_subgraph " PTR_FORMAT " %s", p2i(k), + k->external_name()); + } + + int i; + // Load/link/initialize the klasses of the objects in the subgraph. + // NULL class loader is used. + Array* klasses = record->subgraph_object_klasses(); + if (klasses != NULL) { + for (i = 0; i < klasses->length(); i++) { + Klass* obj_k = klasses->at(i); + Klass* resolved_k = SystemDictionary::resolve_or_null( + (obj_k)->name(), THREAD); + if (resolved_k != obj_k) { + return; + } + if ((obj_k)->is_instance_klass()) { + InstanceKlass* ik = InstanceKlass::cast(obj_k); + ik->initialize(THREAD); + } else if ((obj_k)->is_objArray_klass()) { + ObjArrayKlass* oak = ObjArrayKlass::cast(obj_k); + oak->initialize(THREAD); } } + } - if (HAS_PENDING_EXCEPTION) { - CLEAR_PENDING_EXCEPTION; - // None of the field value will be set if there was an exception. - // The java code will not see any of the archived objects in the - // subgraphs referenced from k in this case. - return; - } - - // Load the subgraph entry fields from the record and store them back to - // the corresponding fields within the mirror. - oop m = k->java_mirror(); - Array* entry_field_records = record->entry_field_records(); - if (entry_field_records != NULL) { - int efr_len = entry_field_records->length(); - assert(efr_len % 2 == 0, "sanity"); - for (i = 0; i < efr_len;) { - int field_offset = entry_field_records->at(i); - // The object refereced by the field becomes 'known' by GC from this - // point. All objects in the subgraph reachable from the object are - // also 'known' by GC. - oop v = MetaspaceShared::materialize_archived_object( - entry_field_records->at(i+1)); - m->obj_field_put(field_offset, v); - i += 2; - } - } - - // Done. Java code can see the archived sub-graphs referenced from k's - // mirror after this point. + if (HAS_PENDING_EXCEPTION) { + CLEAR_PENDING_EXCEPTION; + // None of the field value will be set if there was an exception. + // The java code will not see any of the archived objects in the + // subgraphs referenced from k in this case. return; } + + // Load the subgraph entry fields from the record and store them back to + // the corresponding fields within the mirror. + oop m = k->java_mirror(); + Array* entry_field_records = record->entry_field_records(); + if (entry_field_records != NULL) { + int efr_len = entry_field_records->length(); + assert(efr_len % 2 == 0, "sanity"); + for (i = 0; i < efr_len;) { + int field_offset = entry_field_records->at(i); + // The object refereced by the field becomes 'known' by GC from this + // point. All objects in the subgraph reachable from the object are + // also 'known' by GC. + oop v = MetaspaceShared::materialize_archived_object( + entry_field_records->at(i+1)); + m->obj_field_put(field_offset, v); + i += 2; + + log_debug(cds, heap)(" " PTR_FORMAT " init field @ %2d = " PTR_FORMAT, p2i(k), field_offset, p2i(v)); + } + + // Done. Java code can see the archived sub-graphs referenced from k's + // mirror after this point. + } } } @@ -702,6 +650,8 @@ public: }; void HeapShared::init_archivable_static_fields(Thread* THREAD) { + _dump_time_subgraph_info_table = new (ResourceObj::C_HEAP, mtClass)DumpTimeKlassSubGraphInfoTable(); + for (int i = 0; i < num_archivable_static_fields; i++) { ArchivableStaticFieldInfo* info = &archivable_static_fields[i]; TempNewSymbol klass_name = SymbolTable::new_symbol(info->klass_name, THREAD); diff --git a/src/hotspot/share/memory/heapShared.hpp b/src/hotspot/share/memory/heapShared.hpp index ce9e542c72d..92c10e41120 100644 --- a/src/hotspot/share/memory/heapShared.hpp +++ b/src/hotspot/share/memory/heapShared.hpp @@ -25,6 +25,7 @@ #ifndef SHARE_VM_MEMORY_HEAPSHARED_HPP #define SHARE_VM_MEMORY_HEAPSHARED_HPP +#include "classfile/compactHashtable.hpp" #include "classfile/systemDictionary.hpp" #include "memory/allocation.hpp" #include "memory/universe.hpp" @@ -42,7 +43,6 @@ // within the sub-graphs. class KlassSubGraphInfo: public CHeapObj { private: - KlassSubGraphInfo* _next; // The class that contains the static field(s) as the entry point(s) // of archived object sub-graph(s). Klass* _k; @@ -54,8 +54,8 @@ class KlassSubGraphInfo: public CHeapObj { GrowableArray* _subgraph_entry_fields; public: - KlassSubGraphInfo(Klass* k, KlassSubGraphInfo* next) : - _next(next), _k(k), _subgraph_object_klasses(NULL), + KlassSubGraphInfo(Klass* k) : + _k(k), _subgraph_object_klasses(NULL), _subgraph_entry_fields(NULL) {} ~KlassSubGraphInfo() { if (_subgraph_object_klasses != NULL) { @@ -66,7 +66,6 @@ class KlassSubGraphInfo: public CHeapObj { } }; - KlassSubGraphInfo* next() { return _next; } Klass* klass() { return _k; } GrowableArray* subgraph_object_klasses() { return _subgraph_object_klasses; @@ -87,7 +86,6 @@ class KlassSubGraphInfo: public CHeapObj { // at runtime. class ArchivedKlassSubGraphInfoRecord { private: - ArchivedKlassSubGraphInfoRecord* _next; Klass* _k; // contains pairs of field offset and value for each subgraph entry field @@ -98,11 +96,9 @@ class ArchivedKlassSubGraphInfoRecord { Array* _subgraph_object_klasses; public: ArchivedKlassSubGraphInfoRecord() : - _next(NULL), _k(NULL), _entry_field_records(NULL), _subgraph_object_klasses(NULL) {} + _k(NULL), _entry_field_records(NULL), _subgraph_object_klasses(NULL) {} void init(KlassSubGraphInfo* info); Klass* klass() { return _k; } - ArchivedKlassSubGraphInfoRecord* next() { return _next; } - void set_next(ArchivedKlassSubGraphInfoRecord* next) { _next = next; } Array* entry_field_records() { return _entry_field_records; } Array* subgraph_object_klasses() { return _subgraph_object_klasses; } }; @@ -112,14 +108,42 @@ class HeapShared: AllStatic { friend class VerifySharedOopClosure; private: #if INCLUDE_CDS_JAVA_HEAP - // This is a list of subgraph infos built at dump time while - // archiving object subgraphs. - static KlassSubGraphInfo* _subgraph_info_list; - // Contains a list of ArchivedKlassSubGraphInfoRecords that is stored - // in the archive file and reloaded at runtime. - static int _num_archived_subgraph_info_records; - static Array* _archived_subgraph_info_records; + static bool klass_equals(Klass* const& p1, Klass* const& p2) { + return primitive_equals(p1, p2); + } + + static unsigned klass_hash(Klass* const& klass) { + return primitive_hash

((address)klass); + } + + class DumpTimeKlassSubGraphInfoTable + : public ResourceHashtable { + public: + int _count; + }; + + inline static ArchivedKlassSubGraphInfoRecord* read_record_from_compact_hashtable(address base_address, u4 offset) { + return (ArchivedKlassSubGraphInfoRecord*)(base_address + offset); + } + + inline static bool record_equals_compact_hashtable_entry(ArchivedKlassSubGraphInfoRecord* value, const Klass* key, int len_unused) { + return (value->klass() == key); + } + + typedef CompactHashtable< + const Klass*, + ArchivedKlassSubGraphInfoRecord*, + read_record_from_compact_hashtable, + record_equals_compact_hashtable_entry + > RunTimeKlassSubGraphInfoTable; + + static DumpTimeKlassSubGraphInfoTable* _dump_time_subgraph_info_table; + static RunTimeKlassSubGraphInfoTable _run_time_subgraph_info_table; // Archive object sub-graph starting from the given static field // in Klass k's mirror. @@ -131,11 +155,10 @@ class HeapShared: AllStatic { static void verify_reachable_objects_from(oop obj, bool is_archived) PRODUCT_RETURN; - static KlassSubGraphInfo* find_subgraph_info(Klass *k); static KlassSubGraphInfo* get_subgraph_info(Klass *k); static int num_of_subgraph_infos(); - static size_t build_archived_subgraph_info_records(int num_records); + static void build_archived_subgraph_info_records(int num_records); // Used by decode_from_archive static address _narrow_oop_base; @@ -203,6 +226,8 @@ class HeapShared: AllStatic { static void init_archivable_static_fields(Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN; static void archive_static_fields(Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN; + static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN; + static void serialize_subgraph_info_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; #if INCLUDE_CDS_JAVA_HEAP static ResourceBitMap calculate_oopmap(MemRegion region); diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp index f1b11f94724..930b57457af 100644 --- a/src/hotspot/share/memory/metaspaceShared.cpp +++ b/src/hotspot/share/memory/metaspaceShared.cpp @@ -420,10 +420,10 @@ void MetaspaceShared::serialize(SerializeClosure* soc) { vmSymbols::serialize(soc); soc->do_tag(--tag); - // Dump/restore the symbol and string tables - SymbolTable::serialize(soc); - StringTable::serialize(soc); - soc->do_tag(--tag); + // Dump/restore the symbol/string/subgraph_info tables + SymbolTable::serialize_shared_table_header(soc); + StringTable::serialize_shared_table_header(soc); + HeapShared::serialize_subgraph_info_table_header(soc); JavaClasses::serialize_offsets(soc); InstanceMirrorKlass::serialize_offsets(soc); @@ -1098,6 +1098,21 @@ public: return _alloc_stats; } + // Use this when you allocate space with MetaspaceShare::read_only_space_alloc() + // outside of ArchiveCompactor::allocate(). These are usually for misc tables + // that are allocated in the RO space. + class OtherROAllocMark { + char* _oldtop; + public: + OtherROAllocMark() { + _oldtop = _ro_region.top(); + } + ~OtherROAllocMark() { + char* newtop = _ro_region.top(); + ArchiveCompactor::alloc_stats()->record_other_type(int(newtop - _oldtop), true); + } + }; + static void allocate(MetaspaceClosure::Ref* ref, bool read_only) { address obj = ref->obj(); int bytes = ref->size() * BytesPerWord; @@ -1308,7 +1323,7 @@ void VM_PopulateDumpSharedSpace::dump_symbols() { } char* VM_PopulateDumpSharedSpace::dump_read_only_tables() { - char* oldtop = _ro_region.top(); + ArchiveCompactor::OtherROAllocMark mark; // Reorder the system dictionary. Moving the symbols affects // how the hash table indices are calculated. SystemDictionary::reorder_dictionary_for_sharing(); @@ -1329,11 +1344,6 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables() { char* table_top = _ro_region.allocate(table_bytes, sizeof(intptr_t)); SystemDictionary::copy_table(table_top, _ro_region.top()); - // Write the archived object sub-graph infos. For each klass with sub-graphs, - // the info includes the static fields (sub-graph entry points) and Klasses - // of objects included in the sub-graph. - HeapShared::write_archived_subgraph_infos(); - // Write the other data to the output array. WriteClosure wc(&_ro_region); MetaspaceShared::serialize(&wc); @@ -1341,8 +1351,6 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables() { // Write the bitmaps for patching the archive heap regions dump_archive_heap_oopmaps(); - char* newtop = _ro_region.top(); - ArchiveCompactor::alloc_stats()->record_other_type(int(newtop - oldtop), true); return buckets_top; } @@ -1822,6 +1830,11 @@ void VM_PopulateDumpSharedSpace::dump_java_heap_objects() { } G1HeapVerifier::verify_archive_regions(); + + { + ArchiveCompactor::OtherROAllocMark mark; + HeapShared::write_subgraph_info_table(); + } } void VM_PopulateDumpSharedSpace::dump_archive_heap_oopmaps() { @@ -1889,7 +1902,7 @@ void MetaspaceShared::dump_open_archive_heap_objects( unsigned MetaspaceShared::obj_hash(oop const& p) { assert(!p->mark()->has_bias_pattern(), - "this object should never have been locked"); // so identity_hash won't safepoin + "this object should never have been locked"); // so identity_hash won't safepoint unsigned hash = (unsigned)p->identity_hash(); return hash; } @@ -2145,9 +2158,6 @@ void MetaspaceShared::initialize_shared_spaces() { buffer += sizeof(intptr_t); buffer += len; - // The table of archived java heap object sub-graph infos - buffer = HeapShared::read_archived_subgraph_infos(buffer); - // Verify various attributes of the archive, plus initialize the // shared string/symbol tables intptr_t* array = (intptr_t*)buffer; From 51be7db96f3fc32a7ddb24f8af19fb4fc0577aaf Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Mon, 8 Oct 2018 20:01:39 -0400 Subject: [PATCH 038/124] 8211804: Constant AO_UNUSED_MBZ uses left shift of negative value Use unsigned shift. Reviewed-by: alanb --- src/jdk.pack/share/native/common-unpack/constants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jdk.pack/share/native/common-unpack/constants.h b/src/jdk.pack/share/native/common-unpack/constants.h index 8d8376dd23a..6fc34f75a08 100644 --- a/src/jdk.pack/share/native/common-unpack/constants.h +++ b/src/jdk.pack/share/native/common-unpack/constants.h @@ -203,7 +203,7 @@ enum { AO_HAVE_FIELD_FLAGS_HI = 1<<10, AO_HAVE_METHOD_FLAGS_HI = 1<<11, AO_HAVE_CODE_FLAGS_HI = 1<<12, - AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. + AO_UNUSED_MBZ = (int)((~0U)<<13), // options bits reserved for future use. #define ARCHIVE_BIT_DO(F) \ F(AO_HAVE_SPECIAL_FORMATS) \ From 61f453edf72fa506318d755345482e45ac901ce4 Mon Sep 17 00:00:00 2001 From: Jean Christophe Beyler Date: Mon, 8 Oct 2018 19:44:44 -0700 Subject: [PATCH 039/124] 8211782: Remove the NSK_CPP_STUB macros from vmTestbase for jvmti/[I-S]* Remove the NSK_CPP_STUB macros Reviewed-by: amenkov, sspitsyn --- .../iterinstcls005/iterinstcls005.cpp | 40 ++-- .../iterinstcls006/iterinstcls006.cpp | 19 +- .../iterinstcls007/iterinstcls007.cpp | 25 +-- .../iterobjreachobj001/iterobjreachobj001.cpp | 58 +++--- .../iterobjreachobj002/iterobjreachobj002.cpp | 35 ++-- .../iterobjreachobj003/iterobjreachobj003.cpp | 46 ++--- .../iterobjreachobj004/iterobjreachobj004.cpp | 25 +-- .../iterobjreachobj005/iterobjreachobj005.cpp | 31 +-- .../iterreachobj001/iterreachobj001.cpp | 55 +++--- .../iterreachobj002/iterreachobj002.cpp | 86 +++----- .../iterreachobj003/iterreachobj003.cpp | 94 +++------ .../iterreachobj004/iterreachobj004.cpp | 31 ++- .../iterreachobj005/iterreachobj005.cpp | 50 ++--- .../jvmti/IterateThroughHeap/abort/Abort.cpp | 9 +- .../callbacks/Callbacks.cpp | 91 ++++----- .../ConcreteKlassFilter.cpp | 40 ++-- .../filter-tagged/HeapFilter.cpp | 102 ++++------ .../NonConcreteKlassFilter.cpp | 16 +- .../mcontenter001/mcontenter001.cpp | 51 ++--- .../mcontentered001/mcontentered001.cpp | 61 +++--- .../monitorwait001/monitorwait001.cpp | 49 ++--- .../monitorwaited001/monitorwaited001.cpp | 49 ++--- .../nativemethbind001/nativemethbind001.cpp | 46 ++--- .../nativemethbind002/nativemethbind002.cpp | 46 ++--- .../nativemethbind003/nativemethbind003.cpp | 54 ++--- .../nativemethbind004/nativemethbind004.cpp | 40 ++-- .../ObjectFree/objfree001/objfree001.cpp | 46 ++--- .../ObjectFree/objfree002/objfree002.cpp | 55 ++---- .../PopFrame/popframe005/popframe005.cpp | 107 ++-------- .../redefclass028/redefclass028.cpp | 29 ++- .../redefclass029/redefclass029.cpp | 29 ++- .../redefclass030/redefclass030.cpp | 29 ++- .../relcaps001/relcaps001.cpp | 16 +- .../relcaps002/relcaps002.cpp | 16 +- .../jvmti/ResourceExhausted/resexhausted.cpp | 8 +- .../resumethrd001/resumethrd001.cpp | 14 +- .../resumethrd002/resumethrd002.cpp | 16 +- .../resumethrdlst001/resumethrdlst001.cpp | 41 ++-- .../resumethrdlst002/resumethrdlst002.cpp | 52 ++--- .../retransform002/retransform002.cpp | 49 +---- .../retransform003/retransform003.cpp | 133 ++----------- .../retransform004/retransform004.cpp | 58 +----- .../allocation/AP01/ap01t001/ap01t001.cpp | 78 +++----- .../allocation/AP02/ap02t001/ap02t001.cpp | 47 ++--- .../allocation/AP03/ap03t001/ap03t001.cpp | 56 ++---- .../allocation/AP04/ap04t001/ap04t001.cpp | 93 ++++----- .../allocation/AP04/ap04t002/ap04t002.cpp | 102 ++++------ .../allocation/AP04/ap04t003/ap04t003.cpp | 185 ++++++------------ .../allocation/AP05/ap05t001/ap05t001.cpp | 31 ++- .../allocation/AP05/ap05t002/ap05t002.cpp | 34 ++-- 50 files changed, 845 insertions(+), 1728 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp index 519ad2c0722..0907650299a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp @@ -49,55 +49,46 @@ heapObjectCallback(jlong class_tag, objCounter++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, st_jvmti, name, &monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->CreateRawMonitor(name, &monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Enter second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, st_jvmti, monitor_ptr, (jlong)100))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorWait(monitor_ptr, (jlong)100))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotify(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotifyAll, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotifyAll(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Exit second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(DestroyRawMonitor, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->DestroyRawMonitor(monitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -127,12 +118,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - &fakeUserData))) { + jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_EITHER, + heapObjectCallback, + &fakeUserData))) { nsk_jvmti_setFailStatus(); } } @@ -182,8 +171,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp index 04ed2e73b45..e74db0cfeca 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp @@ -45,13 +45,11 @@ heapObjectCallback(jlong class_tag, jlong* tag_ptr, void* storage_data) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SetEnvironmentLocalStorage, st_jvmti, storage_data ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->SetEnvironmentLocalStorage(storage_data))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, st_jvmti, &storage_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetEnvironmentLocalStorage(&storage_ptr))) { nsk_jvmti_setFailStatus(); } @@ -82,12 +80,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_EITHER\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - (void *)storage_data))) { + jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_EITHER, + heapObjectCallback, + (void *) storage_data))) { nsk_jvmti_setFailStatus(); } } @@ -144,8 +140,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp index b88bf1c6e1e..5e93a860167 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp @@ -46,8 +46,7 @@ heapObjectCallback(jlong class_tag, jlong* tag_ptr, void* user_data) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, st_jvmti, &timer_info1 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -65,14 +64,12 @@ heapObjectCallback(jlong class_tag, } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTime(&nanos))) { nsk_jvmti_setFailStatus(); } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, st_jvmti, &timer_info2 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTimerInfo(&timer_info2))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -91,8 +88,7 @@ heapObjectCallback(jlong class_tag, /* ---------------------------------------------------------------------- */ nanos = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTime(&nanos))) { nsk_jvmti_setFailStatus(); } @@ -123,12 +119,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - (void *)user_data))) { + jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_EITHER, + heapObjectCallback, + (void *) user_data))) { nsk_jvmti_setFailStatus(); } } @@ -174,8 +168,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_get_current_thread_cpu_time = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp index 38fea2a9d7e..487ca0fd703 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp @@ -85,15 +85,13 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, count--; tag++; - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY2(" tag=%-5ld object=0x%p\n", (long)objTag, (void*)obj); @@ -104,7 +102,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return NSK_TRUE; } @@ -127,9 +125,8 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 1 + 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), + (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -144,16 +141,14 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, } NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... found class: 0x%p\n", (void*)debugeeClass); NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (rootObjectClass = jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -161,34 +156,31 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... found class: 0x%p\n", (void*)chainObjectClass); NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); - if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (objectField = jni->GetStaticFieldID( + debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)objectField); NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); - if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (reachableChainField = jni->GetFieldID( + rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)reachableChainField); NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); - if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (unreachableChainField = jni->GetFieldID( + rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -196,8 +188,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -205,15 +196,13 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (*rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got object: 0x%p\n", (void*)*rootObject); - if (!NSK_JNI_VERIFY(jni, (*rootObject = - NSK_CPP_STUB2(NewGlobalRef, jni, *rootObject)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (*rootObject = jni->NewGlobalRef(*rootObject)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -222,8 +211,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY0("Obtain and tag chain objects:\n"); NSK_DISPLAY0(" root tested object:\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, *rootObject, rootObjectTag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(*rootObject, rootObjectTag))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY2(" tag=%-5ld object=0x%p\n", (long)rootObjectTag, (void*)*rootObject); @@ -304,13 +292,12 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, ObjectDesc* objectDescList, jobject rootObject) { if (rootObject != NULL) { NSK_DISPLAY1("Release object reference to root tested object: 0x%p\n", rootObject); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, rootObject)); + NSK_TRACE(jni->DeleteGlobalRef(rootObject)); } if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -445,7 +432,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Start iteration for root tested object\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, + jvmti->IterateOverObjectsReachableFromObject( rootObject, objectReferenceCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); return; @@ -529,8 +516,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp index 7f342d92f9a..9ea087e0e9b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp @@ -66,9 +66,8 @@ objectReferenceCallback1( jvmtiObjectReferenceKind reference_kind, /* Set tag */ *tag_ptr = objectCount; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, st_jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->Allocate((sizeof(ObjectDesc)), + (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); allocationError = 1; } @@ -91,8 +90,7 @@ objectReferenceCallback2( jvmtiObjectReferenceKind reference_kind, objectCount--; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, st_jvmti, (unsigned char*)objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->Deallocate((unsigned char*)objectDescBuf))) { nsk_jvmti_setFailStatus(); } @@ -123,29 +121,23 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY1("Find static field in debugee class: %s\n", objectFieldName); - if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - objectFieldName, debugeeClassSignature)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (objectField = jni->GetStaticFieldID( + debugeeClass, objectFieldName, debugeeClassSignature)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY1("Find value of static field in debugee class: %s\n", objectFieldName); if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject with allocation\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - object, - objectReferenceCallback1, - &userData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject( + object, objectReferenceCallback1, &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -161,12 +153,8 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject with deallocation\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - object, - objectReferenceCallback2, - &userData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject( + object, objectReferenceCallback2, &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -221,8 +209,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp index 08db92979b1..dd9c5a94bb1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp @@ -53,55 +53,46 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, objCounter++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, st_jvmti, name, &monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->CreateRawMonitor(name, &monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Enter second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, st_jvmti, monitor_ptr, (jlong)100))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorWait(monitor_ptr, (jlong)100))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotify(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotifyAll, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotifyAll(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Exit second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(DestroyRawMonitor, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->DestroyRawMonitor(monitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -131,29 +122,23 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY1("Find static field in debugee class: %s\n", objectFieldName); - if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - objectFieldName, debugeeClassSignature)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (objectField = jni->GetStaticFieldID( + debugeeClass, objectFieldName, debugeeClassSignature)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY1("Find value of static field in debugee class: %s\n", objectFieldName); if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject with filter JVMTI_HEAP_OBJECT_EITHER\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - object, - objectReferenceCallback, - &fakeUserData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject( + object, objectReferenceCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); } } @@ -203,8 +188,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp index 21dbad3b8d6..344a1e14d05 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp @@ -52,13 +52,11 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, objCounter++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SetEnvironmentLocalStorage, st_jvmti, storage_data ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->SetEnvironmentLocalStorage(storage_data))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, st_jvmti, &storage_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetEnvironmentLocalStorage(&storage_ptr))) { nsk_jvmti_setFailStatus(); } @@ -89,29 +87,23 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY1("Find static field in debugee class: %s\n", objectFieldName); - if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - objectFieldName, debugeeClassSignature)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (objectField = jni->GetStaticFieldID( + debugeeClass, objectFieldName, debugeeClassSignature)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY1("Find value of static field in debugee class: %s\n", objectFieldName); if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject with filter JVMTI_HEAP_OBJECT_EITHER\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - object, - objectReferenceCallback, - &fakeUserData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject( + object, objectReferenceCallback, &fakeUserData))) { nsk_jvmti_setFailStatus(); } } @@ -173,8 +165,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp index cfdbbf20a8b..d49edd1b3e2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp @@ -52,8 +52,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, objCounter++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, st_jvmti, &timer_info1 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -71,14 +70,12 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTime(&nanos))) { nsk_jvmti_setFailStatus(); } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, st_jvmti, &timer_info2 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTimerInfo(&timer_info2))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -97,8 +94,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, /* ---------------------------------------------------------------------- */ nanos = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTime(&nanos))) { nsk_jvmti_setFailStatus(); } @@ -131,29 +127,23 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY1("Find static field in debugee class: %s\n", objectFieldName); - if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - objectFieldName, debugeeClassSignature)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (objectField = jni->GetStaticFieldID( + debugeeClass, objectFieldName, debugeeClassSignature)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY1("Find value of static field in debugee class: %s\n", objectFieldName); if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject with filter JVMTI_HEAP_OBJECT_EITHER\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - object, - objectReferenceCallback, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject( + object, objectReferenceCallback, &user_data))) { nsk_jvmti_setFailStatus(); } } @@ -205,8 +195,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_get_current_thread_cpu_time = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp index 118e49ffe41..9052297cacf 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp @@ -87,15 +87,13 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, count--; tag++; - if (!NSK_JNI_VERIFY(jni, (obj = - NSK_CPP_STUB3(GetObjectField, jni, firstObject, firstField)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (obj = jni->GetObjectField(firstObject, firstField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } objectDescList[count].tag = objTag; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, obj, objTag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, objTag))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -107,7 +105,7 @@ static int getChainObjects(jvmtiEnv* jvmti, JNIEnv* jni, jobject firstObject, return NSK_FALSE; } - NSK_TRACE(NSK_CPP_STUB2(DeleteLocalRef, jni, obj)); + NSK_TRACE(jni->DeleteLocalRef(obj)); return success; } @@ -131,9 +129,8 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, *objectsCount = 2 * chainLength; NSK_DISPLAY1("Allocate memory for objects list: %d objects\n", *objectsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (*objectsCount * sizeof(ObjectDesc)), - (unsigned char**)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((*objectsCount * sizeof(ObjectDesc)), + (unsigned char**)objectDescList))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -148,16 +145,14 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, } NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (debugeeClass = - NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... found class: 0x%p\n", (void*)debugeeClass); NSK_DISPLAY1("Find root object class: %s\n", ROOT_OBJECT_CLASS_NAME); - if (!NSK_JNI_VERIFY(jni, (rootObjectClass = - NSK_CPP_STUB2(FindClass, jni, ROOT_OBJECT_CLASS_NAME)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (rootObjectClass = jni->FindClass(ROOT_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -165,34 +160,31 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find chain object class: %s\n", CHAIN_OBJECT_CLASS_NAME); if (!NSK_JNI_VERIFY(jni, (chainObjectClass = - NSK_CPP_STUB2(FindClass, jni, CHAIN_OBJECT_CLASS_NAME)) != NULL)) { + jni->FindClass(CHAIN_OBJECT_CLASS_NAME)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... found class: 0x%p\n", (void*)chainObjectClass); NSK_DISPLAY1("Find static field in debugee class: %s\n", OBJECT_FIELD_NAME); - if (!NSK_JNI_VERIFY(jni, (objectField = - NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass, - OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (objectField = jni->GetStaticFieldID( + debugeeClass, OBJECT_FIELD_NAME, ROOT_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)objectField); NSK_DISPLAY1("Find instance field in root object class: %s\n", REACHABLE_CHAIN_FIELD_NAME); - if (!NSK_JNI_VERIFY(jni, (reachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (reachableChainField = jni->GetFieldID( + rootObjectClass, REACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } NSK_DISPLAY1(" ... got fieldID: 0x%p\n", (void*)reachableChainField); NSK_DISPLAY1("Find instance field in root object class: %s\n", UNREACHABLE_CHAIN_FIELD_NAME); - if (!NSK_JNI_VERIFY(jni, (unreachableChainField = - NSK_CPP_STUB4(GetFieldID, jni, rootObjectClass, - UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (unreachableChainField = jni->GetFieldID( + rootObjectClass, UNREACHABLE_CHAIN_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -200,8 +192,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Find instance field in chain object class: %s\n", TAIL_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (tailField = - NSK_CPP_STUB4(GetFieldID, jni, chainObjectClass, - TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { + jni->GetFieldID(chainObjectClass, TAIL_FIELD_NAME, CHAIN_OBJECT_CLASS_SIG)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -209,8 +200,7 @@ static int getTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, NSK_DISPLAY1("Get root object from static field: %s\n", OBJECT_FIELD_NAME); if (!NSK_JNI_VERIFY(jni, (rootObject = - NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, - objectField)) != NULL)) { + jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -288,8 +278,7 @@ static int releaseTestedObjects(jvmtiEnv* jvmti, JNIEnv* jni, int chainLength, ObjectDesc* objectDescList) { if (objectDescList != NULL) { NSK_DISPLAY1("Deallocate objects list: 0x%p\n", (void*)objectDescList); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescList))) { nsk_jvmti_setFailStatus(); } } @@ -638,9 +627,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0(">>> Start iteration over reachable objects\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, stackReferenceCallback, - objectReferenceCallback, &fakeUserData))) { + jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + &fakeUserData))) { nsk_jvmti_setFailStatus(); return; } @@ -722,8 +712,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp index bd1cd4e84b5..d904150488d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp @@ -75,9 +75,7 @@ heapRootCallbackForFirstObjectsIteration( jvmtiHeapRootKind root_kind, /* Set tag */ *tag_ptr = (jlong)++objectCount; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((sizeof(ObjectDesc)), (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("heapRootCallbackForFirstObjectsIteration: Allocation failed. Iteration aborted.\n"); @@ -121,8 +119,7 @@ heapRootCallbackForSecondObjectsIteration( jvmtiHeapRootKind root_kind, (long)*tag_ptr, (long)tag, objectCount); */ /* Deallocate memory of list element*/ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr[ind]))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescArr[ind]))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("heapRootCallbackForSecondObjectsIteration: Deallocation failed. Iteration aborted.\n"); @@ -156,9 +153,7 @@ stackReferenceCallbackForFirstObjectsIteration( jvmtiHeapRootKind root_kind, /* Set tag */ *tag_ptr = (jlong)++objectCount; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((sizeof(ObjectDesc)), (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("stackReferenceCallbackForFirstObjectsIteration: Allocation failed. Iteration aborted.\n"); @@ -206,8 +201,7 @@ stackReferenceCallbackForSecondObjectsIteration( jvmtiHeapRootKind root_kind, (long)*tag_ptr, (long)tag, objectCount); */ /* Deallocate memory of list element*/ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr[ind]))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescArr[ind]))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("stackReferenceCallbackForSecondObjectsIteration: Deallocation failed. Iteration aborted.\n"); @@ -239,9 +233,7 @@ objectReferenceCallbackForFirstObjectsIteration( jvmtiObjectReferenceKind refere /* Set tag */ *tag_ptr = (jlong)++objectCount; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((sizeof(ObjectDesc)), (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("objectReferenceCallbackForFirstObjectsIteration: Allocation failed. Iteration aborted.\n"); @@ -287,8 +279,7 @@ objectReferenceCallbackForSecondObjectsIteration( jvmtiObjectReferenceKind refer (long)*tag_ptr, (long)tag, objectCount); */ /* Deallocate memory of list element*/ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr[ind]))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescArr[ind]))) { nsk_jvmti_setFailStatus(); callbackAborted = 1; NSK_COMPLAIN0("objectReferenceCallbackForSecondObjectsIteration: Deallocation failed. Iteration aborted.\n"); @@ -320,9 +311,8 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { { do { /* Allocate memory for first element of objectList */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (sizeof(ObjectDesc)), - (unsigned char**)&objectDescBuf))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((sizeof(ObjectDesc)), + (unsigned char**)&objectDescBuf))) { nsk_jvmti_setFailStatus(); break; } @@ -331,13 +321,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverReachableObjects with allocating object descriptors\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, - jvmti, - heapRootCallbackForFirstObjectsIteration, - stackReferenceCallbackForFirstObjectsIteration, - objectReferenceCallbackForFirstObjectsIteration, - &userData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects( + heapRootCallbackForFirstObjectsIteration, + stackReferenceCallbackForFirstObjectsIteration, + objectReferenceCallbackForFirstObjectsIteration, + &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -357,25 +345,22 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { objectCountMax = objectCount; /* Deallocate last unnecessary descriptor */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescList))) { NSK_COMPLAIN0("Unable to deallocate last unnecessary descriptor. \n"); nsk_jvmti_setFailStatus(); break; } /* Allocate memory for array to save pointers to ObjectDescList elements */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (objectCount * sizeof(ObjectDesc*)), - (unsigned char**)&objectDescArr))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((objectCount * sizeof(ObjectDesc*)), + (unsigned char**)&objectDescArr))) { nsk_jvmti_setFailStatus(); break; } /* Allocate memory for flags array and fill with false values */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (objectCountMax * sizeof(short)), - (unsigned char**)&deallocatedFlagsArr))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((objectCountMax * sizeof(short)), + (unsigned char**)&deallocatedFlagsArr))) { nsk_jvmti_setFailStatus(); break; } @@ -395,13 +380,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverReachableObjects with deallocating object descriptors\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, - jvmti, - heapRootCallbackForSecondObjectsIteration, - stackReferenceCallbackForSecondObjectsIteration, - objectReferenceCallbackForSecondObjectsIteration, - &userData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects( + heapRootCallbackForSecondObjectsIteration, + stackReferenceCallbackForSecondObjectsIteration, + objectReferenceCallbackForSecondObjectsIteration, + &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -415,8 +398,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { for (ind = 0; ind < objectCountMax; ind++) { if (!deallocatedFlagsArr[ind]) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr[ind]))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescArr[ind]))) { NSK_COMPLAIN1("Unable to deallocate descriptor. Index = %d \n", ind); nsk_jvmti_setFailStatus(); return; @@ -424,13 +406,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objectDescArr))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)objectDescArr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)deallocatedFlagsArr))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)deallocatedFlagsArr))) { nsk_jvmti_setFailStatus(); } @@ -472,13 +452,11 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) @@ -491,15 +469,15 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.ObjectFree = &ObjectFree; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done.\n"); NSK_DISPLAY0("enabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_OBJECT_FREE, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done.\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp index bd1f66b56a7..2c67e8a7044 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp @@ -54,55 +54,46 @@ heapRootCallback( jvmtiHeapRootKind root_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, st_jvmti, "heapRootMonitor", &monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->CreateRawMonitor("heapRootMonitor", &monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Enter second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, st_jvmti, monitor_ptr, (jlong)1))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorWait(monitor_ptr, (jlong)1))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotify(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotifyAll, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotifyAll(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Exit second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(DestroyRawMonitor, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->DestroyRawMonitor(monitor_ptr))) { nsk_jvmti_setFailStatus(); } /* @@ -127,55 +118,46 @@ stackReferenceCallback( jvmtiHeapRootKind root_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, st_jvmti, "stackRefMonitor", &monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->CreateRawMonitor("stackRefMonitor", &monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Enter second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, st_jvmti, monitor_ptr, (jlong)1))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorWait(monitor_ptr, (jlong)1))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotify(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotifyAll, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotifyAll(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Exit second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(DestroyRawMonitor, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->DestroyRawMonitor(monitor_ptr))) { nsk_jvmti_setFailStatus(); } /* @@ -199,55 +181,46 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, st_jvmti, "objRefMonitor", &monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->CreateRawMonitor("objRefMonitor", &monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Enter second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorEnter(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, st_jvmti, monitor_ptr, (jlong)1))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorWait(monitor_ptr, (jlong)1))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotify(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotifyAll, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorNotifyAll(monitor_ptr))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } /* Exit second time */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->RawMonitorExit(monitor_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(DestroyRawMonitor, st_jvmti, monitor_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->DestroyRawMonitor(monitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -270,12 +243,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverReachableObjects\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, - jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - &userData))) { + jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -333,8 +304,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp index a5ed6ab9a25..99a20befcc2 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp @@ -54,14 +54,12 @@ heapRootCallback( jvmtiHeapRootKind root_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SetEnvironmentLocalStorage, st_jvmti, storage_data ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->SetEnvironmentLocalStorage(storage_data))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, st_jvmti, &storage_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetEnvironmentLocalStorage(&storage_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } @@ -100,14 +98,12 @@ stackReferenceCallback( jvmtiHeapRootKind root_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SetEnvironmentLocalStorage, st_jvmti, storage_data ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->SetEnvironmentLocalStorage(storage_data))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, st_jvmti, &storage_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetEnvironmentLocalStorage(&storage_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } @@ -145,14 +141,12 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SetEnvironmentLocalStorage, st_jvmti, storage_data ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->SetEnvironmentLocalStorage(storage_data))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetEnvironmentLocalStorage, st_jvmti, &storage_ptr))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetEnvironmentLocalStorage(&storage_ptr))) { nsk_jvmti_setFailStatus(); return JVMTI_ITERATION_ABORT; } @@ -190,12 +184,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverReachableObjects\n"); { if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, - jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - &userData))) { + jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -253,8 +245,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp index 83faf4d0c37..ec10be7e443 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp @@ -53,8 +53,7 @@ heapRootCallback( jvmtiHeapRootKind root_kind, if (!nsk_jvmti_isFailStatus()) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, st_jvmti, &timer_info1 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -72,14 +71,12 @@ heapRootCallback( jvmtiHeapRootKind root_kind, } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTime(&nanos))) { nsk_jvmti_setFailStatus(); } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, st_jvmti, &timer_info2 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTimerInfo(&timer_info2))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -98,8 +95,7 @@ heapRootCallback( jvmtiHeapRootKind root_kind, /* ---------------------------------------------------------------------- */ nanos = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTime(&nanos))) { nsk_jvmti_setFailStatus(); } } @@ -126,8 +122,7 @@ stackReferenceCallback( jvmtiHeapRootKind root_kind, if (!nsk_jvmti_isFailStatus()) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, st_jvmti, &timer_info1 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -145,14 +140,12 @@ stackReferenceCallback( jvmtiHeapRootKind root_kind, } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTime(&nanos))) { nsk_jvmti_setFailStatus(); } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, st_jvmti, &timer_info2 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTimerInfo(&timer_info2))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -171,8 +164,7 @@ stackReferenceCallback( jvmtiHeapRootKind root_kind, /* ---------------------------------------------------------------------- */ nanos = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTime(&nanos))) { nsk_jvmti_setFailStatus(); } } @@ -196,8 +188,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, *tag_ptr = (jlong)++objCounter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, st_jvmti, &timer_info1 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTimerInfo(&timer_info1))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -215,15 +206,13 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCurrentThreadCpuTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetCurrentThreadCpuTime(&nanos))) { nsk_jvmti_setFailStatus(); } /* ---------------------------------------------------------------------- */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTimerInfo, st_jvmti, &timer_info2 ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTimerInfo(&timer_info2))) { nsk_jvmti_setFailStatus(); } /* Check the returned jvmtiTimerInfo structure */ @@ -242,8 +231,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, /* ---------------------------------------------------------------------- */ nanos = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetTime, st_jvmti, &nanos ))) { + if (!NSK_JVMTI_VERIFY(st_jvmti->GetTime(&nanos))) { nsk_jvmti_setFailStatus(); } @@ -265,13 +253,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { do { NSK_DISPLAY0("Calling IterateOverReachableObjects\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, - jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - &userData))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + &userData))) { nsk_jvmti_setFailStatus(); break; } @@ -330,8 +315,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(caps)); caps.can_tag_objects = 1; caps.can_get_current_thread_cpu_time = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp index 6654faa6c1e..bef827c7565 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp @@ -95,8 +95,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { primitive_callbacks.heap_iteration_callback = &heap_callback; NSK_DISPLAY0("Iterating over reachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, NULL, &primitive_callbacks, &invocations))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, NULL, &primitive_callbacks, &invocations))) { nsk_jvmti_setFailStatus(); return; } @@ -139,14 +138,12 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if(!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } memset(&event_callbacks, 0, sizeof(jvmtiEventCallbacks)); - if(!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &event_callbacks, sizeof(jvmtiEventCallbacks)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&event_callbacks, sizeof(jvmtiEventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp index 0b29cbd4dd8..d814bc8108e 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp @@ -368,21 +368,14 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { jobjectArray testObjects; int object; - if(!NSK_VERIFY(NULL != - (debugee = NSK_CPP_STUB2(FindClass, jni, className)))) + if(!NSK_VERIFY(NULL != (debugee = jni->FindClass(className)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObjectsField = NSK_CPP_STUB4(GetStaticFieldID, - jni, debugee, - fieldName, - fieldSig)))) + if(!NSK_VERIFY(NULL != (testObjectsField = jni->GetStaticFieldID(debugee, fieldName, fieldSig)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObjects = (jobjectArray)(NSK_CPP_STUB3(GetStaticObjectField, - jni, debugee, - testObjectsField))))) + if(!NSK_VERIFY(NULL != (testObjects = (jobjectArray)(jni->GetStaticObjectField( + debugee, testObjectsField))))) return JNI_ERR; // For each of test objects tag every field @@ -393,33 +386,28 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { jint field; memset(&objects_info[object],0,sizeof(object_info_t)); - if(!NSK_VERIFY(NULL != - (target = NSK_CPP_STUB3(GetObjectArrayElement,jni, - testObjects,object)))) + if(!NSK_VERIFY(NULL != (target = jni->GetObjectArrayElement(testObjects, object)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (targetClass = NSK_CPP_STUB2(GetObjectClass, jni, target)))) + if(!NSK_VERIFY(NULL != (targetClass = jni->GetObjectClass(target)))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti, targetClass, - &(objects_info[object].name), NULL))) + if(!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(targetClass, &(objects_info[object].name), NULL))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassFields, jvmti, targetClass, - &(objects_info[object].fields_count), - &targetFields))) + if(!NSK_JVMTI_VERIFY(jvmti->GetClassFields( + targetClass, &(objects_info[object].fields_count), &targetFields))) return JNI_ERR; objects_info[object].fields = (field_info_t*)calloc(objects_info[object].fields_count,sizeof(field_info_t)); // Iterate over fields, collect info about it and tag non primitive fields. for(field = 0; field < objects_info[object].fields_count; field++) { - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB6(GetFieldName, jvmti, - targetClass, targetFields[field], - &objects_info[object].fields[field].name, - &objects_info[object].fields[field].signature, - NULL))) + if(!NSK_JVMTI_VERIFY(jvmti->GetFieldName(targetClass, + targetFields[field], + &objects_info[object].fields[field].name, + &objects_info[object].fields[field].signature, + NULL))) return JNI_ERR; if(is_primitive_type(objects_info[object].fields[field].signature)) { objects_info[object].fields[field].primitive = 1; @@ -427,49 +415,42 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { jint modifiers; jobject value; int tag_type = get_tag_type(objects_info[object].fields[field].signature); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetFieldModifiers, jvmti, - targetClass, targetFields[field], - &modifiers))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetFieldModifiers( + targetClass, targetFields[field], &modifiers))) { return JNI_ERR; } if(modifiers & STATIC_FIELD) { - if(!NSK_VERIFY(NULL != (value = NSK_CPP_STUB3(GetStaticObjectField, jni, - targetClass, - targetFields[field])))) { + if(!NSK_VERIFY(NULL != (value = jni->GetStaticObjectField(targetClass, + targetFields[field])))) { return JNI_ERR; } } else { - if(!NSK_VERIFY(NULL != (value = NSK_CPP_STUB3(GetObjectField, jni, - target, - targetFields[field])))) { + if(!NSK_VERIFY(NULL != (value = jni->GetObjectField(target, targetFields[field])))) { return JNI_ERR; } } //tag field's value - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, value, - ENCODE_TAG(tag_type,object,field)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(value, ENCODE_TAG(tag_type,object,field)))) { return JNI_ERR; } //remove local reference so object will have a chance to become unreachable - NSK_CPP_STUB2(DeleteLocalRef, jni, (jobject)value); + jni->DeleteLocalRef((jobject)value); } } // tag class and it's instance to pass this tag into primitive field callback - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, - ENCODE_TAG(TAG_TYPE_PRIMITIVE,object,0)))) + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(target, ENCODE_TAG(TAG_TYPE_PRIMITIVE,object,0)))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, targetClass, - ENCODE_TAG(TAG_TYPE_PRIMITIVE,object,0)))) + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(targetClass, ENCODE_TAG(TAG_TYPE_PRIMITIVE,object,0)))) return JNI_ERR; - NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)targetFields)); + NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)targetFields)); - NSK_CPP_STUB2(DeleteLocalRef, jni, (jobject)target); - NSK_CPP_STUB2(DeleteLocalRef, jni, (jobject)targetClass); + jni->DeleteLocalRef((jobject)target); + jni->DeleteLocalRef((jobject)targetClass); } - NSK_CPP_STUB2(DeleteLocalRef, jni, (jobject)testObjects); + jni->DeleteLocalRef((jobject)testObjects); return JNI_OK; } @@ -480,10 +461,10 @@ void release_object_info(jvmtiEnv *jvmti, JNIEnv *jni) { int field; for(object = 0; object < TEST_OBJECTS_COUNT; object++) { for(field = 0; field < objects_info[object].fields_count; field++) { - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objects_info[object].fields[field].name); - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objects_info[object].fields[field].signature); + jvmti->Deallocate((unsigned char*)objects_info[object].fields[field].name); + jvmti->Deallocate((unsigned char*)objects_info[object].fields[field].signature); } - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objects_info[object].name); + jvmti->Deallocate((unsigned char*)objects_info[object].name); free(objects_info[object].fields); } } @@ -553,8 +534,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { primitive_callbacks.heap_iteration_callback = &heap_callback; NSK_DISPLAY0("Iterating over reachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, NULL, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, NULL, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -571,8 +551,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Iterating over unreachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, NULL, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, NULL, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -618,15 +597,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if(!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } memset(&event_callbacks, 0, sizeof(jvmtiEventCallbacks)); event_callbacks.ObjectFree = &object_free_callback; - if(!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &event_callbacks, sizeof(jvmtiEventCallbacks)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&event_callbacks, sizeof(jvmtiEventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp index c042306004f..ebff549c2de 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp @@ -152,36 +152,26 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { jobject testObject; jclass testObjectClass; - if(!NSK_VERIFY(NULL != - (debugee = NSK_CPP_STUB2(FindClass, jni, className)))) + if(!NSK_VERIFY(NULL != (debugee = jni->FindClass(className)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObjectField = NSK_CPP_STUB4(GetStaticFieldID, - jni, debugee, - fieldName, - fieldSig)))) + if(!NSK_VERIFY(NULL != (testObjectField = jni->GetStaticFieldID(debugee, fieldName, fieldSig)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObject = (NSK_CPP_STUB3(GetStaticObjectField, - jni, debugee, - testObjectField))))) + if(!NSK_VERIFY(NULL != (testObject = (jni->GetStaticObjectField(debugee, testObjectField))))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObjectClass = (NSK_CPP_STUB2(GetObjectClass, - jni, testObject))))) + if(!NSK_VERIFY(NULL != (testObjectClass = (jni->GetObjectClass(testObject))))) return JNI_ERR; // tag class and it's instance to pass this tag into primitive field callback - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, testObject, TEST_OBJECT_TAG))) + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(testObject, TEST_OBJECT_TAG))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, testObjectClass, TEST_OBJECT_TAG))) + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(testObjectClass, TEST_OBJECT_TAG))) return JNI_ERR; - NSK_CPP_STUB2(DeleteLocalRef, jni, testObjectClass); - NSK_CPP_STUB2(DeleteLocalRef, jni, testObject); + jni->DeleteLocalRef(testObjectClass); + jni->DeleteLocalRef(testObject); return JNI_OK; } @@ -207,7 +197,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jvmtiHeapCallbacks primitive_callbacks; jclass klass; - if(!NSK_VERIFY(NULL != (klass = NSK_CPP_STUB2(FindClass,jni,testClassName)))) { + if(!NSK_VERIFY(NULL != (klass = jni->FindClass(testClassName)))) { NSK_COMPLAIN1("Can't find class %s.\n",testClassName); nsk_jvmti_setFailStatus(); return; @@ -233,8 +223,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { primitive_callbacks.heap_iteration_callback = &heap_callback; NSK_DISPLAY0("Iterating over reachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, klass, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, klass, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -251,8 +240,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Iterating over unreachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, klass, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, klass, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -292,15 +280,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if(!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } memset(&event_callbacks, 0, sizeof(jvmtiEventCallbacks)); event_callbacks.ObjectFree = &object_free_callback; - if(!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &event_callbacks, sizeof(jvmtiEventCallbacks)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&event_callbacks, sizeof(jvmtiEventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp index 70fbddb82e9..06ae9b8ebb6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp @@ -299,21 +299,14 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { jobjectArray testObjects; int object; - if(!NSK_VERIFY(NULL != - (debugee = NSK_CPP_STUB2(FindClass, jni, className)))) + if(!NSK_VERIFY(NULL != (debugee = jni->FindClass(className)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObjectsField = NSK_CPP_STUB4(GetStaticFieldID, - jni, debugee, - fieldName, - fieldSig)))) + if(!NSK_VERIFY(NULL != (testObjectsField = jni->GetStaticFieldID(debugee, fieldName, fieldSig)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (testObjects = (jobjectArray)(NSK_CPP_STUB3(GetStaticObjectField, - jni, debugee, - testObjectsField))))) + if(!NSK_VERIFY(NULL != (testObjects = (jobjectArray)(jni->GetStaticObjectField( + debugee, testObjectsField))))) return JNI_ERR; // For each of test objects tag every field @@ -325,22 +318,17 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { int tagged = object == 0; memset(&objects_info[object],0,sizeof(object_info_t)); - if(!NSK_VERIFY(NULL != - (target = NSK_CPP_STUB3(GetObjectArrayElement,jni, - testObjects,object)))) + if(!NSK_VERIFY(NULL != (target = jni->GetObjectArrayElement(testObjects, object)))) return JNI_ERR; - if(!NSK_VERIFY(NULL != - (targetClass = NSK_CPP_STUB2(GetObjectClass, jni, target)))) + if(!NSK_VERIFY(NULL != (targetClass = jni->GetObjectClass(target)))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti, targetClass, - &(objects_info[object].name), NULL))) + if(!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(targetClass, &(objects_info[object].name), NULL))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassFields, jvmti, targetClass, - &(objects_info[object].fields_count), - &targetFields))) + if(!NSK_JVMTI_VERIFY(jvmti->GetClassFields( + targetClass, &(objects_info[object].fields_count), &targetFields))) return JNI_ERR; objects_info[object].fields = (field_info_t*)calloc(objects_info[object].fields_count,sizeof(field_info_t)); @@ -350,15 +338,14 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { jint modifiers; int is_static = 0; int is_primitive = 0; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB6(GetFieldName, jvmti, - targetClass, targetFields[field], - &objects_info[object].fields[field].name, - &objects_info[object].fields[field].signature, - NULL))) + if(!NSK_JVMTI_VERIFY(jvmti->GetFieldName(targetClass, + targetFields[field], + &objects_info[object].fields[field].name, + &objects_info[object].fields[field].signature, + NULL))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetFieldModifiers, jvmti, - targetClass, targetFields[field], - &modifiers))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetFieldModifiers( + targetClass, targetFields[field], &modifiers))) { return JNI_ERR; } is_static = (modifiers & STATIC_FIELD) == STATIC_FIELD; @@ -367,31 +354,26 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { is_primitive = 1; } else { jobject value; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetFieldModifiers, jvmti, - targetClass, targetFields[field], - &modifiers))) { + if(!NSK_JVMTI_VERIFY(jvmti->GetFieldModifiers( + targetClass, targetFields[field], &modifiers))) { return JNI_ERR; } if(is_static) { - if(!NSK_VERIFY(NULL != (value = NSK_CPP_STUB3(GetStaticObjectField, jni, - targetClass, - targetFields[field])))) { + if(!NSK_VERIFY(NULL != (value = jni->GetStaticObjectField( + targetClass, targetFields[field])))) { return JNI_ERR; } } else { - if(!NSK_VERIFY(NULL != (value = NSK_CPP_STUB3(GetObjectField, jni, - target, - targetFields[field])))) { + if(!NSK_VERIFY(NULL != (value = jni->GetObjectField(target, targetFields[field])))) { return JNI_ERR; } } if(tagged) { - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, value, - ENCODE_TAG(FIELD_TAG,object,field)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(value, ENCODE_TAG(FIELD_TAG,object,field)))) { return JNI_ERR; } } - NSK_CPP_STUB2(DeleteLocalRef, jni, value); + jni->DeleteLocalRef(value); } objects_info[object].fields[field].expected = @@ -403,20 +385,18 @@ int tag_objects(jvmtiEnv *jvmti, JNIEnv *jni) { // tag class and it's instance to pass this tag into primitive field callback if(tagged) { - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, - ENCODE_TAG(OBJECT_TAG,object,0)))) + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(target, ENCODE_TAG(OBJECT_TAG,object,0)))) return JNI_ERR; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, targetClass, - ENCODE_TAG(CLASS_TAG,object,0)))) + if(!NSK_JVMTI_VERIFY(jvmti->SetTag(targetClass, ENCODE_TAG(CLASS_TAG,object,0)))) return JNI_ERR; } - NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)targetFields)); - NSK_CPP_STUB2(DeleteLocalRef, jni, target); - NSK_CPP_STUB2(DeleteLocalRef, jni, targetClass); + NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)targetFields)); + jni->DeleteLocalRef(target); + jni->DeleteLocalRef(targetClass); } - NSK_CPP_STUB2(DeleteLocalRef, jni, testObjects); + jni->DeleteLocalRef(testObjects); return JNI_OK; } @@ -428,12 +408,10 @@ void release_object_info(jvmtiEnv *jvmti, JNIEnv *jni) { int field; for(object = 0; object < TEST_OBJECTS_COUNT; object++) { for(field = 0; field < objects_info[object].fields_count; field++) { - NSK_CPP_STUB2(Deallocate, jvmti, - (unsigned char*)objects_info[object].fields[field].name); - NSK_CPP_STUB2(Deallocate, jvmti, - (unsigned char*)objects_info[object].fields[field].signature); + jvmti->Deallocate((unsigned char*)objects_info[object].fields[field].name); + jvmti->Deallocate((unsigned char*)objects_info[object].fields[field].signature); } - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)objects_info[object].name); + jvmti->Deallocate((unsigned char*)objects_info[object].name); free(objects_info[object].fields); } } @@ -494,8 +472,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { primitive_callbacks.heap_iteration_callback = &heap_callback; NSK_DISPLAY0("Iterating over reachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - filter_type, NULL, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(filter_type, NULL, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -512,8 +489,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Iterating over unreachable objects.\n"); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - filter_type, NULL, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(filter_type, NULL, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -526,9 +502,7 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { * since it will free some memory that the callback will access. */ memset(&event_callbacks, 0, sizeof(jvmtiEventCallbacks)); - if(!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &event_callbacks, sizeof(jvmtiEventCallbacks)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&event_callbacks, sizeof(jvmtiEventCallbacks)))) { return; } @@ -586,15 +560,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if(!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } memset(&event_callbacks, 0, sizeof(jvmtiEventCallbacks)); event_callbacks.ObjectFree = &object_free_callback; - if(!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &event_callbacks, sizeof(jvmtiEventCallbacks)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&event_callbacks, sizeof(jvmtiEventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp index d2c9d48127e..bc038f96289 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp @@ -156,14 +156,13 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { phase = ZERO_INVOCATIONS_PHASE; for(i = 0; i < FILTER_COUNT; i++) { - if(!NSK_VERIFY(NULL != (klass = NSK_CPP_STUB2(FindClass, jni, types[i])))) { + if(!NSK_VERIFY(NULL != (klass = jni->FindClass(types[i])))) { NSK_COMPLAIN1("Can't find class %s.\n",types[i]); nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("Iterating through heap with klass-filter '%s'.\n",types[i]); - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, klass, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, klass, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -171,13 +170,12 @@ agent(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { phase = STATIC_FIELDS_FINDING_PHASE; NSK_DISPLAY0("Iterating through heap with klass-filter 'java/lang/Class'.\n"); - if(!NSK_VERIFY(NULL != (klass = NSK_CPP_STUB2(FindClass, jni, "java/lang/Class")))) { + if(!NSK_VERIFY(NULL != (klass = jni->FindClass("java/lang/Class")))) { NSK_COMPLAIN0("Can't find class java/lang/Class.\n"); nsk_jvmti_setFailStatus(); return; } - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(IterateThroughHeap, jvmti, - 0, klass, &primitive_callbacks, NULL))) { + if(!NSK_JVMTI_VERIFY(jvmti->IterateThroughHeap(0, klass, &primitive_callbacks, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -222,14 +220,12 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_object_free_events = 1; - if(!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) { + if(!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } memset(&event_callbacks, 0, sizeof(jvmtiEventCallbacks)); - if(!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &event_callbacks, sizeof(jvmtiEventCallbacks)))) { + if(!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&event_callbacks, sizeof(jvmtiEventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEnter/mcontenter001/mcontenter001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEnter/mcontenter001/mcontenter001.cpp index 8d6d2d3d5a3..4be2422c91b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEnter/mcontenter001/mcontenter001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEnter/mcontenter001/mcontenter001.cpp @@ -55,8 +55,8 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj) { } /* check if event is for tested thread and for tested object */ - if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) && - NSK_CPP_STUB3(IsSameObject, jni, object, obj)) + if (jni->IsSameObject(thread, thr) && + jni->IsSameObject(object, obj)) eventsCount++; } @@ -74,8 +74,7 @@ static int prepare() { NSK_DISPLAY0("Prepare: find tested thread\n"); /* get all live threads */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads))) + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads))) return NSK_FALSE; if (!NSK_VERIFY(threads_count > 0 && threads != NULL)) @@ -87,8 +86,7 @@ static int prepare() { return NSK_FALSE; /* get thread information */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info))) return NSK_FALSE; NSK_DISPLAY3(" thread #%d (%s): %p\n", i, info.name, threads[i]); @@ -100,8 +98,7 @@ static int prepare() { } /* deallocate threads list */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) return NSK_FALSE; if (thread == NULL) { @@ -110,35 +107,30 @@ static int prepare() { } /* make thread accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (thread = - NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL)) return NSK_FALSE; /* get tested thread class */ - if (!NSK_JNI_VERIFY(jni, (klass = - NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL)) return NSK_FALSE; /* get tested thread field 'endingMonitor' */ if (!NSK_JNI_VERIFY(jni, (field = - NSK_CPP_STUB4(GetFieldID, jni, klass, - "endingMonitor", "Ljava/lang/Object;")) != NULL)) + jni->GetFieldID(klass, "endingMonitor", "Ljava/lang/Object;")) != NULL)) return NSK_FALSE; /* get 'endingMonitor' object */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->GetObjectField(thread, field)) != NULL)) return NSK_FALSE; /* make object accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB2(NewGlobalRef, jni, object)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->NewGlobalRef(object)) != NULL)) return NSK_FALSE; /* enable MonitorContendedEnter event */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTER, + NULL))) return NSK_FALSE; return NSK_TRUE; @@ -147,9 +139,9 @@ static int prepare() { static int clean() { /* disable MonitorContendedEnter event */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE, - JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTER, + NULL))) nsk_jvmti_setFailStatus(); return NSK_TRUE; @@ -228,14 +220,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti,&caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!NSK_VERIFY(caps.can_generate_monitor_events)) @@ -243,9 +234,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.MonitorContendedEnter = &MonitorContendedEnter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEntered/mcontentered001/mcontentered001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEntered/mcontentered001/mcontentered001.cpp index 021c911d68b..7182e128003 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEntered/mcontentered001/mcontentered001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorContendedEntered/mcontentered001/mcontentered001.cpp @@ -57,8 +57,8 @@ MonitorContendedEntered(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj) } /* check if event is for tested thread and for tested object */ - if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) && - NSK_CPP_STUB3(IsSameObject, jni, object, obj)) + if (jni->IsSameObject(thread, thr) && + jni->IsSameObject(object, obj)) eventsCount++; } @@ -74,8 +74,8 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj) { } /* check if event is for tested thread and for tested object */ - if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) && - NSK_CPP_STUB3(IsSameObject, jni, object, obj)) + if (jni->IsSameObject(thread, thr) && + jni->IsSameObject(object, obj)) eventsCount++; } @@ -94,8 +94,7 @@ static int prepare() { NSK_DISPLAY0("Prepare: find tested thread\n"); /* get all live threads */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads))) + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads))) return NSK_FALSE; if (!NSK_VERIFY(threads_count > 0 && threads != NULL)) @@ -107,8 +106,7 @@ static int prepare() { return NSK_FALSE; /* get thread information */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info))) return NSK_FALSE; NSK_DISPLAY3(" thread #%d (%s): %p\n", i, info.name, threads[i]); @@ -120,8 +118,7 @@ static int prepare() { } /* deallocate threads list */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) return NSK_FALSE; if (thread == NULL) { @@ -130,41 +127,36 @@ static int prepare() { } /* make thread accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (thread = - NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL)) return NSK_FALSE; /* get tested thread class */ - if (!NSK_JNI_VERIFY(jni, (klass = - NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL)) return NSK_FALSE; /* get tested thread field 'endingMonitor' */ if (!NSK_JNI_VERIFY(jni, (field = - NSK_CPP_STUB4(GetFieldID, jni, klass, - "endingMonitor", "Ljava/lang/Object;")) != NULL)) + jni->GetFieldID(klass, "endingMonitor", "Ljava/lang/Object;")) != NULL)) return NSK_FALSE; /* get 'endingMonitor' object */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->GetObjectField(thread, field)) != NULL)) return NSK_FALSE; /* make object accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB2(NewGlobalRef, jni, object)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->NewGlobalRef(object)) != NULL)) return NSK_FALSE; /* enable MonitorContendedEntered event */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, + NULL))) return NSK_FALSE; /* enable MonitorContendedEnter event */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTER, + NULL))) return NSK_FALSE; return NSK_TRUE; @@ -173,9 +165,9 @@ static int prepare() { static int clean() { /* disable MonitorContendedEntered event */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE, - JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE, + JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, + NULL))) nsk_jvmti_setFailStatus(); return NSK_TRUE; @@ -254,14 +246,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti,&caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!NSK_VERIFY(caps.can_generate_monitor_events)) @@ -271,9 +262,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.MonitorContendedEntered = &MonitorContendedEntered; callbacks.MonitorContendedEnter = &MonitorContendedEnter; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWait/monitorwait001/monitorwait001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWait/monitorwait001/monitorwait001.cpp index 421ef7d0d3b..0313ca59319 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWait/monitorwait001/monitorwait001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWait/monitorwait001/monitorwait001.cpp @@ -55,8 +55,8 @@ MonitorWait(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj, jlong tout) } /* check if event is for tested thread and for tested object */ - if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) && - NSK_CPP_STUB3(IsSameObject, jni, object, obj)) { + if (jni->IsSameObject(thread, thr) && + jni->IsSameObject(object, obj)) { eventsCount++; if (tout != timeout) { NSK_COMPLAIN1("Unexpected timeout value: %d\n", (int)tout); @@ -79,8 +79,7 @@ static int prepare() { NSK_DISPLAY0("Prepare: find tested thread\n"); /* get all live threads */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads))) + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads))) return NSK_FALSE; if (!NSK_VERIFY(threads_count > 0 && threads != NULL)) @@ -92,8 +91,7 @@ static int prepare() { return NSK_FALSE; /* get thread information */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info))) return NSK_FALSE; NSK_DISPLAY3(" thread #%d (%s): %p\n", i, info.name, threads[i]); @@ -105,8 +103,7 @@ static int prepare() { } /* deallocate threads list */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) return NSK_FALSE; if (thread == NULL) { @@ -115,35 +112,29 @@ static int prepare() { } /* make thread accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (thread = - NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL)) return NSK_FALSE; /* get tested thread class */ - if (!NSK_JNI_VERIFY(jni, (klass = - NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL)) return NSK_FALSE; /* get tested thread field 'waitingMonitor' */ if (!NSK_JNI_VERIFY(jni, (field = - NSK_CPP_STUB4(GetFieldID, jni, klass, - "waitingMonitor", "Ljava/lang/Object;")) != NULL)) + jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL)) return NSK_FALSE; /* get 'waitingMonitor' object */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->GetObjectField(thread, field)) != NULL)) return NSK_FALSE; /* make object accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB2(NewGlobalRef, jni, object)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->NewGlobalRef(object)) != NULL)) return NSK_FALSE; /* enable MonitorWait event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_MONITOR_WAIT, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL))) return NSK_FALSE; return NSK_TRUE; @@ -153,13 +144,12 @@ static int clean() { /* disable MonitorWait event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE, - JVMTI_EVENT_MONITOR_WAIT, NULL))) + jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAIT, NULL))) nsk_jvmti_setFailStatus(); /* dispose global references */ - NSK_CPP_STUB2(DeleteGlobalRef, jni, object); - NSK_CPP_STUB2(DeleteGlobalRef, jni, thread); + jni->DeleteGlobalRef(object); + jni->DeleteGlobalRef(thread); return NSK_TRUE; } @@ -237,14 +227,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti,&caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!NSK_VERIFY(caps.can_generate_monitor_events)) @@ -252,9 +241,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.MonitorWait = &MonitorWait; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWaited/monitorwaited001/monitorwaited001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWaited/monitorwaited001/monitorwaited001.cpp index 17a547524f9..c7237f43961 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWaited/monitorwaited001/monitorwaited001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/MonitorWaited/monitorwaited001/monitorwaited001.cpp @@ -56,8 +56,8 @@ MonitorWaited(jvmtiEnv *jvmti, JNIEnv* jni, } /* check if event is for tested thread and for tested object */ - if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) && - NSK_CPP_STUB3(IsSameObject, jni, object, obj)) { + if (jni->IsSameObject(thread, thr) && + jni->IsSameObject(object, obj)) { eventsCount++; if (timed_out == JNI_TRUE) { NSK_COMPLAIN0("Unexpected timed_out value: true\n"); @@ -80,8 +80,7 @@ static int prepare() { NSK_DISPLAY0("Prepare: find tested thread\n"); /* get all live threads */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads))) + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads))) return NSK_FALSE; if (!NSK_VERIFY(threads_count > 0 && threads != NULL)) @@ -93,8 +92,7 @@ static int prepare() { return NSK_FALSE; /* get thread information */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info))) return NSK_FALSE; NSK_DISPLAY3(" thread #%d (%s): %p\n", i, info.name, threads[i]); @@ -106,8 +104,7 @@ static int prepare() { } /* deallocate threads list */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) return NSK_FALSE; if (thread == NULL) { @@ -116,35 +113,29 @@ static int prepare() { } /* make thread accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (thread = - NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL)) return NSK_FALSE; /* get tested thread class */ - if (!NSK_JNI_VERIFY(jni, (klass = - NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL)) return NSK_FALSE; /* get tested thread field 'waitingMonitor' */ if (!NSK_JNI_VERIFY(jni, (field = - NSK_CPP_STUB4(GetFieldID, jni, klass, - "waitingMonitor", "Ljava/lang/Object;")) != NULL)) + jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL)) return NSK_FALSE; /* get 'waitingMonitor' object */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->GetObjectField(thread, field)) != NULL)) return NSK_FALSE; /* make object accessable for a long time */ - if (!NSK_JNI_VERIFY(jni, (object = - NSK_CPP_STUB2(NewGlobalRef, jni, object)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (object = jni->NewGlobalRef(object)) != NULL)) return NSK_FALSE; /* enable MonitorWaited event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE, - JVMTI_EVENT_MONITOR_WAITED, NULL))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL))) return NSK_FALSE; return NSK_TRUE; @@ -154,13 +145,12 @@ static int clean() { /* disable MonitorWaited event */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE, - JVMTI_EVENT_MONITOR_WAITED, NULL))) + jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAITED, NULL))) nsk_jvmti_setFailStatus(); /* dispose global references */ - NSK_CPP_STUB2(DeleteGlobalRef, jni, object); - NSK_CPP_STUB2(DeleteGlobalRef, jni, thread); + jni->DeleteGlobalRef(object); + jni->DeleteGlobalRef(thread); return NSK_TRUE; } @@ -238,14 +228,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti,&caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!NSK_VERIFY(caps.can_generate_monitor_events)) @@ -253,9 +242,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&callbacks, 0, sizeof(callbacks)); callbacks.MonitorWaited = &MonitorWaited; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; /* register agent proc and arg */ diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind001/nativemethbind001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind001/nativemethbind001.cpp index ee54c447b08..79812992d82 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind001/nativemethbind001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind001/nativemethbind001.cpp @@ -59,17 +59,13 @@ static jvmtiEventCallbacks callbacks; static jrawMonitorID countLock; static void lock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to enter a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(countLock))) + jni_env->FatalError("failed to enter a raw monitor\n"); } static void unlock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to exit a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(countLock))) + jni_env->FatalError("failed to exit a raw monitor\n"); } /** callback functions **/ @@ -84,7 +80,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, NSK_DISPLAY0(">>>> NativeMethodBind event received\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) { result = STATUS_FAILED; unlock(jvmti_env, jni_env); return; @@ -95,8 +91,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &methNam, &methSig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &methNam, &methSig, NULL))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get method name during NativeMethodBind callback\n\n"); unlock(jvmti_env, jni_env); @@ -118,13 +113,11 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, } } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methNam))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methNam))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method name\n\n"); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methSig))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methSig))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method signature\n\n"); } @@ -152,8 +145,7 @@ Java_nsk_jvmti_NativeMethodBind_nativemethbind001_nativeMethod( if (registerNative == JNI_TRUE) { NSK_DISPLAY1("Finding class \"%s\" ...\n", CLASS_SIG); - if (!NSK_JNI_VERIFY(env, (testedCls = - NSK_CPP_STUB2(FindClass, env, CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(env, (testedCls = env->FindClass(CLASS_SIG)) != NULL)) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILURE: unable to find class \"%s\"\n\n", CLASS_SIG); @@ -167,8 +159,7 @@ Java_nsk_jvmti_NativeMethodBind_nativemethbind001_nativeMethod( NSK_DISPLAY3("Calling RegisterNatives() with \"%s %s\"\n" "\tfor class \"%s\" ...\n", METHODS[1][0], METHODS[1][1], CLASS_SIG); - if (!NSK_JNI_VERIFY_VOID(env, (NSK_CPP_STUB4(RegisterNatives, - env, testedCls, &meth, 1)) != 0)) { + if (!NSK_JNI_VERIFY_VOID(env, (env->RegisterNatives(testedCls, &meth, 1)) != 0)) { result = STATUS_FAILED; NSK_COMPLAIN3("TEST FAILURE: unable to RegisterNatives() \"%s %s\" for class \"%s\"\n\n", METHODS[1][0], METHODS[1][1], CLASS_SIG); @@ -221,19 +212,16 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; /* create a raw monitor */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti, "_counter_lock", &countLock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_counter_lock", &countLock))) return JNI_ERR; /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_native_method_bind_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_native_method_bind_events) NSK_DISPLAY0("Warning: generation of native method bind events is not implemented\n"); @@ -242,13 +230,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { NSK_DISPLAY0("setting event callbacks ...\n"); (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.NativeMethodBind = &NativeMethodBind; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_NATIVE_METHOD_BIND, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind002/nativemethbind002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind002/nativemethbind002.cpp index 4adf089130e..4cf4d921e68 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind002/nativemethbind002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind002/nativemethbind002.cpp @@ -42,17 +42,13 @@ static jvmtiEventCallbacks callbacks; static jrawMonitorID countLock; static void lock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to enter a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(countLock))) + jni_env->FatalError("failed to enter a raw monitor\n"); } static void unlock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to exit a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(countLock))) + jni_env->FatalError("failed to exit a raw monitor\n"); } /** callback functions **/ @@ -64,8 +60,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, lock(jvmti_env, jni_env); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, - jvmti_env, &phase))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) { result = STATUS_FAILED; NSK_COMPLAIN0( "TEST FAILED: unable to obtain phase of the VM execution\n" @@ -79,8 +74,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &methNam, &methSig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &methNam, &methSig, NULL))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get method name during NativeMethodBind callback\n\n"); } @@ -89,12 +83,10 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, methNam, methSig); if (!(methNam==NULL)) - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methNam))) + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methNam))) NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method name\n\n"); if (!(methSig==NULL)) - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methSig))) + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methSig))) NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory pointed to method signature\n\n"); unlock(jvmti_env, jni_env); @@ -149,19 +141,16 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; /* create a raw monitor */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti, "_counter_lock", &countLock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_counter_lock", &countLock))) return JNI_ERR; /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_native_method_bind_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_native_method_bind_events) NSK_DISPLAY0("Warning: generation of native method bind events is not implemented\n"); @@ -171,16 +160,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.NativeMethodBind = &NativeMethodBind; callbacks.VMDeath = &VMDeath; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_NATIVE_METHOD_BIND, + NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_VM_DEATH, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind003/nativemethbind003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind003/nativemethbind003.cpp index 05f6f771b85..2bd4a40a757 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind003/nativemethbind003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind003/nativemethbind003.cpp @@ -52,17 +52,13 @@ static jvmtiEventCallbacks callbacks; static jrawMonitorID countLock; static void lock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to enter a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(countLock))) + jni_env->FatalError("failed to enter a raw monitor\n"); } static void unlock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to exit a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(countLock))) + jni_env->FatalError("failed to exit a raw monitor\n"); } /** callback functions **/ @@ -76,7 +72,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, NSK_DISPLAY0(">>>> NativeMethodBind event received\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) { result = STATUS_FAILED; unlock(jvmti_env, jni_env); return; @@ -87,8 +83,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &methNam, &methSig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &methNam, &methSig, NULL))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get method name during NativeMethodBind callback\n\n"); unlock(jvmti_env, jni_env); @@ -102,13 +97,11 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, NSK_DISPLAY2("\tmethod: \"%s %s\"\n", methNam, methSig); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methNam))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methNam))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory storing method name\n\n"); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methSig))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methSig))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory storing method signature\n\n"); } @@ -158,8 +151,7 @@ Java_nsk_jvmti_NativeMethodBind_nativemethbind003_registerNative( NSK_DISPLAY1("Inside the registerNative()\n" "Finding class \"%s\" ...\n", CLASS_SIG); - if (!NSK_JNI_VERIFY(env, (testedCls = - NSK_CPP_STUB2(FindClass, env, CLASS_SIG)) != NULL)) { + if (!NSK_JNI_VERIFY(env, (testedCls = env->FindClass(CLASS_SIG)) != NULL)) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILURE: unable to find class \"%s\"\n\n", CLASS_SIG); @@ -174,8 +166,7 @@ Java_nsk_jvmti_NativeMethodBind_nativemethbind003_registerNative( "Calling RegisterNatives() with \"%s %s\"\n" "\tfor class \"%s\" ...\n", METHODS[0], METHODS[1], CLASS_SIG); - if (!NSK_JNI_VERIFY_VOID(env, (NSK_CPP_STUB4(RegisterNatives, - env, testedCls, &meth, 1)) != 0)) { + if (!NSK_JNI_VERIFY_VOID(env, (env->RegisterNatives(testedCls, &meth, 1)) != 0)) { result = STATUS_FAILED; NSK_COMPLAIN3("TEST FAILURE: unable to RegisterNatives() \"%s %s\" for class \"%s\"\n\n", METHODS[0], METHODS[1], CLASS_SIG); @@ -183,8 +174,7 @@ Java_nsk_jvmti_NativeMethodBind_nativemethbind003_registerNative( NSK_DISPLAY1("Calling UnregisterNatives() for class \"%s\" ...\n", CLASS_SIG); - if (!NSK_JNI_VERIFY_VOID(env, (NSK_CPP_STUB2(UnregisterNatives, - env, testedCls)) != 0)) { + if (!NSK_JNI_VERIFY_VOID(env, (env->UnregisterNatives(testedCls)) != 0)) { result = STATUS_FAILED; NSK_COMPLAIN3("TEST FAILURE: unable to UnregisterNatives() \"%s %s\" for class \"%s\"\n\n", METHODS[1][0], METHODS[1][1], CLASS_SIG); @@ -215,19 +205,16 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; /* create a raw monitor */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti, "_counter_lock", &countLock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_counter_lock", &countLock))) return JNI_ERR; /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_native_method_bind_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_native_method_bind_events) NSK_DISPLAY0("Warning: generation of native method bind events is not implemented\n"); @@ -237,16 +224,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.NativeMethodBind = &NativeMethodBind; callbacks.VMDeath = &VMDeath; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_NATIVE_METHOD_BIND, + NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_VM_DEATH, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind004/nativemethbind004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind004/nativemethbind004.cpp index b995aa2be17..a516f4564e4 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind004/nativemethbind004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NativeMethodBind/nativemethbind004/nativemethbind004.cpp @@ -67,17 +67,13 @@ redirNativeMethod(JNIEnv *env, jobject obj) { } static void lock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to enter a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(countLock))) + jni_env->FatalError("failed to enter a raw monitor\n"); } static void unlock(jvmtiEnv *jvmti_env, JNIEnv *jni_env) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, countLock))) - NSK_CPP_STUB2(FatalError, jni_env, - "failed to exit a raw monitor\n"); + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(countLock))) + jni_env->FatalError("failed to exit a raw monitor\n"); } /** callback functions **/ @@ -90,7 +86,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, NSK_DISPLAY0(">>>> NativeMethodBind event received\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) { result = STATUS_FAILED; unlock(jvmti_env, jni_env); return; @@ -101,8 +97,7 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &methNam, &methSig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &methNam, &methSig, NULL))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to get method name during NativeMethodBind callback\n\n"); unlock(jvmti_env, jni_env); @@ -117,13 +112,11 @@ NativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread, *new_addr = (void*) redirNativeMethod; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methNam))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methNam))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory storing method name\n\n"); } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, (unsigned char*) methSig))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*) methSig))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to deallocate memory storing method signature\n\n"); } @@ -190,19 +183,16 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { return JNI_ERR; /* create a raw monitor */ - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti, "_counter_lock", &countLock))) + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_counter_lock", &countLock))) return JNI_ERR; /* add capability to generate compiled method events */ memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_native_method_bind_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_native_method_bind_events) NSK_DISPLAY0("Warning: generation of native method bind events is not implemented\n"); @@ -211,13 +201,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { NSK_DISPLAY0("setting event callbacks ...\n"); (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.NativeMethodBind = &NativeMethodBind; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_NATIVE_METHOD_BIND, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp index bc1123f9001..2a14eee0629 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp @@ -62,8 +62,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: creating a raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti_env, "_lock", &_lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->CreateRawMonitor("_lock", &_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to create a raw monitor\n\n", msg); @@ -74,8 +73,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: entering the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to enter the raw monitor\n\n", msg); @@ -86,8 +84,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: exiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to exit the raw monitor\n\n", msg); @@ -98,8 +95,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: destroying the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(DestroyRawMonitor, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->DestroyRawMonitor(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to destroy a raw monitor\n", msg); @@ -112,8 +108,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: allocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, - jvmti_env, MEM_SIZE, &mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(MEM_SIZE, &mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to allocate memory\n\n", msg); @@ -125,8 +120,7 @@ static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: deallocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate(mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to deallocate memory\n\n", msg); @@ -142,8 +136,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY2("%s: setting an environment local storage 0x%p ...\n", msg, (void*) &stor); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SetEnvironmentLocalStorage, - jvmti_env, (const void*) &stor))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->SetEnvironmentLocalStorage((const void*) &stor))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to set an environment local storage\n\n", msg); @@ -155,8 +148,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: getting an environment local storage ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetEnvironmentLocalStorage, - jvmti_env, (void**) &obtainedData))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetEnvironmentLocalStorage((void**) &obtainedData))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to get an environment local storage\n\n", msg); @@ -229,8 +221,7 @@ VMDeath(jvmtiEnv *jvmti_env, JNIEnv *env) { JNIEXPORT void JNICALL Java_nsk_jvmti_ObjectFree_objfree001_setTag(JNIEnv *jni_env, jobject obj, jobject objToTag) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, - jvmti, objToTag, (jlong) 1))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(objToTag, (jlong) 1))) { result = STATUS_FAILED; NSK_COMPLAIN0("TEST FAILED: unable to set tag for a tested object\n"); } @@ -269,12 +260,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_object_free_events = 1; caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_object_free_events) @@ -287,16 +276,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMDeath = &VMDeath; callbacks.ObjectFree = &ObjectFree; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_VM_DEATH, + NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_OBJECT_FREE, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp index 48f4e01bc21..7e1be9da537 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp @@ -59,8 +59,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: creating a raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(CreateRawMonitor, - jvmti_env, "_lock", &_lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->CreateRawMonitor("_lock", &_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to create a raw monitor\n\n", msg); @@ -71,8 +70,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: entering the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorEnter(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to enter the raw monitor\n\n", msg); @@ -83,8 +81,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: waiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RawMonitorWait, - jvmti_env, _lock, (jlong)10))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorWait(_lock, (jlong)10))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to wait the raw monitor\n\n", msg); @@ -95,8 +92,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: notifying a single thread waiting on the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorNotify, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorNotify(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to notify single thread\n\n", msg); @@ -107,8 +103,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: notifying all threads waiting on the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorNotifyAll, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorNotifyAll(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to notify all threads\n\n", msg); @@ -119,8 +114,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: exiting the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->RawMonitorExit(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to exit the raw monitor\n\n", msg); @@ -131,8 +125,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: destroying the raw monitor ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(DestroyRawMonitor, - jvmti_env, _lock))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->DestroyRawMonitor(_lock))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to destroy a raw monitor\n", msg); @@ -145,8 +138,7 @@ static void rawMonitorFunc(jvmtiEnv *jvmti_env, const char *msg) { static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: allocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, - jvmti_env, MEM_SIZE, &mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(MEM_SIZE, &mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to allocate memory\n\n", msg); @@ -158,8 +150,7 @@ static void memoryFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: deallocating memory ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, - jvmti_env, mem))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate(mem))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to deallocate memory\n\n", msg); @@ -175,8 +166,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY2("%s: setting an environment local storage 0x%p ...\n", msg, (void*) &stor); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SetEnvironmentLocalStorage, - jvmti_env, (const void*) &stor))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->SetEnvironmentLocalStorage((const void*) &stor))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to set an environment local storage\n\n", msg); @@ -188,8 +178,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) { NSK_DISPLAY1("%s: getting an environment local storage ...\n", msg); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetEnvironmentLocalStorage, - jvmti_env, (void**) &obtainedData))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetEnvironmentLocalStorage((void**) &obtainedData))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: %s: unable to get an environment local storage\n\n", msg); @@ -249,8 +238,7 @@ Java_nsk_jvmti_ObjectFree_objfree002_setTag( if ((num % 2) == 0) { NSK_DISPLAY2("Setting the tag \"%ld\" for object #%d\n", (long) num, num); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, - jvmti, objToTag, (jlong) num))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(objToTag, (jlong) num))) { result = STATUS_FAILED; NSK_COMPLAIN1("TEST FAILED: unable to set tag for object #%d\n", num); @@ -292,12 +280,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_object_free_events = 1; caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_object_free_events) @@ -310,16 +296,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.VMDeath = &VMDeath; callbacks.ObjectFree = &ObjectFree; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_VM_DEATH, + NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_OBJECT_FREE, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp index f1b66ec1e86..f8d0e740302 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp @@ -33,12 +33,7 @@ extern "C" { // Deallocate memory region allocated by VM #define DEALLOCATE(p) \ if (p != NULL) \ - if (!NSK_JVMTI_VERIFY( \ - NSK_CPP_STUB2( \ - Deallocate \ - , jvmti \ - , p \ - ))) \ + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(p))) \ { \ NSK_COMPLAIN0("Failed to deallocate: ##p##\n"); \ } @@ -101,49 +96,22 @@ MethodExit( int failure = 1; do { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - GetThreadInfo - , jvmti - , thread - , &thr_info - ))) + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &thr_info))) { break; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - GetMethodDeclaringClass - , jvmti - , method - , &klass - ))) + if (!NSK_JVMTI_VERIFY(jvmti->GetMethodDeclaringClass(method, &klass))) { break; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - GetClassSignature - , jvmti - , klass - , &class_signature - , NULL - ))) + if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(klass, &class_signature, NULL))) { break; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5( - GetMethodName - , jvmti - , method - , &entry_name - , &entry_sig - , NULL - ))) + if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(method, &entry_name, &entry_sig, NULL))) { break; } @@ -181,12 +149,7 @@ jboolean suspendThread(jobject suspendedThread) { NSK_DISPLAY0(">>>>>>>> Invoke SuspendThread()\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - SuspendThread - , jvmti - , suspendedThread - ))) + if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(suspendedThread))) { return JNI_FALSE; } @@ -203,12 +166,7 @@ jboolean resThread(jobject suspendedThread) { NSK_DISPLAY0(">>>>>>>> Invoke ResumeThread()\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - ResumeThread - , jvmti - , suspendedThread - ))) + if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(suspendedThread))) { return JNI_FALSE; } @@ -234,25 +192,13 @@ Java_nsk_jvmti_PopFrame_popframe005_doPopFrame( } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - SetEventNotificationMode - , jvmti - , JVMTI_ENABLE - , JVMTI_EVENT_METHOD_EXIT - , frameThr - ))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, frameThr))) { result = JNI_FALSE; } if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - SetEventNotificationMode - , jvmti - , JVMTI_ENABLE - , JVMTI_EVENT_FRAME_POP - , frameThr - ))) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FRAME_POP, frameThr))) { result = JNI_FALSE; } @@ -261,12 +207,7 @@ Java_nsk_jvmti_PopFrame_popframe005_doPopFrame( set_watch_jvmti_events(1); /* watch JVMTI events */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - PopFrame - , jvmti - , frameThr - ))) + if (!NSK_JVMTI_VERIFY(jvmti->PopFrame(frameThr))) { result = JNI_FALSE; } else { @@ -319,32 +260,17 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) return JNI_ERR; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetPotentialCapabilities - , jvmti - , &caps - ))) + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - AddCapabilities - , jvmti - , &caps - ))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetCapabilities - , jvmti - , &caps - ))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return JNI_ERR; } @@ -365,12 +291,7 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) callbacks.MethodExit = &MethodExit; callbacks.FramePop = &FramePop; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - SetEventCallbacks - , jvmti - , &callbacks - , sizeof(callbacks) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks) ))) { return JNI_ERR; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp index 2420b73869a..4afa9e5079c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp @@ -86,9 +86,9 @@ JNIEXPORT void JNICALL Java_nsk_jvmti_RedefineClasses_redefclass028_storeClassBy (JNIEnv *jni_env, jclass cls, jbyteArray classBytes) { jboolean isCopy; - bytesCount = NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes); + bytesCount = jni_env->GetArrayLength(classBytes); clsBytes = - NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, &isCopy); + jni_env->GetByteArrayElements(classBytes, &isCopy); } /** callback functions **/ @@ -100,8 +100,7 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size, char *sig; NSK_DISPLAY0("CompiledMethodLoad event received for:\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &name, &sig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -138,8 +137,8 @@ CompiledMethodUnload(jvmtiEnv* jvmti_env, jmethodID method, if (err == JVMTI_ERROR_NONE) { NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n", name, sig, code_addr); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig); + jvmti_env->Deallocate((unsigned char*)name); + jvmti_env->Deallocate((unsigned char*)sig); } } /************************/ @@ -163,8 +162,7 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { /* at first, send all generated CompiledMethodLoad events */ NSK_DISPLAY0("agentProc: sending all generated CompiledMethodLoad events ...\n\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) { + if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -185,14 +183,12 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { NSK_DISPLAY0("agentProc: hotspot method compiled\n\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, - jvmti_env, hsMethodID, &decl_cls))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(hsMethodID, &decl_cls))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti_env, decl_cls, &cls_sig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(decl_cls, &cls_sig, NULL))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -209,8 +205,7 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { NSK_DISPLAY1("agentProc: >>>>>>>> Invoke RedefineClasses():\n" "\tnew class byte count=%d\n", classDef.class_byte_count); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, - jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -261,8 +256,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_compiled_method_load_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; /* set event callback */ @@ -270,8 +264,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.CompiledMethodLoad = &CompiledMethodLoad; callbacks.CompiledMethodUnload = &CompiledMethodUnload; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling events ...\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp index 3ee94187511..0fec733438c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp @@ -85,9 +85,9 @@ JNIEXPORT void JNICALL Java_nsk_jvmti_RedefineClasses_redefclass029_storeClassBy (JNIEnv *jni_env, jclass cls, jbyteArray classBytes) { jboolean isCopy; - bytesCount = NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes); + bytesCount = jni_env->GetArrayLength(classBytes); clsBytes = - NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, &isCopy); + jni_env->GetByteArrayElements(classBytes, &isCopy); } /** callback functions **/ @@ -99,8 +99,7 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size, char *sig; NSK_DISPLAY0("CompiledMethodLoad event received for:\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &name, &sig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -137,8 +136,8 @@ CompiledMethodUnload(jvmtiEnv* jvmti_env, jmethodID method, if (err == JVMTI_ERROR_NONE) { NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n", name, sig, code_addr); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig); + jvmti_env->Deallocate((unsigned char*)name); + jvmti_env->Deallocate((unsigned char*)sig); } } /************************/ @@ -162,8 +161,7 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { /* at first, send all generated CompiledMethodLoad events */ NSK_DISPLAY0("agentProc: sending all generated CompiledMethodLoad events ...\n\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) { + if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -184,14 +182,12 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { NSK_DISPLAY0("agentProc: hotspot method compiled\n\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, - jvmti_env, hsMethodID, &decl_cls))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(hsMethodID, &decl_cls))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti_env, decl_cls, &cls_sig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(decl_cls, &cls_sig, NULL))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -208,8 +204,7 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { NSK_DISPLAY1("agentProc: >>>>>>>> Invoke RedefineClasses():\n" "\tnew class byte count=%d\n", classDef.class_byte_count); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, - jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -260,8 +255,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_compiled_method_load_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; /* set event callback */ @@ -269,8 +263,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.CompiledMethodLoad = &CompiledMethodLoad; callbacks.CompiledMethodUnload = &CompiledMethodUnload; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling events ...\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp index a1315ac7218..8dc2d553006 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp @@ -86,9 +86,9 @@ JNIEXPORT void JNICALL Java_nsk_jvmti_RedefineClasses_redefclass030_storeClassBy (JNIEnv *jni_env, jclass cls, jbyteArray classBytes) { jboolean isCopy; - bytesCount = NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes); + bytesCount = jni_env->GetArrayLength(classBytes); clsBytes = - NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, &isCopy); + jni_env->GetByteArrayElements(classBytes, &isCopy); } /** callback functions **/ @@ -100,8 +100,7 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size, char *sig; NSK_DISPLAY0("CompiledMethodLoad event received for:\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, - jvmti_env, method, &name, &sig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -138,8 +137,8 @@ CompiledMethodUnload(jvmtiEnv* jvmti_env, jmethodID method, if (err == JVMTI_ERROR_NONE) { NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n", name, sig, code_addr); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name); - NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig); + jvmti_env->Deallocate((unsigned char*)name); + jvmti_env->Deallocate((unsigned char*)sig); } } /************************/ @@ -163,8 +162,7 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { /* at first, send all generated CompiledMethodLoad events */ NSK_DISPLAY0("agentProc: sending all generated CompiledMethodLoad events ...\n\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) { + if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -185,14 +183,12 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { NSK_DISPLAY0("agentProc: hotspot method compiled\n\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetMethodDeclaringClass, - jvmti_env, hsMethodID, &decl_cls))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodDeclaringClass(hsMethodID, &decl_cls))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; } - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, - jvmti_env, decl_cls, &cls_sig, NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(decl_cls, &cls_sig, NULL))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -209,8 +205,7 @@ agentProc(jvmtiEnv* jvmti_env, JNIEnv* jni_env, void* arg) { NSK_DISPLAY1("agentProc: >>>>>>>> Invoke RedefineClasses():\n" "\tnew class byte count=%d\n", classDef.class_byte_count); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, - jvmti, 1, &classDef))) { + if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) { nsk_jvmti_setFailStatus(); nsk_jvmti_resumeSync(); return; @@ -261,8 +256,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_compiled_method_load_events = 1; caps.can_redefine_classes = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; /* set event callback */ @@ -270,8 +264,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.CompiledMethodLoad = &CompiledMethodLoad; callbacks.CompiledMethodUnload = &CompiledMethodUnload; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling events ...\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp index 314ab08b3aa..2a6d4c05ae1 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp @@ -193,8 +193,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const memset(&caps, 0, sizeof(jvmtiCapabilities)); NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return NSK_FALSE; } @@ -217,8 +216,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const */ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... set\n"); @@ -232,8 +230,7 @@ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { */ static int removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) { NSK_DISPLAY0("RelinquishCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RelinquishCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... relinguished\n"); @@ -247,8 +244,7 @@ static int removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const ch */ static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) { return NSK_FALSE; } @@ -350,9 +346,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp index ebc346b61cb..a16e39c2ee8 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp @@ -193,8 +193,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const memset(&caps, 0, sizeof(jvmtiCapabilities)); NSK_DISPLAY0("GetCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetCapabilities, jvmti, &caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) { return NSK_FALSE; } @@ -217,8 +216,7 @@ static int checkCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* initCaps, const */ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { NSK_DISPLAY0("AddCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... set\n"); @@ -232,8 +230,7 @@ static int addCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { */ static int removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const char where[]) { NSK_DISPLAY0("RelinquishCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RelinquishCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(caps))) { return NSK_FALSE; } NSK_DISPLAY0(" ... relinguished\n"); @@ -247,8 +244,7 @@ static int removeCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps, const ch */ static int getPotentialCapabilities(jvmtiEnv* jvmti, jvmtiCapabilities* caps) { NSK_DISPLAY0("GetPotentialCapabilities() for current JVMTI env\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, caps))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(caps))) { return NSK_FALSE; } @@ -349,9 +345,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&eventCallbacks, 0, sizeof(eventCallbacks)); eventCallbacks.VMInit = callbackVMInit; eventCallbacks.VMDeath = callbackVMDeath; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, - &eventCallbacks, sizeof(eventCallbacks)))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) { return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp index f2b07a9ca15..ecc47dcc239 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp @@ -86,15 +86,17 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) memset(&capabilities, 0, sizeof(jvmtiCapabilities)); capabilities.can_generate_resource_exhaustion_heap_events = 1; capabilities.can_generate_resource_exhaustion_threads_events = 1; - if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, gJvmti, &capabilities)) ) + if ( ! NSK_JVMTI_VERIFY(gJvmti->AddCapabilities(&capabilities)) ) return JNI_ERR; memset((void *)&callbacks, 0, sizeof(jvmtiEventCallbacks)); callbacks.ResourceExhausted = resourceExhausted; - if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, gJvmti, &callbacks, sizeof(callbacks))) ) + if ( ! NSK_JVMTI_VERIFY(gJvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))) ) return JNI_ERR; - if ( ! NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, gJvmti, JVMTI_ENABLE, JVMTI_EVENT_RESOURCE_EXHAUSTED, NULL) ) ) + if ( ! NSK_JVMTI_VERIFY(gJvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_RESOURCE_EXHAUSTED, + NULL) ) ) return JNI_ERR; return JNI_OK; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp index ab686f2b7e2..97689802db3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp @@ -58,15 +58,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY1(" ... found thread: %p\n", (void*)testedThread); NSK_DISPLAY1("Suspend thread: %p\n", (void*)testedThread); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SuspendThread, jvmti, testedThread))) { + if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(testedThread))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("Resume thread: %p\n", (void*)testedThread); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(ResumeThread, jvmti, testedThread))) { + if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(testedThread))) { nsk_jvmti_setFailStatus(); } @@ -74,8 +72,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { { jint state = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadState, jvmti, testedThread, &state))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(testedThread, &state))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY2(" ... got state vector: %s (%d)\n", @@ -98,7 +95,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Delete thread reference\n"); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedThread)); + NSK_TRACE(jni->DeleteGlobalRef(testedThread)); } NSK_DISPLAY0("Let debugee to finish\n"); @@ -139,8 +136,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiCapabilities suspendCaps; memset(&suspendCaps, 0, sizeof(suspendCaps)); suspendCaps.can_suspend = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp index afccedf4f10..55a06f21bbc 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp @@ -72,8 +72,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY1("Suspend thread: %p\n", (void*)testedThread); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(SuspendThread, jvmti, testedThread))) { + if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(testedThread))) { nsk_jvmti_setFailStatus(); return; } @@ -83,8 +82,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY1("Resume thread: %p\n", (void*)testedThread); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(ResumeThread, jvmti, testedThread))) { + if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(testedThread))) { nsk_jvmti_setFailStatus(); } @@ -112,7 +110,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Delete thread reference\n"); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedThread)); + NSK_TRACE(jni->DeleteGlobalRef(testedThread)); } NSK_DISPLAY0("Let debugee to finish\n"); @@ -127,7 +125,7 @@ JNIEXPORT void JNICALL callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { /* check if event is for tested thread */ if (thread != NULL && - NSK_CPP_STUB3(IsSameObject, jni, testedThread, thread)) { + jni->IsSameObject(testedThread, thread)) { NSK_DISPLAY1(" ... received THREAD_END event for tested thread: %p\n", (void*)thread); eventsReceived++; } else { @@ -168,8 +166,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiCapabilities suspendCaps; memset(&suspendCaps, 0, sizeof(suspendCaps)); suspendCaps.can_suspend = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps))) return JNI_ERR; } @@ -178,8 +175,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiEventCallbacks callbacks; memset(&callbacks, 0, sizeof(callbacks)); callbacks.ThreadEnd = callbackThreadEnd; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp index 6f500966992..b513fa47ec0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp @@ -62,18 +62,16 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { int i; NSK_DISPLAY1("Allocate threads array: %d threads\n", threadsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jthread)), - (unsigned char**)&threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((threadsCount * sizeof(jthread)), + (unsigned char**)&threads))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1(" ... allocated array: %p\n", (void*)threads); NSK_DISPLAY1("Allocate results array: %d threads\n", threadsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jvmtiError)), - (unsigned char**)&results))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((threadsCount * sizeof(jvmtiError)), + (unsigned char**)&results))) { nsk_jvmti_setFailStatus(); return; } @@ -84,8 +82,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Suspend threads list\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SuspendThreadList, jvmti, threadsCount, threads, results))) { + if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(threadsCount, threads, results))) { nsk_jvmti_setFailStatus(); return; } @@ -99,8 +96,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Resume threads list\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(ResumeThreadList, jvmti, threadsCount, threads, results))) { + if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(threadsCount, threads, results))) { nsk_jvmti_setFailStatus(); return; } @@ -118,8 +114,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { jint state = 0; NSK_DISPLAY2(" thread #%d (%p):\n", i, (void*)threads[i]); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadState, jvmti, threads[i], &state))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threads[i], &state))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY2(" ... got state vector: %s (%d)\n", @@ -144,18 +139,16 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Delete threads references\n"); for (i = 0; i < threadsCount; i++) { if (threads[i] != NULL) - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threads[i])); + NSK_TRACE(jni->DeleteGlobalRef(threads[i])); } NSK_DISPLAY1("Deallocate threads array: %p\n", (void*)threads); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY1("Deallocate results array: %p\n", (void*)results); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)results))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)results))) { nsk_jvmti_setFailStatus(); } } @@ -181,8 +174,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, foundThreads[i] = NULL; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &count, &threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&count, &threads))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -191,8 +183,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, for (i = 0; i < count; i++) { jvmtiThreadInfo info; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info))) { nsk_jvmti_setFailStatus(); break; } @@ -207,8 +198,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -226,7 +216,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, NSK_DISPLAY1("Make global references for threads: %d threads\n", foundCount); for (i = 0; i < foundCount; i++) { if (!NSK_JNI_VERIFY(jni, (foundThreads[i] = (jthread) - NSK_CPP_STUB2(NewGlobalRef, jni, foundThreads[i])) != NULL)) { + jni->NewGlobalRef(foundThreads[i])) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -274,8 +264,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiCapabilities suspendCaps; memset(&suspendCaps, 0, sizeof(suspendCaps)); suspendCaps.can_suspend = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps))) return JNI_ERR; } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp index 4947224da15..0aa26616579 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp @@ -71,18 +71,16 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { int i; NSK_DISPLAY1("Allocate threads array: %d threads\n", threadsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jthread)), - (unsigned char**)&threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((threadsCount * sizeof(jthread)), + (unsigned char**)&threads))) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1(" ... allocated array: %p\n", (void*)threads); NSK_DISPLAY1("Allocate results array: %d threads\n", threadsCount); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jvmtiError)), - (unsigned char**)&results))) { + if (!NSK_JVMTI_VERIFY(jvmti->Allocate((threadsCount * sizeof(jvmtiError)), + (unsigned char**)&results))) { nsk_jvmti_setFailStatus(); return; } @@ -93,8 +91,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Suspend threads list\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(SuspendThreadList, jvmti, threadsCount, threads, results))) { + if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(threadsCount, threads, results))) { nsk_jvmti_setFailStatus(); return; } @@ -117,8 +114,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; NSK_DISPLAY0("Resume threads list\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(ResumeThreadList, jvmti, threadsCount, threads, results))) { + if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(threadsCount, threads, results))) { nsk_jvmti_setFailStatus(); return; } @@ -159,18 +155,16 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Delete threads references\n"); for (i = 0; i < threadsCount; i++) { if (threads[i] != NULL) - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threads[i])); + NSK_TRACE(jni->DeleteGlobalRef(threads[i])); } NSK_DISPLAY1("Deallocate threads array: %p\n", (void*)threads); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY1("Deallocate results array: %p\n", (void*)results); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)results))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)results))) { nsk_jvmti_setFailStatus(); } } @@ -196,8 +190,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, foundThreads[i] = NULL; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetAllThreads, jvmti, &count, &threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&count, &threads))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -206,8 +199,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, for (i = 0; i < count; i++) { jvmtiThreadInfo info; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info))) { nsk_jvmti_setFailStatus(); break; } @@ -222,8 +214,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads))) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -241,7 +232,7 @@ static int fillThreadsByName(jvmtiEnv* jvmti, JNIEnv* jni, NSK_DISPLAY1("Make global references for threads: %d threads\n", foundCount); for (i = 0; i < foundCount; i++) { if (!NSK_JNI_VERIFY(jni, (foundThreads[i] = (jthread) - NSK_CPP_STUB2(NewGlobalRef, jni, foundThreads[i])) != NULL)) { + jni->NewGlobalRef(foundThreads[i])) != NULL)) { nsk_jvmti_setFailStatus(); return NSK_FALSE; } @@ -258,7 +249,7 @@ JNIEXPORT void JNICALL callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { int i = 0; - jvmtiError e = NSK_CPP_STUB2(RawMonitorEnter, jvmti, eventsReceivedMtx); + jvmtiError e = jvmti->RawMonitorEnter(eventsReceivedMtx); if ( !NSK_JVMTI_VERIFY(e) ) { NSK_DISPLAY1(" ... ERROR entering raw monitor for thread %p\n", (void *) thread); return; @@ -267,15 +258,15 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) { /* check if event is for tested thread */ for (i = 0; i < threadsCount; i++) { if (thread != NULL && - NSK_CPP_STUB3(IsSameObject, jni, threads[i], thread)) { + jni->IsSameObject(threads[i], thread)) { NSK_DISPLAY2(" ... received THREAD_END event for thread #%d: %p\n", i, (void*)thread); eventsReceived++; - NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsReceivedMtx); + jvmti->RawMonitorExit(eventsReceivedMtx); return; } } - NSK_CPP_STUB2(RawMonitorExit, jvmti, eventsReceivedMtx); + jvmti->RawMonitorExit(eventsReceivedMtx); NSK_DISPLAY1(" ... received THREAD_END event for unknown thread: %p\n", (void*)thread); } @@ -317,8 +308,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiCapabilities suspendCaps; memset(&suspendCaps, 0, sizeof(suspendCaps)); suspendCaps.can_suspend = 1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps))) return JNI_ERR; } @@ -327,15 +317,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { jvmtiEventCallbacks callbacks; memset(&callbacks, 0, sizeof(callbacks)); callbacks.ThreadEnd = callbackThreadEnd; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; } /* create a mutex for the eventsReceived variable */ { - if ( ! NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "eventsReceived", &eventsReceivedMtx))) { + if ( ! NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("eventsReceived", &eventsReceivedMtx))) { return JNI_ERR; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp index 7aa7299a1c9..c9078ea5784 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp @@ -49,15 +49,7 @@ Java_nsk_jvmti_RetransformClasses_retransform002_forceLoadedClassesRetransformat ) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - RetransformClasses - , jvmti - , 1 - , &class_for_retransformation - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->RetransformClasses(1, &class_for_retransformation))) return JNI_FALSE; return JNI_TRUE; @@ -114,53 +106,26 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) ) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; caps.can_retransform_classes = 1; // Register all necessary JVM capabilities - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - AddCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; // Register all necessary event callbacks memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - SetEventCallbacks - , jvmti - , &callbacks - , sizeof(callbacks) - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; // Enable class retransformation - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - SetEventNotificationMode - , jvmti - , JVMTI_ENABLE - , JVMTI_EVENT_CLASS_FILE_LOAD_HOOK - , NULL - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, + NULL))) return JNI_ERR; return JNI_OK; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp index b37effc6ec0..b189355432c 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp @@ -63,15 +63,7 @@ Java_nsk_jvmti_RetransformClasses_retransform003_forceLoadedClassesRetransformat , jclass class_for_retransformation ) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - RetransformClasses - , jvmti - , 1 - , &class_for_retransformation - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->RetransformClasses(1, &class_for_retransformation))) return JNI_FALSE; return JNI_TRUE; @@ -107,88 +99,28 @@ ClassFileLoadHook ( } // Get ant the invoke callback function - if (!NSK_VERIFY( - (loader_class = NSK_CPP_STUB2( - GetObjectClass - , jni - , loader - ) - ) != NULL - ) - ) + if (!NSK_VERIFY((loader_class = jni->GetObjectClass(loader)) != NULL)) return; - if (!NSK_VERIFY( - (method_id = NSK_CPP_STUB4( - GetMethodID - , jni - , loader_class - , "loadClass" - , "(Ljava/lang/String;)Ljava/lang/Class;" - ) - ) != NULL - ) - ) + if (!NSK_VERIFY((method_id = jni->GetMethodID( + loader_class, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;")) != NULL)) return; - if (!NSK_VERIFY( - (class_name_string = - NSK_CPP_STUB2( - NewStringUTF - , jni - , CALLBACK_CLASS_NAME - ) - ) != NULL - ) - ) + if (!NSK_VERIFY((class_name_string = jni->NewStringUTF(CALLBACK_CLASS_NAME)) != NULL)) return; - if (!NSK_VERIFY( - (callback_class = (jclass) NSK_CPP_STUB4( - CallObjectMethod - , jni - , loader - , method_id - , class_name_string - ) - ) != NULL - ) - ) + if (!NSK_VERIFY((callback_class = (jclass) jni->CallObjectMethod( + loader, method_id, class_name_string)) != NULL)) return; - if (!NSK_VERIFY( - (method_id = NSK_CPP_STUB4( - GetStaticMethodID - , jni - , callback_class - , "callback" - , "(Ljava/lang/String;I)V" - ) - ) != NULL - ) - ) + if (!NSK_VERIFY((method_id = jni->GetStaticMethodID( + callback_class, "callback", "(Ljava/lang/String;I)V")) != NULL)) return; - if (!NSK_VERIFY( - (class_name_string = - NSK_CPP_STUB2( - NewStringUTF - , jni - , name - ) - ) != NULL - ) - ) + if (!NSK_VERIFY((class_name_string = jni->NewStringUTF(name)) != NULL)) return; - NSK_CPP_STUB5( - CallStaticObjectMethod - , jni - , callback_class - , method_id - , class_name_string - , agent_id - ); + jni->CallStaticObjectMethod(callback_class, method_id, class_name_string, agent_id); } @@ -219,19 +151,10 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) agent_id= nsk_jvmti_findOptionIntValue("id", -1); - if (!NSK_VERIFY( - (jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL - ) - ) + if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(vm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if(nsk_jvmti_findOptionIntValue("can_retransform_classes", 1)) { @@ -242,41 +165,21 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) // Register all necessary JVM capabilities - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - AddCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; // Register all necessary event callbacks memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - SetEventCallbacks - , jvmti - , &callbacks - , sizeof(callbacks) - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; // Enable class retransformation if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - SetEventNotificationMode - , jvmti - , JVMTI_ENABLE - , JVMTI_EVENT_CLASS_FILE_LOAD_HOOK - , NULL - ) - ) - ) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, + NULL))) return JNI_ERR; return JNI_OK; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp index 2891102df58..78a4b31d36f 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp @@ -52,15 +52,7 @@ Java_nsk_jvmti_RetransformClasses_retransform004_forceLoadedClassesRetransformat , jclass class_for_retransformation ) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - RetransformClasses - , jvmti - , 1 - , &class_for_retransformation - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->RetransformClasses(1, &class_for_retransformation))) return JNI_FALSE; return JNI_TRUE; @@ -85,15 +77,7 @@ ClassFileLoadHook ( ) { // Allocate space for "retransformed" class version - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - Allocate - , jvmti - , class_data_len - , new_class_data - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->Allocate(class_data_len, new_class_data))) return; // Copy old code @@ -127,53 +111,27 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved) ) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - GetCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; caps.can_retransform_classes = 1; // Register all necessary JVM capabilities - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2( - AddCapabilities - , jvmti - , &caps) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; // Register all necessary event callbacks memset(&callbacks, 0, sizeof(callbacks)); callbacks.ClassFileLoadHook = &ClassFileLoadHook; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3( - SetEventCallbacks - , jvmti - , &callbacks - , sizeof(callbacks) - ) - ) - ) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; // Enable class retransformation if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4( - SetEventNotificationMode - , jvmti - , JVMTI_ENABLE - , JVMTI_EVENT_CLASS_FILE_LOAD_HOOK - , NULL - ) - ) - ) + jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, + NULL))) return JNI_ERR; return JNI_OK; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp index 3711c71bb9a..1dae1f2118a 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp @@ -146,20 +146,13 @@ Java_nsk_jvmti_scenarios_allocation_AP01_ap01t001_newObject( JNIEnv* jni, jclass jmethodID cid; jobject result; - if (!NSK_JNI_VERIFY(jni, (cid = - NSK_CPP_STUB4(GetMethodID, jni, - cls, - "", - "()V" )) != NULL)) { + if (!NSK_JNI_VERIFY(jni, (cid = jni->GetMethodID(cls, "", "()V" )) != NULL)) { NSK_COMPLAIN0("newObject: GetMethodID returned NULL\n\n"); nsk_jvmti_setFailStatus(); return NULL; } - if (!NSK_JNI_VERIFY(jni, ( result = - NSK_CPP_STUB3(NewObject, jni, - cls, - cid )) != NULL)) { + if (!NSK_JNI_VERIFY(jni, ( result = jni->NewObject(cls, cid)) != NULL)) { NSK_COMPLAIN0("newObject: NewObject returned NULL\n\n"); nsk_jvmti_setFailStatus(); @@ -174,31 +167,21 @@ Java_nsk_jvmti_scenarios_allocation_AP01_ap01t001_allocObject( JNIEnv* jni, jcla jmethodID cid; jobject result; - if (!NSK_JNI_VERIFY(jni, ( cid = - NSK_CPP_STUB4(GetMethodID, jni, - cls, - "", - "()V" )) != NULL)) { + if (!NSK_JNI_VERIFY(jni, ( cid = jni->GetMethodID(cls, "", "()V" )) != NULL)) { NSK_COMPLAIN0("allocObject: GetMethodID returned NULL\n\n"); nsk_jvmti_setFailStatus(); return NULL; } - if (!NSK_JNI_VERIFY(jni, ( result = - NSK_CPP_STUB2(AllocObject, jni, - cls )) != NULL)) { + if (!NSK_JNI_VERIFY(jni, ( result = jni->AllocObject(cls)) != NULL)) { NSK_COMPLAIN0("allocObject: AllocObject returned NULL\n\n"); nsk_jvmti_setFailStatus(); return NULL; } - if (!NSK_JNI_VERIFY_VOID(jni, - NSK_CPP_STUB4(CallNonvirtualVoidMethod, jni, - result, - cls, - cid))) { + if (!NSK_JNI_VERIFY_VOID(jni,jni->CallNonvirtualVoidMethod(result, cls, cid))) { NSK_COMPLAIN0("newObject: CallNonvirtualVoidMethod failed\n\n"); nsk_jvmti_setFailStatus(); @@ -225,10 +208,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Set tag for debugee class\n\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, - debugeeClass, - DEBUGEE_CLASS_TAG ))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(debugeeClass, DEBUGEE_CLASS_TAG))) { nsk_jvmti_setFailStatus(); return; } @@ -236,13 +216,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_UNTAGGED\n"); obj_count = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_UNTAGGED, - heapObjectCallback, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_UNTAGGED, + heapObjectCallback, + &user_data))) { nsk_jvmti_setFailStatus(); return; } @@ -261,11 +238,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_UNTAGGED\n"); obj_count = 0; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, - jvmti, - JVMTI_HEAP_OBJECT_UNTAGGED, - heapObjectCallback, - &user_data))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback, &user_data))) { nsk_jvmti_setFailStatus(); return; } @@ -282,12 +255,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverReachableObjects\n"); obj_count = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + &user_data))) { nsk_jvmti_setFailStatus(); return; } @@ -338,12 +309,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_object_free_events = 1; caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_object_free_events) @@ -358,16 +327,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.ObjectFree = &ObjectFree; callbacks.VMDeath = &VMDeath; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_OBJECT_FREE, + NULL))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_VM_DEATH, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp index 531adc20ec6..60e52d1dd3b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp @@ -91,9 +91,7 @@ Java_nsk_jvmti_scenarios_allocation_AP02_ap02t001_throwException( JNIEnv* jni, jclass exception_cls ) { jint result; - result = NSK_CPP_STUB3(ThrowNew, jni, - exception_cls, - "Got expected exception thrown from native code" ); + result = jni->ThrowNew(exception_cls, "Got expected exception thrown from native code" ); if (result != 0) { NSK_COMPLAIN1("throwException: Unable to throw exception in native code: %d\n\n", result ); nsk_jvmti_setFailStatus(); @@ -105,13 +103,10 @@ Java_nsk_jvmti_scenarios_allocation_AP02_ap02t001_throwException( JNIEnv* jni, static void runIterations (jvmtiEnv* jvmti, jclass testedClass, jint exp_count) { NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_EITHER\n"); obj_count = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - testedClass, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(testedClass, + JVMTI_HEAP_OBJECT_EITHER, + heapObjectCallback, + &user_data))) { nsk_jvmti_setFailStatus(); return; } @@ -130,11 +125,7 @@ static void runIterations (jvmtiEnv* jvmti, jclass testedClass, jint exp_count) NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_EITHER\n"); obj_count = 0; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, - jvmti, - JVMTI_HEAP_OBJECT_EITHER, - heapObjectCallback, - &user_data))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_EITHER, heapObjectCallback, &user_data))) { nsk_jvmti_setFailStatus(); return; } @@ -151,12 +142,10 @@ static void runIterations (jvmtiEnv* jvmti, jclass testedClass, jint exp_count) NSK_DISPLAY0("Calling IterateOverReachableObjects\n"); obj_count = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - NULL /*heapRootCallback*/, - stackReferenceCallback, - NULL /*objectReferenceCallback*/, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(NULL /*heapRootCallback*/, + stackReferenceCallback, + NULL /*objectReferenceCallback*/, + &user_data))) { nsk_jvmti_setFailStatus(); return; } @@ -189,15 +178,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; } - if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)jni->NewGlobalRef(testedClass)) != NULL)) return; NSK_DISPLAY0("Set tag for tested class\n\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, - testedClass, - TESTED_CLASS_TAG ))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedClass, TESTED_CLASS_TAG))) { nsk_jvmti_setFailStatus(); return; } @@ -212,7 +197,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { runIterations (jvmti, testedClass, 2); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass)); + NSK_TRACE(jni->DeleteGlobalRef(testedClass)); NSK_DISPLAY0("Let debugee to finish\n"); if (!NSK_VERIFY(nsk_jvmti_resumeSync())) @@ -242,12 +227,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp index edd37b434d8..d5b16bef9d3 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp @@ -90,8 +90,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind, JNIEXPORT void JNICALL Java_nsk_jvmti_scenarios_allocation_AP03_ap03t001_setTag( JNIEnv* jni, jobject obj, jlong tag) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, - jvmti, obj, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, tag))) { nsk_jvmti_setFailStatus(); } } @@ -117,23 +116,17 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } NSK_DISPLAY0("Set tag for debugee class\n\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, - debugeeClass, - DEBUGEE_CLASS_TAG ))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(debugeeClass, DEBUGEE_CLASS_TAG))) { nsk_jvmti_setFailStatus(); break; } NSK_DISPLAY0("Calling IterateOverInstancesOfClass with filter JVMTI_HEAP_OBJECT_TAGGED\n"); obj_count = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, - jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + &user_data))) { nsk_jvmti_setFailStatus(); break; } @@ -151,11 +144,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverHeap with filter JVMTI_HEAP_OBJECT_TAGGED\n"); obj_count = 0; if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, - jvmti, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - &user_data))) { + jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, heapObjectCallback, &user_data))) { nsk_jvmti_setFailStatus(); break; } @@ -171,18 +160,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } if (!NSK_JNI_VERIFY(jni, (fid = - NSK_CPP_STUB4(GetStaticFieldID, jni, - debugeeClass, - "catcher", - DEBUGEE_SIGNATURE)) != NULL )) { + jni->GetStaticFieldID(debugeeClass, "catcher", DEBUGEE_SIGNATURE)) != NULL )) { nsk_jvmti_setFailStatus(); break; } if (!NSK_JNI_VERIFY(jni, (catcher = - NSK_CPP_STUB3(GetStaticObjectField, jni, - debugeeClass, - fid )) != NULL )) { + jni->GetStaticObjectField(debugeeClass, fid)) != NULL )) { NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'catcher' field value\n\n"); nsk_jvmti_setFailStatus(); break; @@ -190,11 +174,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject\n"); obj_count = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, - catcher, - objectReferenceCallback, - &user_data))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(catcher, + objectReferenceCallback, + &user_data))) { nsk_jvmti_setFailStatus(); break; } @@ -239,12 +221,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_generate_object_free_events = 1; caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_generate_object_free_events) @@ -258,13 +238,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.ObjectFree = &ObjectFree; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode, - jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_OBJECT_FREE, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done\n\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp index 84aab03ceb6..9e89ca1c5f6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp @@ -66,30 +66,26 @@ static jrawMonitorID counterMonitor_ptr = NULL; static void increaseCounter(volatile int* counterPtr) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } (*counterPtr)++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } } static void setCounter(volatile int* counterPtr, int value) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } *counterPtr = value; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } } @@ -97,15 +93,13 @@ static void setCounter(volatile int* counterPtr, int value) { static int getCounter(volatile int* counterPtr) { int result; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } result = *counterPtr; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -248,7 +242,7 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_setTag( JNIEnv* jni, jobject target, /* object to be tagged */ jlong tag ) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) { nsk_jvmti_setFailStatus(); } } @@ -258,7 +252,7 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_forceGC( JNIEnv* jni, jclass klass) { NSK_DISPLAY0(" run: ForceGarbageCollection\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB1(ForceGarbageCollection, jvmti))) { + if (!NSK_JVMTI_VERIFY(jvmti->ForceGarbageCollection())) { nsk_jvmti_setFailStatus(); } } @@ -273,11 +267,9 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverHeap( JNIEnv* jn setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverHeap...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverHeap finished.\n"); @@ -303,12 +295,10 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverReachableObjects setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverReachableObjects...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverReachableObjects finished.\n"); @@ -334,12 +324,10 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverInstancesOfClass setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverInstancesOfClass...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverInstancesOfClass finished.\n"); @@ -363,27 +351,23 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t001_runIterateOverObjectsReachable int count = 0; if (!NSK_JNI_VERIFY(jni, (root = - NSK_CPP_STUB3(GetStaticObjectField, jni, - debugeeClass, - rootFieldID )) != NULL )) { + jni->GetStaticObjectField(debugeeClass, rootFieldID)) != NULL )) { NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'root' field value\n\n"); nsk_jvmti_setFailStatus(); return; } // release secondary lock - NSK_CPP_STUB3(CallStaticVoidMethod, jni, debugeeClass, unlockSecondaryID); + jni->CallStaticVoidMethod(debugeeClass, unlockSecondaryID); setCounter(&errorCount, 0); setCounter(&eventCount, 0); setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, - root, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(root, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverObjectsReachableFromObject finished.\n"); @@ -413,26 +397,19 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; } - if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL)) return; NSK_DISPLAY1("Find ID of 'root' field: %s\n", ROOT_SIGNATURE); if (!NSK_JNI_VERIFY(jni, (rootFieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, - debugeeClass, - "root", - ROOT_SIGNATURE)) != NULL )) { + jni->GetStaticFieldID(debugeeClass, "root", ROOT_SIGNATURE)) != NULL )) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY1("Find ID of 'unlockSecondary' method: %s\n", ROOT_SIGNATURE); if (!NSK_JNI_VERIFY(jni, (unlockSecondaryID = - NSK_CPP_STUB4(GetStaticMethodID, jni, - debugeeClass, - "unlockSecondary", - "()V")) != NULL )) { + jni->GetStaticMethodID(debugeeClass, "unlockSecondary", "()V")) != NULL )) { nsk_jvmti_setFailStatus(); return; } @@ -448,8 +425,8 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { nsk_jvmti_enableEvents(JVMTI_DISABLE, eventsCount, events, NULL); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass)); - NSK_TRACE(NSK_CPP_STUB2(DestroyRawMonitor, jvmti, counterMonitor_ptr)); + NSK_TRACE(jni->DeleteGlobalRef(debugeeClass)); + NSK_TRACE(jvmti->DestroyRawMonitor(counterMonitor_ptr)); NSK_DISPLAY0("Let debugee to finish\n"); if (!NSK_VERIFY(nsk_jvmti_resumeSync())) @@ -477,8 +454,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "counterMonitor", &counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("counterMonitor", &counterMonitor_ptr))) { return JNI_ERR; } @@ -487,12 +463,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_generate_object_free_events = 1; caps.can_generate_garbage_collection_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) @@ -509,8 +483,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { callbacks.ObjectFree = &ObjectFree; callbacks.GarbageCollectionStart = &GarbageCollectionStart; callbacks.GarbageCollectionFinish = &GarbageCollectionFinish; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done.\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp index 530fea33657..bb146389062 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp @@ -59,30 +59,26 @@ static jrawMonitorID counterMonitor_ptr = NULL; static void increaseCounter(volatile int* counterPtr) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } (*counterPtr)++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } } static void setCounter(volatile int* counterPtr, int value) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } *counterPtr = value; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } } @@ -90,15 +86,13 @@ static void setCounter(volatile int* counterPtr, int value) { static int getCounter(volatile int* counterPtr) { int result; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } result = *counterPtr; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -238,7 +232,7 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t002_setTag( JNIEnv* jni, jobject target, /* object to be tagged */ jlong tag ) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) { nsk_jvmti_setFailStatus(); } } @@ -253,11 +247,9 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t002_runIterateOverHeap( JNIEnv* jn setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverHeap...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverHeap finished.\n"); @@ -284,12 +276,10 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t002_runIterateOverReachableObjects setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverReachableObjects...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverReachableObjects finished.\n"); @@ -316,12 +306,10 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t002_runIterateOverInstancesOfClass setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverInstancesOfClass...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverInstancesOfClass finished.\n"); @@ -345,9 +333,7 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t002_runIterateOverObjectsReachable int count = 0; if (!NSK_JNI_VERIFY(jni, (root = - NSK_CPP_STUB3(GetStaticObjectField, jni, - debugeeClass, - rootFieldID )) != NULL )) { + jni->GetStaticObjectField(debugeeClass, rootFieldID)) != NULL )) { NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'root' field value\n\n"); nsk_jvmti_setFailStatus(); return; @@ -358,11 +344,9 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t002_runIterateOverObjectsReachable setCounter(&iterationCount, 0); NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, - root, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(root, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverObjectsReachableFromObject finished.\n"); @@ -393,35 +377,25 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; } - if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL)) return; NSK_DISPLAY1("Find ID of 'root' field: %s\n", ROOT_SIGNATURE); if (!NSK_JNI_VERIFY(jni, (rootFieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, - debugeeClass, - "root", - ROOT_SIGNATURE)) != NULL )) { + jni->GetStaticFieldID(debugeeClass, "root", ROOT_SIGNATURE)) != NULL )) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY0("Find ID of 'modified' field\n"); if (!NSK_JNI_VERIFY(jni, (modifiedFieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, - debugeeClass, - "modified", - "I")) != NULL )) { + jni->GetStaticFieldID(debugeeClass, "modified", "I")) != NULL )) { nsk_jvmti_setFailStatus(); return; } NSK_DISPLAY0("Set FieldModification watchpoint for 'modified' field\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetFieldModificationWatch, jvmti, - debugeeClass, - modifiedFieldID))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetFieldModificationWatch(debugeeClass, modifiedFieldID))) { nsk_jvmti_setFailStatus(); return; } @@ -434,8 +408,8 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout))) return; - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass)); - NSK_TRACE(NSK_CPP_STUB2(DestroyRawMonitor, jvmti, counterMonitor_ptr)); + NSK_TRACE(jni->DeleteGlobalRef(debugeeClass)); + NSK_TRACE(jvmti->DestroyRawMonitor(counterMonitor_ptr)); NSK_DISPLAY0("Let debugee to finish\n"); if (!NSK_VERIFY(nsk_jvmti_resumeSync())) @@ -463,8 +437,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "counterMonitor", &counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("counterMonitor", &counterMonitor_ptr))) { return JNI_ERR; } @@ -472,12 +445,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { caps.can_tag_objects = 1; caps.can_generate_field_modification_events = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) @@ -490,18 +461,15 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { (void) memset(&callbacks, 0, sizeof(callbacks)); callbacks.FieldModification = &FieldModification; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, - jvmti, &callbacks, sizeof(callbacks)))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks)))) return JNI_ERR; NSK_DISPLAY0("setting event callbacks done.\n"); NSK_DISPLAY0("enabling JVMTI events ...\n"); - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4( SetEventNotificationMode, - jvmti, - JVMTI_ENABLE, - JVMTI_EVENT_FIELD_MODIFICATION, - NULL))) + if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, + JVMTI_EVENT_FIELD_MODIFICATION, + NULL))) return JNI_ERR; NSK_DISPLAY0("enabling the events done.\n"); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp index 81f541b3ad9..b9d43e569d6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp @@ -61,30 +61,26 @@ static jrawMonitorID counterMonitor_ptr = NULL; static void increaseCounter(volatile int* counterPtr) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } (*counterPtr)++; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } } static void setCounter(volatile int* counterPtr, int value) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } *counterPtr = value; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } } @@ -92,15 +88,13 @@ static void setCounter(volatile int* counterPtr, int value) { static int getCounter(volatile int* counterPtr) { int result; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } result = *counterPtr; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(counterMonitor_ptr))) { nsk_jvmti_setFailStatus(); } @@ -113,16 +107,13 @@ void notifyThread() { /* enter and notify runLock */ { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, runLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(runLock))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, jvmti, runLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorNotify(runLock))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, runLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(runLock))) { nsk_jvmti_setFailStatus(); } } @@ -227,12 +218,8 @@ void JNICALL agent_start(jvmtiEnv* jvmti, JNIEnv* jni, void *p) { { jlong tag = (jlong)1; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB6(GetObjectsWithTags, jvmti, - 1, &tag, - &taggedObjectsCount, - &taggedObjectsList, - NULL))) { + if (!NSK_JVMTI_VERIFY(jvmti->GetObjectsWithTags( + 1, &tag, &taggedObjectsCount, &taggedObjectsList, NULL))) { nsk_jvmti_setFailStatus(); return; } @@ -246,23 +233,19 @@ void JNICALL agent_start(jvmtiEnv* jvmti, JNIEnv* jni, void *p) { } /* enter runLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, runLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(runLock))) { nsk_jvmti_setFailStatus(); } /* enter and notify startLock */ { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, startLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(startLock))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, jvmti, startLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorNotify(startLock))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, startLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(startLock))) { nsk_jvmti_setFailStatus(); } } @@ -271,12 +254,10 @@ void JNICALL agent_start(jvmtiEnv* jvmti, JNIEnv* jni, void *p) { /* wait on runLock */ { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, jvmti, runLock, timeout))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(runLock, timeout))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, runLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(runLock))) { nsk_jvmti_setFailStatus(); } } @@ -288,8 +269,7 @@ void JNICALL agent_start(jvmtiEnv* jvmti, JNIEnv* jni, void *p) { int modified = 0; int i; for (i = 0; i < taggedObjectsCount; i+=2) { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(SetTag, jvmti, taggedObjectsList[i], 0))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(taggedObjectsList[i], 0))) { nsk_jvmti_setFailStatus(); continue; } @@ -302,24 +282,20 @@ void JNICALL agent_start(jvmtiEnv* jvmti, JNIEnv* jni, void *p) { /* destroy objects list */ { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)taggedObjectsList))) { + if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)taggedObjectsList))) { nsk_jvmti_setFailStatus(); } } /* enter and notify endLock */ { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, endLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(endLock))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorNotify, jvmti, endLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorNotify(endLock))) { nsk_jvmti_setFailStatus(); } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, endLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(endLock))) { nsk_jvmti_setFailStatus(); } } @@ -333,31 +309,24 @@ static int startThread(JNIEnv* jni, jthread threadObj) { int success = NSK_TRUE; /* enter startLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, startLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(startLock))) { nsk_jvmti_setFailStatus(); } /* start thread */ if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(RunAgentThread, jvmti, - threadObj, - agent_start, - NULL, - JVMTI_THREAD_NORM_PRIORITY))) { + jvmti->RunAgentThread(threadObj, agent_start, NULL, JVMTI_THREAD_NORM_PRIORITY))) { success = NSK_FALSE; nsk_jvmti_setFailStatus(); } else { /* wait on startLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, jvmti, startLock, timeout))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(startLock, timeout))) { nsk_jvmti_setFailStatus(); } } /* exit starLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, startLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(startLock))) { nsk_jvmti_setFailStatus(); } @@ -370,26 +339,17 @@ static jthread newThreadObj(JNIEnv* jni) { jmethodID cid; jthread result = NULL; - if (!NSK_JNI_VERIFY(jni, (thrClass = - NSK_CPP_STUB2(FindClass, jni, - "java/lang/Thread")) != NULL )) { + if (!NSK_JNI_VERIFY(jni, (thrClass = jni->FindClass("java/lang/Thread")) != NULL )) { nsk_jvmti_setFailStatus(); return result; } - if (!NSK_JNI_VERIFY(jni, (cid = - NSK_CPP_STUB4(GetMethodID, jni, - thrClass, - "", - "()V")) != NULL )) { + if (!NSK_JNI_VERIFY(jni, (cid = jni->GetMethodID(thrClass, "", "()V")) != NULL )) { nsk_jvmti_setFailStatus(); return result; } - if (!NSK_JNI_VERIFY(jni, (result = - NSK_CPP_STUB3(NewObject, jni, - thrClass, - cid )) != NULL )) { + if (!NSK_JNI_VERIFY(jni, (result = jni->NewObject(thrClass, cid)) != NULL )) { nsk_jvmti_setFailStatus(); return result; } @@ -412,8 +372,7 @@ static int prepareToIteration (JNIEnv* jni) { } /* enter endLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorEnter, jvmti, endLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(endLock))) { nsk_jvmti_setFailStatus(); } @@ -430,14 +389,12 @@ static void afterIteration (JNIEnv* jni) { NSK_DISPLAY0("Wait for new agent thread to complete\n"); /* wait on endLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(RawMonitorWait, jvmti, endLock, timeout))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(endLock, timeout))) { nsk_jvmti_setFailStatus(); } /* exit endLock */ - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB2(RawMonitorExit, jvmti, endLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(endLock))) { nsk_jvmti_setFailStatus(); } } @@ -450,7 +407,7 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t003_setTag( JNIEnv* jni, jobject target, /* object to be tagged */ jlong tag ) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) { nsk_jvmti_setFailStatus(); } } @@ -465,11 +422,9 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t003_runIterateOverHeap( JNIEnv* jn return; NSK_DISPLAY0("Calling IterateOverHeap...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverHeap, jvmti, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverHeap finished.\n"); @@ -497,12 +452,10 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t003_runIterateOverReachableObjects return; NSK_DISPLAY0("Calling IterateOverReachableObjects...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverReachableObjects finished.\n"); @@ -530,12 +483,10 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t003_runIterateOverInstancesOfClass return; NSK_DISPLAY0("Calling IterateOverInstancesOfClass...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, - debugeeClass, - JVMTI_HEAP_OBJECT_TAGGED, - heapObjectCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(debugeeClass, + JVMTI_HEAP_OBJECT_TAGGED, + heapObjectCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverInstancesOfClass finished.\n"); @@ -561,9 +512,7 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t003_runIterateOverObjectsReachable int found = 0; if (!NSK_JNI_VERIFY(jni, (root = - NSK_CPP_STUB3(GetStaticObjectField, jni, - debugeeClass, - rootFieldID )) != NULL )) { + jni->GetStaticObjectField(debugeeClass, rootFieldID)) != NULL )) { NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'root' field value\n\n"); nsk_jvmti_setFailStatus(); return; @@ -573,11 +522,9 @@ Java_nsk_jvmti_scenarios_allocation_AP04_ap04t003_runIterateOverObjectsReachable return; NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject...\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, - root, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(root, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } NSK_DISPLAY0("IterateOverObjectsReachableFromObject finished.\n"); @@ -609,16 +556,12 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { return; } - if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass) - NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL)) return; NSK_DISPLAY1("Find ID of 'root' field: %s\n", ROOT_SIGNATURE); if (!NSK_JNI_VERIFY(jni, (rootFieldID = - NSK_CPP_STUB4(GetStaticFieldID, jni, - debugeeClass, - "root", - ROOT_SIGNATURE)) != NULL )) { + jni->GetStaticFieldID(debugeeClass, "root", ROOT_SIGNATURE)) != NULL )) { nsk_jvmti_setFailStatus(); return; } @@ -631,11 +574,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout))) return; - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass)); - NSK_TRACE(NSK_CPP_STUB2(DestroyRawMonitor, jvmti, counterMonitor_ptr)); - NSK_TRACE(NSK_CPP_STUB2(DestroyRawMonitor, jvmti, startLock)); - NSK_TRACE(NSK_CPP_STUB2(DestroyRawMonitor, jvmti, runLock)); - NSK_TRACE(NSK_CPP_STUB2(DestroyRawMonitor, jvmti, endLock)); + NSK_TRACE(jni->DeleteGlobalRef(debugeeClass)); + NSK_TRACE(jvmti->DestroyRawMonitor(counterMonitor_ptr)); + NSK_TRACE(jvmti->DestroyRawMonitor(startLock)); + NSK_TRACE(jvmti->DestroyRawMonitor(runLock)); + NSK_TRACE(jvmti->DestroyRawMonitor(endLock)); NSK_DISPLAY0("Let debugee to finish\n"); if (!NSK_VERIFY(nsk_jvmti_resumeSync())) @@ -663,33 +606,27 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL)) return JNI_ERR; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "counterMonitor", &counterMonitor_ptr))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("counterMonitor", &counterMonitor_ptr))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "startLock", &startLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("startLock", &startLock))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "runLock", &runLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("runLock", &runLock))) { return JNI_ERR; } - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB3(CreateRawMonitor, jvmti, "endLock", &endLock))) { + if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("endLock", &endLock))) { return JNI_ERR; } memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp index bb75ee89900..7c87491cb10 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp @@ -105,15 +105,14 @@ Java_nsk_jvmti_scenarios_allocation_AP05_ap05t001_setTag( JNIEnv* jni, jobject target, jlong tag ) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) { nsk_jvmti_setFailStatus(); } } JNIEXPORT void JNICALL Java_nsk_jvmti_scenarios_allocation_AP05_ap05t001_setReferrer( JNIEnv* jni, jclass klass, jobject ref) { - if (!NSK_JNI_VERIFY(jni, (referrer = - NSK_CPP_STUB2(NewGlobalRef, jni, ref)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (referrer = jni->NewGlobalRef(ref)) != NULL)) nsk_jvmti_setFailStatus(); } @@ -130,12 +129,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { staticFieldsCount = 0; instanceFieldsCount = 0; NSK_DISPLAY0("\nCalling IterateOverReachableObjects\n"); - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); break; } @@ -156,12 +153,8 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { instanceFieldsCount = 0; NSK_DISPLAY0("\nCalling IterateOverObjectsReachableFromObject\n"); { - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - referrer, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject( + referrer, objectReferenceCallback, NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); break; } @@ -180,7 +173,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { } - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, referrer)); + NSK_TRACE(jni->DeleteGlobalRef(referrer)); } while (0); @@ -213,12 +206,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp index a0cd4bc828e..4b18a8e4c86 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp @@ -103,7 +103,7 @@ Java_nsk_jvmti_scenarios_allocation_AP05_ap05t002_setTag( JNIEnv* jni, jobject target, jlong tag ) { - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) { + if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) { nsk_jvmti_setFailStatus(); } } @@ -111,8 +111,7 @@ Java_nsk_jvmti_scenarios_allocation_AP05_ap05t002_setTag( JNIEnv* jni, JNIEXPORT void JNICALL Java_nsk_jvmti_scenarios_allocation_AP05_ap05t002_setReferrer( JNIEnv* jni, jclass klass, jobject ref, jint caseNum) { caseNumber = caseNum; - if (!NSK_JNI_VERIFY(jni, (referrer = - NSK_CPP_STUB2(NewGlobalRef, jni, ref)) != NULL)) + if (!NSK_JNI_VERIFY(jni, (referrer = jni->NewGlobalRef(ref)) != NULL)) nsk_jvmti_setFailStatus(); } @@ -120,12 +119,10 @@ static void runCase() { NSK_DISPLAY0("\nCalling IterateOverReachableObjects\n"); forthRef = 0; backRef = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB5(IterateOverReachableObjects, jvmti, - heapRootCallback, - stackReferenceCallback, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback, + stackReferenceCallback, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } if (forthRef != 1) { @@ -142,12 +139,9 @@ static void runCase() { NSK_DISPLAY0("\nCalling IterateOverObjectsReachableFromObject\n"); forthRef = 0; backRef = 0; - if (!NSK_JVMTI_VERIFY( - NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, - jvmti, - referrer, - objectReferenceCallback, - NULL /*user_data*/))) { + if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(referrer, + objectReferenceCallback, + NULL /*user_data*/))) { nsk_jvmti_setFailStatus(); } if (forthRef != 1) { @@ -175,7 +169,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("CASE #1\n"); runCase(); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, referrer)); + NSK_TRACE(jni->DeleteGlobalRef(referrer)); if (!NSK_VERIFY(nsk_jvmti_resumeSync())) return; if (!NSK_VERIFY(nsk_jvmti_waitForSync(timeout))) @@ -184,7 +178,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) { NSK_DISPLAY0("CASE #2\n"); runCase(); - NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, referrer)); + NSK_TRACE(jni->DeleteGlobalRef(referrer)); } while (0); NSK_DISPLAY0("Let debugee to finish\n"); @@ -216,12 +210,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) { memset(&caps, 0, sizeof(jvmtiCapabilities)); caps.can_tag_objects = 1; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) return JNI_ERR; - if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, - jvmti, &caps))) + if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps))) return JNI_ERR; if (!caps.can_tag_objects) From cb3fe46b955b5365b1401e94064787fb102120d2 Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Tue, 9 Oct 2018 07:06:32 +0100 Subject: [PATCH 040/124] 8211825: ModuleLayer.defineModulesWithXXX does not setup delegation when module reads automatic module Reviewed-by: mchung --- .../share/classes/java/lang/Module.java | 11 +- .../classes/jdk/internal/loader/Loader.java | 53 +++--- .../jdk/internal/loader/LoaderPool.java | 4 +- .../automatic/AutomaticModulesTest.java | 152 ++++++++++++++++++ .../ModuleLayer/automatic/src/alib/q/Lib.java | 31 ++++ .../automatic/src/m/module-info.java | 25 +++ .../ModuleLayer/automatic/src/m/p/Main.java | 32 ++++ 7 files changed, 283 insertions(+), 25 deletions(-) create mode 100644 test/jdk/java/lang/ModuleLayer/automatic/AutomaticModulesTest.java create mode 100644 test/jdk/java/lang/ModuleLayer/automatic/src/alib/q/Lib.java create mode 100644 test/jdk/java/lang/ModuleLayer/automatic/src/m/module-info.java create mode 100644 test/jdk/java/lang/ModuleLayer/automatic/src/m/p/Main.java diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java index 6d474b1ad5c..e338b402342 100644 --- a/src/java.base/share/classes/java/lang/Module.java +++ b/src/java.base/share/classes/java/lang/Module.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -477,7 +477,7 @@ public final class Module implements AnnotatedElement { * * @see ModuleDescriptor#opens() * @see #addOpens(String,Module) - * @see AccessibleObject#setAccessible(boolean) + * @see java.lang.reflect.AccessibleObject#setAccessible(boolean) * @see java.lang.invoke.MethodHandles#privateLookupIn */ public boolean isOpen(String pn, Module other) { @@ -747,7 +747,7 @@ public final class Module implements AnnotatedElement { * package to at least the caller's module * * @see #isOpen(String,Module) - * @see AccessibleObject#setAccessible(boolean) + * @see java.lang.reflect.AccessibleObject#setAccessible(boolean) * @see java.lang.invoke.MethodHandles#privateLookupIn */ @CallerSensitive @@ -1061,7 +1061,10 @@ public final class Module implements AnnotatedElement { * @return a map of module name to runtime {@code Module} * * @throws IllegalArgumentException - * If defining any of the modules to the VM fails + * If the function maps a module to the null or platform class loader + * @throws IllegalStateException + * If the module cannot be defined to the VM or its packages overlap + * with another module mapped to the same class loader */ static Map defineModules(Configuration cf, Function clf, diff --git a/src/java.base/share/classes/jdk/internal/loader/Loader.java b/src/java.base/share/classes/jdk/internal/loader/Loader.java index d65b8acc229..5faf2de9102 100644 --- a/src/java.base/share/classes/jdk/internal/loader/Loader.java +++ b/src/java.base/share/classes/jdk/internal/loader/Loader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -198,7 +198,6 @@ public final class Loader extends SecureClassLoader { this.acc = AccessController.getContext(); } - /** * Completes initialization of this Loader. This method populates * remotePackageToLoader with the packages of the remote modules, where @@ -253,25 +252,25 @@ public final class Loader extends SecureClassLoader { } // find the packages that are exported to the target module - String target = resolvedModule.name(); ModuleDescriptor descriptor = other.reference().descriptor(); - for (ModuleDescriptor.Exports e : descriptor.exports()) { - boolean delegate; - if (e.isQualified()) { - // qualified export in same configuration - delegate = (other.configuration() == cf) - && e.targets().contains(target); - } else { - // unqualified - delegate = true; - } + if (descriptor.isAutomatic()) { + ClassLoader l = loader; + descriptor.packages().forEach(pn -> remotePackage(pn, l)); + } else { + String target = resolvedModule.name(); + for (ModuleDescriptor.Exports e : descriptor.exports()) { + boolean delegate; + if (e.isQualified()) { + // qualified export in same configuration + delegate = (other.configuration() == cf) + && e.targets().contains(target); + } else { + // unqualified + delegate = true; + } - if (delegate) { - String pn = e.source(); - ClassLoader l = remotePackageToLoader.putIfAbsent(pn, loader); - if (l != null && l != loader) { - throw new IllegalArgumentException("Package " - + pn + " cannot be imported from multiple loaders"); + if (delegate) { + remotePackage(e.source(), loader); } } } @@ -282,6 +281,22 @@ public final class Loader extends SecureClassLoader { return this; } + /** + * Adds to remotePackageToLoader so that an attempt to load a class in + * the package delegates to the given class loader. + * + * @throws IllegalStateException + * if the package is already mapped to a different class loader + */ + private void remotePackage(String pn, ClassLoader loader) { + ClassLoader l = remotePackageToLoader.putIfAbsent(pn, loader); + if (l != null && l != loader) { + throw new IllegalStateException("Package " + + pn + " cannot be imported from multiple loaders"); + } + } + + /** * Find the layer corresponding to the given configuration in the tree * of layers rooted at the given parent. diff --git a/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java b/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java index 1b6bb197b60..c0bdecf6807 100644 --- a/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java +++ b/src/java.base/share/classes/jdk/internal/loader/LoaderPool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,7 +46,7 @@ public final class LoaderPool { /** * Creates a pool of class loaders. Each module in the given configuration - * will be loaded its own class loader in the pool. The class loader is + * is mapped to its own class loader in the pool. The class loader is * created with the given parent class loader as its parent. */ public LoaderPool(Configuration cf, diff --git a/test/jdk/java/lang/ModuleLayer/automatic/AutomaticModulesTest.java b/test/jdk/java/lang/ModuleLayer/automatic/AutomaticModulesTest.java new file mode 100644 index 00000000000..758a1fb6652 --- /dev/null +++ b/test/jdk/java/lang/ModuleLayer/automatic/AutomaticModulesTest.java @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8211825 + * @modules jdk.compiler + * @library /test/lib + * @build jdk.test.lib.compiler.CompilerUtils jdk.test.lib.util.JarUtils + * @run testng/othervm AutomaticModulesTest + * @summary Tests automatic modules in module layers + */ + +import java.nio.file.Files; +import java.nio.file.Path; +import java.lang.ModuleLayer.Controller; +import java.lang.module.*; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Set; + +import jdk.test.lib.compiler.CompilerUtils; +import jdk.test.lib.util.JarUtils; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +/** + * This test uses two modules: + * m requires alib and has an entry point p.Main + * alib is an automatic module + */ + +@Test +public class AutomaticModulesTest { + + private static final String TEST_SRC = System.getProperty("test.src"); + + private static final Path CLASSES = Path.of("classes"); + private static final Path LIB = Path.of("lib"); + private static final Path MODS = Path.of("mods"); + + @BeforeTest + public void setup() throws Exception { + // javac -d classes src/alib/** + // jar cf lib/alib.jar -C classes . + Files.createDirectory(CLASSES); + assertTrue(CompilerUtils.compile(Path.of(TEST_SRC, "src", "alib"), CLASSES)); + JarUtils.createJarFile(LIB.resolve("alib.jar"), CLASSES); + + // javac -p lib -d mods/m - src/m/** + Path src = Path.of(TEST_SRC, "src", "m"); + Path output = Files.createDirectories(MODS.resolve("m")); + assertTrue(CompilerUtils.compile(src, output, "-p", LIB.toString())); + } + + /** + * Create a module layer with modules m and alib mapped to the same class + * loader. + */ + public void testOneLoader() throws Exception { + Configuration cf = ModuleLayer.boot() + .configuration() + .resolve(ModuleFinder.of(), ModuleFinder.of(MODS, LIB), Set.of("m")); + ResolvedModule m = cf.findModule("m").orElseThrow(); + ResolvedModule alib = cf.findModule("alib").orElseThrow(); + assertTrue(m.reads().contains(alib)); + assertTrue(alib.reference().descriptor().isAutomatic()); + ModuleLayer bootLayer = ModuleLayer.boot(); + ClassLoader scl = ClassLoader.getSystemClassLoader(); + Controller controller = ModuleLayer.defineModulesWithOneLoader(cf, List.of(bootLayer), scl); + invokeMain(controller, "m/p.Main"); + } + + /** + * Create a module layer with modules m and alib mapped to different class + * loaders. This will test that L(m) delegates to L(alib) in the same layer. + */ + public void testManyLoaders() throws Exception { + Configuration cf = ModuleLayer.boot() + .configuration() + .resolve(ModuleFinder.of(), ModuleFinder.of(MODS, LIB), Set.of("m")); + ResolvedModule m = cf.findModule("m").orElseThrow(); + ResolvedModule alib = cf.findModule("alib").orElseThrow(); + assertTrue(m.reads().contains(alib)); + assertTrue(alib.reference().descriptor().isAutomatic()); + ModuleLayer bootLayer = ModuleLayer.boot(); + ClassLoader scl = ClassLoader.getSystemClassLoader(); + Controller controller = ModuleLayer.defineModulesWithManyLoaders(cf, List.of(bootLayer), scl); + invokeMain(controller, "m/p.Main"); + } + + /** + * Create a module layer with alib and another module layer with m. + * This will test that L(m) delegates to L(alib) in a parent layer. + */ + public void testAutomaticModuleInParent() throws Exception { + ModuleLayer bootLayer = ModuleLayer.boot(); + ClassLoader scl = ClassLoader.getSystemClassLoader(); + + // configuration/layer containing alib + Configuration cf1 = bootLayer + .configuration() + .resolve(ModuleFinder.of(), ModuleFinder.of(LIB), Set.of("alib")); + ModuleLayer layer1 = bootLayer.defineModulesWithOneLoader(cf1, scl); + + // configuration/layer containing m + Configuration cf2 = cf1.resolve(ModuleFinder.of(), ModuleFinder.of(MODS), Set.of("m")); + Controller controller = ModuleLayer.defineModulesWithOneLoader(cf2, List.of(layer1), scl); + + invokeMain(controller, "m/p.Main"); + } + + /** + * Invokes the main method of the given entry point (module-name/class-name) + */ + private void invokeMain(Controller controller, String entry) throws Exception { + String[] s = entry.split("/"); + String moduleName = s[0]; + String className = s[1]; + int pos = className.lastIndexOf('.'); + String packageName = className.substring(0, pos); + ModuleLayer layer = controller.layer(); + Module module = layer.findModule(moduleName).orElseThrow(); + controller.addExports(module, packageName, this.getClass().getModule()); + ClassLoader loader = layer.findLoader(moduleName); + Class c = loader.loadClass(className); + Method m = c.getMethod("main", String[].class); + m.invoke(null, (Object)new String[0]); + } +} diff --git a/test/jdk/java/lang/ModuleLayer/automatic/src/alib/q/Lib.java b/test/jdk/java/lang/ModuleLayer/automatic/src/alib/q/Lib.java new file mode 100644 index 00000000000..ce772f0bcb8 --- /dev/null +++ b/test/jdk/java/lang/ModuleLayer/automatic/src/alib/q/Lib.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package q; + +public class Lib { + private Lib() { } + + public static String generate() { + return "something useful"; + } +} diff --git a/test/jdk/java/lang/ModuleLayer/automatic/src/m/module-info.java b/test/jdk/java/lang/ModuleLayer/automatic/src/m/module-info.java new file mode 100644 index 00000000000..b6fbef7ddec --- /dev/null +++ b/test/jdk/java/lang/ModuleLayer/automatic/src/m/module-info.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +module m { + requires alib; +} diff --git a/test/jdk/java/lang/ModuleLayer/automatic/src/m/p/Main.java b/test/jdk/java/lang/ModuleLayer/automatic/src/m/p/Main.java new file mode 100644 index 00000000000..53ac92220bd --- /dev/null +++ b/test/jdk/java/lang/ModuleLayer/automatic/src/m/p/Main.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package p; + +import q.Lib; + +public class Main { + public static void main(String[] args) { + String s = Lib.generate(); + System.out.println(s); + } +} From 2db7ed189585c5bcfff2c0d6ee8f7900fd6a6880 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 2 Oct 2018 17:17:43 +0200 Subject: [PATCH 041/124] 8211387: [Zero] atomic_copy64: Use ldrexd for atomic reads on ARMv7 Reviewed-by: dholmes, aph --- src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp index a018b6114d4..3c13b5b7d2b 100644 --- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp @@ -54,6 +54,16 @@ "std %0, %1\n" : "=&f"(tmp), "=Q"(*(volatile double*)dst) : "Q"(*(volatile double*)src)); +#elif defined(__ARM_ARCH_7A__) + // Note that a ldrexd + clrex combination is only needed for + // correctness on the OS level (context-switches). In this + // case, clrex *may* be beneficial for performance. For now + // don't bother with clrex as this is Zero. + jlong tmp; + asm volatile ("ldrexd %0, [%1]\n" + : "=r"(tmp) + : "r"(src), "m"(src)); + *(jlong *) dst = tmp; #else *(jlong *) dst = *(const jlong *) src; #endif From e61252dc278fd44345c5377811552ed6760ffcf0 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Tue, 9 Oct 2018 11:44:00 +0100 Subject: [PATCH 042/124] 8211920: Close server socket and cleanups in test/jdk/javax/naming/module/RunBasic.java Reviewed-by: dfuchs --- test/jdk/javax/naming/module/RunBasic.java | 11 +- .../src/test/test/ConnectWithAuthzId.java | 131 +++++----- .../module/src/test/test/ConnectWithFoo.java | 93 ++++---- .../module/src/test/test/ReadByUrl.java | 95 ++++---- .../module/src/test/test/StoreFruit.java | 166 +++++++------ .../module/src/test/test/StoreObject.java | 161 +++++++------ .../module/src/test/test/StorePerson.java | 224 +++++++++--------- .../module/src/test/test/StoreRemote.java | 132 ++++++----- 8 files changed, 541 insertions(+), 472 deletions(-) diff --git a/test/jdk/javax/naming/module/RunBasic.java b/test/jdk/javax/naming/module/RunBasic.java index 54b77e23883..0fd9d2b28aa 100644 --- a/test/jdk/javax/naming/module/RunBasic.java +++ b/test/jdk/javax/naming/module/RunBasic.java @@ -27,8 +27,10 @@ import jdk.test.lib.compiler.CompilerUtils; import jdk.test.lib.process.ProcessTools; import java.io.IOException; +import java.net.InetAddress; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Duration; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -65,6 +67,8 @@ public class RunBasic { private static final List JAVA_CMDS; + static final String HOST_NAME = InetAddress.getLoopbackAddress().getHostName(); + static { String javaPath = JDKToolFinder.getJDKTool("java"); @@ -85,6 +89,8 @@ public class RunBasic { prepareModule("test", "--module-source-path", Path.of(TEST_SRC, "src").toString()); + System.out.println("Hostname: [" + HOST_NAME + "]"); + // run tests runTest("java.desktop", "test.StoreObject"); runTest("person", "test.StorePerson"); @@ -98,9 +104,12 @@ public class RunBasic { private static void prepareModule(String mod, String... opts) throws IOException { System.out.println("Preparing the '" + mod + "' module..."); + long start = System.nanoTime(); makeDir("mods", mod); CompilerUtils.compile(Path.of(TEST_SRC, "src", mod), Path.of("mods", (mod.equals("test") ? "" : mod)), opts); + Duration duration = Duration.ofNanos(System.nanoTime() - start); + System.out.println("completed: duration - " + duration ); } private static void makeDir(String first, String... more) @@ -111,7 +120,7 @@ public class RunBasic { private static void runTest(String desc, String clsName) throws Throwable { System.out.println("Running with the '" + desc + "' module..."); runJava("-Dtest.src=" + TEST_SRC, "-p", "mods", "-m", "test/" + clsName, - "ldap://localhost/dc=ie,dc=oracle,dc=com"); + "ldap://" + HOST_NAME + "/dc=ie,dc=oracle,dc=com"); } private static void runJava(String... opts) throws Throwable { diff --git a/test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java b/test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java index 27e8e49b43d..5f707e44d69 100644 --- a/test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java +++ b/test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * 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,6 +29,7 @@ package test; +import java.io.PrintStream; import java.net.*; import java.util.*; import javax.naming.*; @@ -40,12 +41,18 @@ import org.example.authz.AuthzIdResponseControl; public class ConnectWithAuthzId { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/ConnectWithAuthzId.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { @@ -68,67 +75,69 @@ public class ConnectWithAuthzId { * Launch the LDAP server with the ConnectWithAuthzId.ldap capture file */ - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } - } - }).start(); - - /* - * Connect to the LDAP directory - */ - - Hashtable env = new Hashtable<>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - env.put(Context.SECURITY_AUTHENTICATION, "simple"); - env.put(Context.SECURITY_PRINCIPAL, "cn=admin,dc=ie,dc=oracle,dc=com"); - env.put(Context.SECURITY_CREDENTIALS, "changeit"); - env.put(LdapContext.CONTROL_FACTORIES, - "org.example.authz.AuthzIdResponseControlFactory"); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } - - System.out.println("ConnectWithAuthzId: connecting to " + ldapUri); - LdapContext ctx = null; - Control[] connectionControls = { new AuthzIdRequestControl(false) }; - - try { - ctx = new InitialLdapContext(env, connectionControls); - System.out.println("ConnectWithAuthzId: connected"); - // Retrieve the response controls - Control[] responseControls = ctx.getResponseControls(); - if (responseControls != null) { - for (Control responseControl : responseControls) { - System.out.println("ConnectWithAuthzId: received response" + - " control: " + responseControl.getID()); - if (responseControl instanceof AuthzIdResponseControl) { - AuthzIdResponseControl authzId = - (AuthzIdResponseControl)responseControl; - System.out.println("ConnectWithAuthzId: identity is " + - authzId.getIdentity()); + try (ServerSocket serverSocket = new ServerSocket()) { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); } } + }).start(); + + /* + * Connect to the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); } - } catch (NamingException e) { - System.err.println("ConnectWithAuthzId: error connecting " + e); - } finally { - if (ctx != null) { - ctx.close(); + env.put(Context.PROVIDER_URL, ldapUri.toString()); + env.put(Context.SECURITY_AUTHENTICATION, "simple"); + env.put(Context.SECURITY_PRINCIPAL, "cn=admin,dc=ie,dc=oracle,dc=com"); + env.put(Context.SECURITY_CREDENTIALS, "changeit"); + env.put(LdapContext.CONTROL_FACTORIES, + "org.example.authz.AuthzIdResponseControlFactory"); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); + } + + System.out.println("ConnectWithAuthzId: connecting to " + ldapUri); + LdapContext ctx = null; + Control[] connectionControls = { new AuthzIdRequestControl(false) }; + + try { + ctx = new InitialLdapContext(env, connectionControls); + System.out.println("ConnectWithAuthzId: connected"); + // Retrieve the response controls + Control[] responseControls = ctx.getResponseControls(); + if (responseControls != null) { + for (Control responseControl : responseControls) { + System.out.println("ConnectWithAuthzId: received response" + + " control: " + responseControl.getID()); + if (responseControl instanceof AuthzIdResponseControl) { + AuthzIdResponseControl authzId = + (AuthzIdResponseControl)responseControl; + System.out.println("ConnectWithAuthzId: identity is " + + authzId.getIdentity()); + } + } + } + } catch (NamingException e) { + System.err.println("ConnectWithAuthzId: error connecting " + e); + } finally { + if (ctx != null) { + ctx.close(); + } } } } diff --git a/test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java b/test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java index c14e4f4f31c..6df3b97cc61 100644 --- a/test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java +++ b/test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ package test; +import java.io.PrintStream; import java.net.*; import java.util.*; import javax.naming.*; @@ -38,11 +39,17 @@ import org.example.foo.FooControl; public class ConnectWithFoo { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/ConnectWithFoo.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { @@ -65,48 +72,50 @@ public class ConnectWithFoo { * Launch the LDAP server with the ConnectWithFoo.ldap capture file */ - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } + try (ServerSocket serverSocket = new ServerSocket()) { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); + } + } + }).start(); + + /* + * Connect to the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); + } + env.put(Context.PROVIDER_URL, ldapUri.toString()); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); } - }).start(); - /* - * Connect to the LDAP directory - */ + System.out.println("ConnectWithFoo: connecting to " + ldapUri); + LdapContext ctx = null; + Control[] connectionControls = { new FooControl(false) }; - Hashtable env = new Hashtable<>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } - - System.out.println("ConnectWithFoo: connecting to " + ldapUri); - LdapContext ctx = null; - Control[] connectionControls = { new FooControl(false) }; - - try { - ctx = new InitialLdapContext(env, connectionControls); - System.out.println("ConnectWithFoo: connected"); - } catch (NamingException e) { - System.err.println("ConnectWithFoo: error connecting " + e); - } finally { - if (ctx != null) { - ctx.close(); + try { + ctx = new InitialLdapContext(env, connectionControls); + System.out.println("ConnectWithFoo: connected"); + } catch (NamingException e) { + System.err.println("ConnectWithFoo: error connecting " + e); + } finally { + if (ctx != null) { + ctx.close(); + } } } } diff --git a/test/jdk/javax/naming/module/src/test/test/ReadByUrl.java b/test/jdk/javax/naming/module/src/test/test/ReadByUrl.java index 4b68da455a3..cc2861b433b 100644 --- a/test/jdk/javax/naming/module/src/test/test/ReadByUrl.java +++ b/test/jdk/javax/naming/module/src/test/test/ReadByUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ package test; +import java.io.PrintStream; import java.net.*; import java.util.*; import javax.naming.*; @@ -36,11 +37,17 @@ import javax.naming.ldap.*; public class ReadByUrl { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/ReadByUrl.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { @@ -63,50 +70,52 @@ public class ReadByUrl { * Launch the LDAP server with the ReadByUrl.ldap capture file */ - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } + try (ServerSocket serverSocket = new ServerSocket()) { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); + } + } + }).start(); + + /* + * Connect to the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI("ldapv4", null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); + } + env.put(Context.PROVIDER_URL, ldapUri.toString()); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); } - }).start(); - /* - * Connect to the LDAP directory - */ + // URL context factory location for 'ldapv4://' + env.put(Context.URL_PKG_PREFIXES, "org.example"); - Hashtable env = new Hashtable<>(); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI("ldapv4", null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } + System.out.println("ReadByUrl: connecting to " + ldapUri); + DirContext ctx = null; - // URL context factory location for 'ldapv4://' - env.put(Context.URL_PKG_PREFIXES, "org.example"); - - System.out.println("ReadByUrl: connecting to " + ldapUri); - DirContext ctx = null; - - try { - ctx = new InitialDirContext(env); - System.out.println("ReadByUrl: connected"); - DirContext entry = (DirContext) ctx.lookup(ldapUri.toString()); - entry.close(); - } catch (NamingException e) { - System.err.println("ReadByUrl: error connecting " + e); - } finally { - if (ctx != null) { - ctx.close(); + try { + ctx = new InitialDirContext(env); + System.out.println("ReadByUrl: connected"); + DirContext entry = (DirContext) ctx.lookup(ldapUri.toString()); + entry.close(); + } catch (NamingException e) { + System.err.println("ReadByUrl: error connecting " + e); + } finally { + if (ctx != null) { + ctx.close(); + } } } } diff --git a/test/jdk/javax/naming/module/src/test/test/StoreFruit.java b/test/jdk/javax/naming/module/src/test/test/StoreFruit.java index 278102cdcdf..8121c6ac906 100644 --- a/test/jdk/javax/naming/module/src/test/test/StoreFruit.java +++ b/test/jdk/javax/naming/module/src/test/test/StoreFruit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * 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,6 +29,7 @@ package test; +import java.io.PrintStream; import java.net.*; import java.util.*; import javax.naming.*; @@ -38,18 +39,24 @@ import org.example.fruit.Fruit; public class StoreFruit { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/StoreFruit.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { /* * Process arguments */ - int argc = args.length; if ((argc < 1) || ((argc == 1) && (args[0].equalsIgnoreCase("-help")))) { @@ -58,97 +65,98 @@ public class StoreFruit { System.err.println(" is the LDAP URL of the parent entry\n"); System.err.println("example:"); System.err.println(" java StoreFruit ldap://oasis/o=airius.com"); - return; + return; } /* * Launch the LDAP server with the StoreFruit.ldap capture file */ + try (ServerSocket serverSocket = new ServerSocket()) { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); + } + } + }).start(); - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } + /* + * Store fruit objects in the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); + } + env.put(Context.PROVIDER_URL, ldapUri.toString()); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); } - }).start(); - /* - * Store fruit objects in the LDAP directory - */ + System.out.println("StoreFruit: connecting to " + ldapUri); + DirContext ctx = new InitialDirContext(env); + Fruit fruit = null; + String dn = "cn=myfruit"; + String dn2 = "cn=myapple"; - Hashtable env = new Hashtable<>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } + try { + fruit = new Fruit("orange"); + ctx.bind(dn, fruit); + System.out.println("StoreFruit: created entry '" + dn + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StoreFruit: entry '" + dn + + "' already exists"); + cleanup(ctx, (String)null); + return; + } - System.out.println("StoreFruit: connecting to " + ldapUri); - DirContext ctx = new InitialDirContext(env); - Fruit fruit = null; - String dn = "cn=myfruit"; - String dn2 = "cn=myapple"; + try { + ctx.bind(dn2, new Fruit("apple")); + System.out.println("StoreFruit: created entry '" + dn2 + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StoreFruit: entry '" + dn2 + + "' already exists"); + cleanup(ctx, dn); + return; + } - try { - fruit = new Fruit("orange"); - ctx.bind(dn, fruit); - System.out.println("StoreFruit: created entry '" + dn + "'"); - } catch (NameAlreadyBoundException e) { - System.err.println("StoreFruit: entry '" + dn + - "' already exists"); - cleanup(ctx, (String)null); - return; - } + /* + * Retrieve fruit objects from the LDAP directory + */ - try { - ctx.bind(dn2, new Fruit("apple")); - System.out.println("StoreFruit: created entry '" + dn2 + "'"); - } catch (NameAlreadyBoundException e) { - System.err.println("StoreFruit: entry '" + dn2 + - "' already exists"); - cleanup(ctx, dn); - return; - } + try { + Fruit fruit2 = (Fruit) ctx.lookup(dn); + System.out.println("StoreFruit: retrieved object: " + fruit2); + } catch (NamingException e) { + System.err.println("StoreFruit: error retrieving entry '" + + dn + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn, dn2); + return; + } - /* - * Retrieve fruit objects from the LDAP directory - */ + try { + Fruit fruit3 = (Fruit) ctx.lookup(dn2); + System.out.println("StoreFruit: retrieved object: " + fruit3); + } catch (NamingException e) { + System.err.println("StoreFruit: error retrieving entry '" + + dn2 + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn, dn2); + return; + } - try { - Fruit fruit2 = (Fruit) ctx.lookup(dn); - System.out.println("StoreFruit: retrieved object: " + fruit2); - } catch (NamingException e) { - System.err.println("StoreFruit: error retrieving entry '" + - dn + "' " + e); - e.printStackTrace(); cleanup(ctx, dn, dn2); - return; } - - try { - Fruit fruit3 = (Fruit) ctx.lookup(dn2); - System.out.println("StoreFruit: retrieved object: " + fruit3); - } catch (NamingException e) { - System.err.println("StoreFruit: error retrieving entry '" + - dn2 + "' " + e); - e.printStackTrace(); - cleanup(ctx, dn, dn2); - return; - } - - cleanup(ctx, dn, dn2); } /* diff --git a/test/jdk/javax/naming/module/src/test/test/StoreObject.java b/test/jdk/javax/naming/module/src/test/test/StoreObject.java index 2834321962f..ce1625ee8d9 100644 --- a/test/jdk/javax/naming/module/src/test/test/StoreObject.java +++ b/test/jdk/javax/naming/module/src/test/test/StoreObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * 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,6 +30,7 @@ package test; import java.awt.event.ActionEvent; +import java.io.PrintStream; import java.net.*; import java.util.*; import javax.naming.*; @@ -37,11 +38,17 @@ import javax.naming.directory.*; public class StoreObject { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/StoreObject.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { @@ -64,89 +71,91 @@ public class StoreObject { * Launch the LDAP server with the StoreObject.ldap capture file */ - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } + try (ServerSocket serverSocket = new ServerSocket()) { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); + } + } + }).start(); + + /* + * Store objects in the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); + } + env.put(Context.PROVIDER_URL, ldapUri.toString()); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); } - }).start(); - /* - * Store objects in the LDAP directory - */ + System.out.println("StoreObject: connecting to " + ldapUri); + DirContext ctx = new InitialDirContext(env); + String dn = "cn=myevent"; + String dn2 = "cn=myevent2"; - Hashtable env = new Hashtable<>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } + try { + ctx.bind(dn, new ActionEvent("", 1, "Hello1")); + System.out.println("StoreObject: created entry '" + dn + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StoreObject: entry '" + dn + + "' already exists"); + cleanup(ctx, (String)null); + return; + } - System.out.println("StoreObject: connecting to " + ldapUri); - DirContext ctx = new InitialDirContext(env); - String dn = "cn=myevent"; - String dn2 = "cn=myevent2"; + try { + ctx.bind(dn2, new ActionEvent("", 2, "Hello2")); + System.out.println("StoreObject: created entry '" + dn2 + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StoreObject: entry '" + dn2 + + "' already exists"); + cleanup(ctx, dn); + return; + } - try { - ctx.bind(dn, new ActionEvent("", 1, "Hello1")); - System.out.println("StoreObject: created entry '" + dn + "'"); - } catch (NameAlreadyBoundException e) { - System.err.println("StoreObject: entry '" + dn + - "' already exists"); - cleanup(ctx, (String)null); - return; - } + /* + * Retrieve objects from the LDAP directory + */ - try { - ctx.bind(dn2, new ActionEvent("", 2, "Hello2")); - System.out.println("StoreObject: created entry '" + dn2 + "'"); - } catch (NameAlreadyBoundException e) { - System.err.println("StoreObject: entry '" + dn2 + - "' already exists"); - cleanup(ctx, dn); - return; - } + try { + ActionEvent b = (ActionEvent) ctx.lookup(dn); + System.out.println("StoreObject: retrieved object: " + b); + } catch (NamingException e) { + System.err.println("StoreObject: error retrieving entry '" + + dn + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn, dn2); + return; + } - /* - * Retrieve objects from the LDAP directory - */ + try { + ActionEvent t = (ActionEvent) ctx.lookup(dn2); + System.out.println("StoreObject: retrieved object: " + t); + } catch (NamingException e) { + System.err.println("StoreObject: error retrieving entry '" + + dn2 + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn, dn2); + return; + } - try { - ActionEvent b = (ActionEvent) ctx.lookup(dn); - System.out.println("StoreObject: retrieved object: " + b); - } catch (NamingException e) { - System.err.println("StoreObject: error retrieving entry '" + - dn + "' " + e); - e.printStackTrace(); cleanup(ctx, dn, dn2); - return; + ctx.close(); } - - try { - ActionEvent t = (ActionEvent) ctx.lookup(dn2); - System.out.println("StoreObject: retrieved object: " + t); - } catch (NamingException e) { - System.err.println("StoreObject: error retrieving entry '" + - dn2 + "' " + e); - e.printStackTrace(); - cleanup(ctx, dn, dn2); - return; - } - - cleanup(ctx, dn, dn2); - ctx.close(); } /* diff --git a/test/jdk/javax/naming/module/src/test/test/StorePerson.java b/test/jdk/javax/naming/module/src/test/test/StorePerson.java index 4b6e174625f..6a5baebe5a9 100644 --- a/test/jdk/javax/naming/module/src/test/test/StorePerson.java +++ b/test/jdk/javax/naming/module/src/test/test/StorePerson.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,6 +31,7 @@ package test; +import java.io.PrintStream; import java.net.*; import java.util.*; import javax.naming.*; @@ -40,11 +41,17 @@ import org.example.person.Person; public class StorePerson { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/StorePerson.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { @@ -67,115 +74,116 @@ public class StorePerson { * Launch the LDAP server with the StorePerson.ldap capture file */ - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } + try (ServerSocket serverSocket = new ServerSocket()) { + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); + } + } + }).start(); + + /* + * Store Person objects in the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); } - }).start(); - - /* - * Store Person objects in the LDAP directory - */ - - Hashtable env = new Hashtable<>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } - - // Specify the factory classname explicitly - env.put(Context.STATE_FACTORIES, "org.example.person.PersonFactory"); - env.put(Context.OBJECT_FACTORIES, "org.example.person.PersonFactory"); - - System.out.println("StorePerson: connecting to " + ldapUri); - DirContext ctx = new InitialDirContext(env); - Person person = null; - String name = "John Smith"; - String dn = "cn=" + name; - - try { - person = new Person(name, "Smith"); - person.setMailAddress("jsmith@smith.com"); - ctx.bind(dn, person); - System.out.println("StorePerson: created entry '" + dn + "'"); - } catch (NameAlreadyBoundException e) { - System.err.println("StorePerson: entry '" + dn + - "' already exists"); - cleanup(ctx, (String)null); - return; - } - - name = "Jill Smyth"; - String dn2 = "cn=" + name; - Person person2 = new Person(name, "Smyth"); - person2.setMailAddress("jsmyth@smith.com"); - - try { - ctx.bind(dn2, person2); - System.out.println("StorePerson: created entry '" + dn2 + "'"); - } catch (NameAlreadyBoundException e) { - System.err.println("StorePerson: entry '" + dn2 + - "' already exists"); - cleanup(ctx, dn); - return; - } - - /* - * Retrieve Person objects from the LDAP directory - */ - - try { - Person person3 = (Person) ctx.lookup(dn); - System.out.println("StorePerson: retrieved object: " + person3); - if (person.getAttributes().equals(person3.getAttributes())) { - System.out.println( - "StorePerson: retrieved person matches original"); - } else { - System.out.println( - "StorePerson: retrieved person does NOT match original"); + env.put(Context.PROVIDER_URL, ldapUri.toString()); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); } - } catch (NamingException e) { - System.err.println("StorePerson: error retrieving entry '" + - dn + "' " + e); - e.printStackTrace(); + + // Specify the factory classname explicitly + env.put(Context.STATE_FACTORIES, "org.example.person.PersonFactory"); + env.put(Context.OBJECT_FACTORIES, "org.example.person.PersonFactory"); + + System.out.println("StorePerson: connecting to " + ldapUri); + DirContext ctx = new InitialDirContext(env); + Person person = null; + String name = "John Smith"; + String dn = "cn=" + name; + + try { + person = new Person(name, "Smith"); + person.setMailAddress("jsmith@smith.com"); + ctx.bind(dn, person); + System.out.println("StorePerson: created entry '" + dn + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StorePerson: entry '" + dn + + "' already exists"); + cleanup(ctx, (String)null); + return; + } + + name = "Jill Smyth"; + String dn2 = "cn=" + name; + Person person2 = new Person(name, "Smyth"); + person2.setMailAddress("jsmyth@smith.com"); + + try { + ctx.bind(dn2, person2); + System.out.println("StorePerson: created entry '" + dn2 + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StorePerson: entry '" + dn2 + + "' already exists"); + cleanup(ctx, dn); + return; + } + + /* + * Retrieve Person objects from the LDAP directory + */ + + try { + Person person3 = (Person) ctx.lookup(dn); + System.out.println("StorePerson: retrieved object: " + person3); + if (person.getAttributes().equals(person3.getAttributes())) { + System.out.println( + "StorePerson: retrieved person matches original"); + } else { + System.out.println( + "StorePerson: retrieved person does NOT match original"); + } + } catch (NamingException e) { + System.err.println("StorePerson: error retrieving entry '" + + dn + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn, dn2); + return; + } + + try { + Person person4 = (Person) ctx.lookup(dn2); + System.out.println("StorePerson: retrieved object: " + person4); + if (person2.getAttributes().equals(person4.getAttributes())) { + System.out.println( + "StorePerson: retrieved person matches original"); + } else { + System.out.println( + "StorePerson: retrieved person does NOT match original"); + } + } catch (NamingException e) { + System.err.println("StorePerson: error retrieving entry '" + + dn2 + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn, dn2); + return; + } + cleanup(ctx, dn, dn2); - return; } - - try { - Person person4 = (Person) ctx.lookup(dn2); - System.out.println("StorePerson: retrieved object: " + person4); - if (person2.getAttributes().equals(person4.getAttributes())) { - System.out.println( - "StorePerson: retrieved person matches original"); - } else { - System.out.println( - "StorePerson: retrieved person does NOT match original"); - } - } catch (NamingException e) { - System.err.println("StorePerson: error retrieving entry '" + - dn2 + "' " + e); - e.printStackTrace(); - cleanup(ctx, dn, dn2); - return; - } - - cleanup(ctx, dn, dn2); - return; } /* diff --git a/test/jdk/javax/naming/module/src/test/test/StoreRemote.java b/test/jdk/javax/naming/module/src/test/test/StoreRemote.java index 95dea1bd327..a7c14138aae 100644 --- a/test/jdk/javax/naming/module/src/test/test/StoreRemote.java +++ b/test/jdk/javax/naming/module/src/test/test/StoreRemote.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. * 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,11 +40,17 @@ import org.example.hello.*; public class StoreRemote { + static { + final PrintStream out = new PrintStream(System.out, true); + final PrintStream err = new PrintStream(System.err, true); + + System.setOut(out); + System.setErr(err); + } + // LDAP capture file private static final String LDAP_CAPTURE_FILE = System.getProperty("test.src") + "/src/test/test/StoreRemote.ldap"; - // LDAPServer socket - private static ServerSocket serverSocket; public static void main(String[] args) throws Exception { @@ -67,77 +73,79 @@ public class StoreRemote { * Launch the LDAP server with the StoreRemote.ldap capture file */ - serverSocket = new ServerSocket(0); - new Thread(new Runnable() { - @Override - public void run() { - try { - new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); - } catch (Exception e) { - System.out.println("ERROR: unable to launch LDAP server"); - e.printStackTrace(); - } + try (ServerSocket serverSocket = new ServerSocket()){ + serverSocket.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0)); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LDAPServer(serverSocket, LDAP_CAPTURE_FILE); + } catch (Exception e) { + System.out.println("ERROR: unable to launch LDAP server"); + e.printStackTrace(); + } + } + }).start(); + + /* + * Store a Remote object in the LDAP directory + */ + + Hashtable env = new Hashtable<>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, + "com.sun.jndi.ldap.LdapCtxFactory"); + URI ldapUri = new URI(args[0]); + if (ldapUri.getPort() == -1) { + ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), + serverSocket.getLocalPort(), ldapUri.getPath(), null, null); + } + env.put(Context.PROVIDER_URL, ldapUri.toString()); + if (args[args.length - 1].equalsIgnoreCase("-trace")) { + env.put("com.sun.jndi.ldap.trace.ber", System.out); } - }).start(); - /* - * Store a Remote object in the LDAP directory - */ + System.out.println("StoreRemote: connecting to " + ldapUri); + DirContext ctx = new InitialDirContext(env); + String dn = "cn=myremote"; - Hashtable env = new Hashtable<>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, - "com.sun.jndi.ldap.LdapCtxFactory"); - URI ldapUri = new URI(args[0]); - if (ldapUri.getPort() == -1) { - ldapUri = new URI(ldapUri.getScheme(), null, ldapUri.getHost(), - serverSocket.getLocalPort(), ldapUri.getPath(), null, null); - } - env.put(Context.PROVIDER_URL, ldapUri.toString()); - if (args[args.length - 1].equalsIgnoreCase("-trace")) { - env.put("com.sun.jndi.ldap.trace.ber", System.out); - } + try { + Hello hello = new HelloImpl(); + ctx.bind(dn, hello); + System.out.println("StoreRemote: created entry '" + dn + "'"); - System.out.println("StoreRemote: connecting to " + ldapUri); - DirContext ctx = new InitialDirContext(env); - String dn = "cn=myremote"; + // Explicitly release the RMI object + UnicastRemoteObject.unexportObject(hello, true); - try { - Hello hello = new HelloImpl(); - ctx.bind(dn, hello); - System.out.println("StoreRemote: created entry '" + dn + "'"); + } catch (NameAlreadyBoundException e) { + System.err.println("StoreRemote: entry '" + dn + + "' already exists"); + cleanup(ctx, (String)null); + return; + } - // Explicitly release the RMI object - UnicastRemoteObject.unexportObject(hello, true); + /* + * Retrieve the Remote object from the LDAP directory + */ - } catch (NameAlreadyBoundException e) { - System.err.println("StoreRemote: entry '" + dn + - "' already exists"); - cleanup(ctx, (String)null); - return; - } + try { + Hello obj = (Hello) ctx.lookup(dn); + System.out.println("StoreRemote: retrieved object: " + obj); + System.out.println("StoreRemote: calling Hello.sayHello()...\n" + + obj.sayHello()); - /* - * Retrieve the Remote object from the LDAP directory - */ + // Explicitly release the RMI object + UnicastRemoteObject.unexportObject(obj, true); - try { - Hello obj = (Hello) ctx.lookup(dn); - System.out.println("StoreRemote: retrieved object: " + obj); - System.out.println("StoreRemote: calling Hello.sayHello()...\n" + - obj.sayHello()); + } catch (NamingException e) { + System.err.println("StoreRemote: error retrieving entry '" + + dn + "' " + e); + e.printStackTrace(); + cleanup(ctx, dn); + return; + } - // Explicitly release the RMI object - UnicastRemoteObject.unexportObject(obj, true); - - } catch (NamingException e) { - System.err.println("StoreRemote: error retrieving entry '" + - dn + "' " + e); - e.printStackTrace(); cleanup(ctx, dn); - return; } - - cleanup(ctx, dn); } /* From 1ac444ad878dfbe68a3de6c4479feb3516503809 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Tue, 9 Oct 2018 13:31:50 +0100 Subject: [PATCH 043/124] 8211902: broken link in java.net.http.WebSocket.Builder Reviewed-by: alanb, dfuchs --- src/java.net.http/share/classes/java/net/http/WebSocket.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java.net.http/share/classes/java/net/http/WebSocket.java b/src/java.net.http/share/classes/java/net/http/WebSocket.java index d76e48bee72..9833ba5edc4 100644 --- a/src/java.net.http/share/classes/java/net/http/WebSocket.java +++ b/src/java.net.http/share/classes/java/net/http/WebSocket.java @@ -197,9 +197,9 @@ public interface WebSocket { *
  • {@link SecurityException} - * if a security manager has been installed and it denies * {@link java.net.URLPermission access} to {@code uri}. - * Security checks + * Security checks * contains more information relating to the security context - * in which the the listener is invoked. + * in which the listener is invoked. *
  • {@link IllegalArgumentException} - * if any of the arguments of this builder's methods are * illegal From 02a3be9920116b063a6de3ef09cfad18db4a2a59 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Tue, 9 Oct 2018 14:30:06 +0200 Subject: [PATCH 044/124] 8211859: Avoid initializing AtomicBoolean from RandomAccessFile Reviewed-by: alanb --- .../classes/java/io/RandomAccessFile.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java index 55abd462ce8..73b534bf2f9 100644 --- a/src/java.base/share/classes/java/io/RandomAccessFile.java +++ b/src/java.base/share/classes/java/io/RandomAccessFile.java @@ -71,7 +71,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { */ private final String path; - private final AtomicBoolean closed = new AtomicBoolean(false); + private final Object closeLock = new Object(); + + private volatile boolean closed; private static final int O_RDONLY = 1; private static final int O_RDWR = 2; @@ -301,7 +303,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { if (fc == null) { this.channel = fc = FileChannelImpl.open(fd, path, true, rw, false, this); - if (closed.get()) { + if (closed) { try { fc.close(); } catch (IOException ioe) { @@ -638,14 +640,21 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { * @spec JSR-51 */ public void close() throws IOException { - if (!closed.compareAndSet(false, true)) { - // if compareAndSet() returns false closed was already true + if (closed) { return; } + synchronized (closeLock) { + if (closed) { + return; + } + closed = true; + } FileChannel fc = channel; if (fc != null) { - fc.close(); + // possible race with getChannel(), benign since + // FileChannel.close is final and idempotent + fc.close(); } fd.closeAll(new Closeable() { From a6cbbcf3348f06ea617f3ff7bf33189682c881ec Mon Sep 17 00:00:00 2001 From: Gunter Haug Date: Tue, 9 Oct 2018 15:06:27 +0200 Subject: [PATCH 045/124] 8211768: [s390] Implement JFR profiling Reviewed-by: simonis, mdoerr --- src/hotspot/cpu/s390/frame_s390.cpp | 135 +++++++++++++++++- src/hotspot/cpu/s390/frame_s390.hpp | 5 +- src/hotspot/cpu/s390/frame_s390.inline.hpp | 7 +- .../os_cpu/linux_s390/thread_linux_s390.cpp | 47 +++++- 4 files changed, 182 insertions(+), 12 deletions(-) diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp index 9ba85eb0669..95b0d7fd98c 100644 --- a/src/hotspot/cpu/s390/frame_s390.cpp +++ b/src/hotspot/cpu/s390/frame_s390.cpp @@ -53,14 +53,135 @@ void RegisterMap::check_location_valid() { bool frame::safe_for_sender(JavaThread *thread) { bool safe = false; - address cursp = (address)sp(); - address curfp = (address)fp(); - if ((cursp != NULL && curfp != NULL && - (cursp <= thread->stack_base() && cursp >= thread->stack_base() - thread->stack_size())) && - (curfp <= thread->stack_base() && curfp >= thread->stack_base() - thread->stack_size())) { - safe = true; + address sp = (address)_sp; + address fp = (address)_fp; + address unextended_sp = (address)_unextended_sp; + + // Consider stack guards when trying to determine "safe" stack pointers + static size_t stack_guard_size = os::uses_stack_guard_pages() ? + JavaThread::stack_red_zone_size() + JavaThread::stack_yellow_reserved_zone_size() : 0; + size_t usable_stack_size = thread->stack_size() - stack_guard_size; + + // sp must be within the usable part of the stack (not in guards) + bool sp_safe = (sp < thread->stack_base()) && + (sp >= thread->stack_base() - usable_stack_size); + + + if (!sp_safe) { + return false; } - return safe; + + // Unextended sp must be within the stack + bool unextended_sp_safe = (unextended_sp < thread->stack_base()); + + if (!unextended_sp_safe) { + return false; + } + + // An fp must be within the stack and above (but not equal) sp. + bool fp_safe = (fp <= thread->stack_base()) && (fp > sp); + // An interpreter fp must be within the stack and above (but not equal) sp. + // Moreover, it must be at least the size of the z_ijava_state structure. + bool fp_interp_safe = (fp <= thread->stack_base()) && (fp > sp) && + ((fp - sp) >= z_ijava_state_size); + + // We know sp/unextended_sp are safe, only fp is questionable here + + // If the current frame is known to the code cache then we can attempt to + // to construct the sender and do some validation of it. This goes a long way + // toward eliminating issues when we get in frame construction code + + if (_cb != NULL ) { + // Entry frame checks + if (is_entry_frame()) { + // An entry frame must have a valid fp. + return fp_safe && is_entry_frame_valid(thread); + } + + // Now check if the frame is complete and the test is + // reliable. Unfortunately we can only check frame completeness for + // runtime stubs. Other generic buffer blobs are more + // problematic so we just assume they are OK. Adapter blobs never have a + // complete frame and are never OK. nmethods should be OK on s390. + if (!_cb->is_frame_complete_at(_pc)) { + if (_cb->is_adapter_blob() || _cb->is_runtime_stub()) { + return false; + } + } + + // Could just be some random pointer within the codeBlob. + if (!_cb->code_contains(_pc)) { + return false; + } + + if (is_interpreted_frame() && !fp_interp_safe) { + return false; + } + + z_abi_160* sender_abi = (z_abi_160*) fp; + intptr_t* sender_sp = (intptr_t*) sender_abi->callers_sp; + address sender_pc = (address) sender_abi->return_pc; + + // We must always be able to find a recognizable pc. + CodeBlob* sender_blob = CodeCache::find_blob_unsafe(sender_pc); + if (sender_blob == NULL) { + return false; + } + + // Could be a zombie method + if (sender_blob->is_zombie() || sender_blob->is_unloaded()) { + return false; + } + + // It should be safe to construct the sender though it might not be valid. + + frame sender(sender_sp, sender_pc); + + // Do we have a valid fp? + address sender_fp = (address) sender.fp(); + + // sender_fp must be within the stack and above (but not + // equal) current frame's fp. + if (sender_fp > thread->stack_base() || sender_fp <= fp) { + return false; + } + + // If the potential sender is the interpreter then we can do some more checking. + if (Interpreter::contains(sender_pc)) { + return sender.is_interpreted_frame_valid(thread); + } + + // Could just be some random pointer within the codeBlob. + if (!sender.cb()->code_contains(sender_pc)) { + return false; + } + + // We should never be able to see an adapter if the current frame is something from code cache. + if (sender_blob->is_adapter_blob()) { + return false; + } + + if (sender.is_entry_frame()) { + return sender.is_entry_frame_valid(thread); + } + + // Frame size is always greater than zero. If the sender frame size is zero or less, + // something is really weird and we better give up. + if (sender_blob->frame_size() <= 0) { + return false; + } + + return true; + } + + // Must be native-compiled frame. Since sender will try and use fp to find + // linkages it must be safe + + if (!fp_safe) { + return false; + } + + return true; } bool frame::is_interpreted_frame() const { diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp index 22049107153..e7312676c7f 100644 --- a/src/hotspot/cpu/s390/frame_s390.hpp +++ b/src/hotspot/cpu/s390/frame_s390.hpp @@ -491,9 +491,12 @@ static int interpreter_frame_interpreterstate_size_in_bytes(); static int interpreter_frame_monitor_size_in_bytes(); - private: // template interpreter state + inline z_ijava_state* ijava_state_unchecked() const; + + private: + inline z_ijava_state* ijava_state() const; // Where z_ijava_state.monitors is saved. diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp index 55cf4c33b78..6cfee055314 100644 --- a/src/hotspot/cpu/s390/frame_s390.inline.hpp +++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp @@ -77,8 +77,13 @@ inline frame::frame(void* sp, void* pc, void* unextended_sp) : #endif // template interpreter state -inline frame::z_ijava_state* frame::ijava_state() const { +inline frame::z_ijava_state* frame::ijava_state_unchecked() const { z_ijava_state* state = (z_ijava_state*) ((uintptr_t)fp() - z_ijava_state_size); + return state; +} + +inline frame::z_ijava_state* frame::ijava_state() const { + z_ijava_state* state = ijava_state_unchecked(); assert(state->magic == (intptr_t) frame::z_istate_magic_number, "wrong z_ijava_state in interpreter frame (no magic found)"); return state; diff --git a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp index 549c0444bf9..836738f197e 100644 --- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp +++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.cpp @@ -42,10 +42,51 @@ frame JavaThread::pd_last_frame() { } bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava) { - ucontext_t* uc = (ucontext_t*) ucontext; - *fr_addr = frame((intptr_t*)uc->uc_mcontext.gregs[15/*REG_SP*/], + assert(this->is_Java_thread(), "must be JavaThread"); + + // If we have a last_Java_frame, then we should use it even if + // isInJava == true. It should be more reliable than ucontext info. + if (has_last_Java_frame() && frame_anchor()->walkable()) { + *fr_addr = pd_last_frame(); + return true; + } + + if (isInJava) { + ucontext_t* uc = (ucontext_t*) ucontext; + frame ret_frame((intptr_t*)uc->uc_mcontext.gregs[15/*Z_SP*/], (address)uc->uc_mcontext.psw.addr); - return true; + + if (ret_frame.pc() == NULL) { + // ucontext wasn't useful + return false; + } + + if (ret_frame.is_interpreted_frame()) { + frame::z_ijava_state* istate = ret_frame.ijava_state_unchecked(); + if (!((Method*)(istate->method))->is_metaspace_object()) { + return false; + } + uint64_t reg_bcp = uc->uc_mcontext.gregs[13/*Z_BCP*/]; + uint64_t istate_bcp = istate->bcp; + uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base()); + uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size()); + if (istate_bcp >= code_start && istate_bcp < code_end) { + // we have a valid bcp, don't touch it, do nothing + } else if (reg_bcp >= code_start && reg_bcp < code_end) { + istate->bcp = reg_bcp; + } else { + return false; + } + } + if (!ret_frame.safe_for_sender(this)) { + // nothing else to try if the frame isn't good + return false; + } + *fr_addr = ret_frame; + return true; + } + // nothing else to try + return false; } // Forte Analyzer AsyncGetCallTrace profiling support is not implemented on Linux/S390x. From 182a991df26e19f73aa8e2f7af2c1416f005c1d6 Mon Sep 17 00:00:00 2001 From: Goetz Lindenmaier Date: Tue, 9 Oct 2018 16:03:56 +0200 Subject: [PATCH 046/124] 8211856: [ppc, s390] ProblemList some failing tests Reviewed-by: kvn, mdoerr --- test/hotspot/jtreg/ProblemList.txt | 42 ++++++++++++++++-------------- test/jdk/ProblemList.txt | 10 ++++++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index a9014d2c266..7f11e087980 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -59,6 +59,8 @@ applications/ctw/modules/jdk_jconsole.java 8189604 windows-all compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all +compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x + ############################################################################# # :hotspot_gc @@ -91,50 +93,50 @@ runtime/SharedArchiveFile/SASymbolTableTest.java 8193639 solaris-all serviceability/sa/ClhsdbAttach.java 8193639 solaris-all serviceability/sa/ClhsdbCDSCore.java 8193639 solaris-all -serviceability/sa/ClhsdbCDSJstackPrintAll.java 8193639 solaris-all +serviceability/sa/ClhsdbCDSJstackPrintAll.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/CDSJMapClstats.java 8193639 solaris-all serviceability/sa/ClhsdbField.java 8193639 solaris-all -serviceability/sa/ClhsdbFindPC.java 8193639 solaris-all +serviceability/sa/ClhsdbFindPC.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbFlags.java 8193639 solaris-all -serviceability/sa/ClhsdbInspect.java 8193639 solaris-all -serviceability/sa/ClhsdbJdis.java 8193639 solaris-all -serviceability/sa/ClhsdbJhisto.java 8193639 solaris-all -serviceability/sa/ClhsdbJstack.java 8193639 solaris-all +serviceability/sa/ClhsdbInspect.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/ClhsdbJdis.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/ClhsdbJhisto.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/ClhsdbJstack.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbLongConstant.java 8193639 solaris-all -serviceability/sa/ClhsdbPmap.java 8193639 solaris-all +serviceability/sa/ClhsdbPmap.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbPrintAll.java 8193639 solaris-all -serviceability/sa/ClhsdbPrintAs.java 8193639 solaris-all +serviceability/sa/ClhsdbPrintAs.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbPrintStatics.java 8193639 solaris-all -serviceability/sa/ClhsdbPstack.java 8193639 solaris-all +serviceability/sa/ClhsdbPstack.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbRegionDetailsScanOopsForG1.java 8193639 solaris-all -serviceability/sa/ClhsdbScanOops.java 8193639 solaris-all -serviceability/sa/ClhsdbSource.java 8193639 solaris-all +serviceability/sa/ClhsdbScanOops.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/ClhsdbSource.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbSymbol.java 8193639 solaris-all serviceability/sa/ClhsdbSymbolTable.java 8193639 solaris-all -serviceability/sa/ClhsdbThread.java 8193639 solaris-all +serviceability/sa/ClhsdbThread.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/ClhsdbVmStructsDump.java 8193639 solaris-all -serviceability/sa/ClhsdbWhere.java 8193639 solaris-all -serviceability/sa/DeadlockDetectionTest.java 8193639 solaris-all -serviceability/sa/JhsdbThreadInfoTest.java 8193639 solaris-all +serviceability/sa/ClhsdbWhere.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/DeadlockDetectionTest.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/JhsdbThreadInfoTest.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java 8193639 solaris-all serviceability/sa/sadebugd/SADebugDTest.java 8163805 generic-all serviceability/sa/TestClassDump.java 8193639 solaris-all -serviceability/sa/TestClhsdbJstackLock.java 8193639 solaris-all -serviceability/sa/TestCpoolForInvokeDynamic.java 8193639 solaris-all +serviceability/sa/TestClhsdbJstackLock.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/TestCpoolForInvokeDynamic.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/TestDefaultMethods.java 8193639 solaris-all serviceability/sa/TestG1HeapRegion.java 8193639 solaris-all serviceability/sa/TestHeapDumpForInvokeDynamic.java 8193639 solaris-all serviceability/sa/TestHeapDumpForLargeArray.java 8193639 solaris-all serviceability/sa/TestInstanceKlassSize.java 8193639 solaris-all serviceability/sa/TestInstanceKlassSizeForInterface.java 8193639 solaris-all -serviceability/sa/TestIntConstant.java 8193639 solaris-all -serviceability/sa/TestJhsdbJstackLock.java 8193639 solaris-all +serviceability/sa/TestIntConstant.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 +serviceability/sa/TestJhsdbJstackLock.java 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 serviceability/sa/TestJmapCore.java 8193639 solaris-all serviceability/sa/TestJmapCoreMetaspace.java 8193639 solaris-all serviceability/sa/TestPrintMdo.java 8193639 solaris-all serviceability/sa/TestRevPtrsForInvokeDynamic.java 8191270 generic-all serviceability/sa/TestType.java 8193639 solaris-all -serviceability/sa/TestUniverse.java#id0 8193639 solaris-all +serviceability/sa/TestUniverse.java#id0 8193639,8211767 solaris-all,linux-ppc64le,linux-ppc64 ############################################################################# diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 91fe51f3600..d5bd1ef73f2 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -508,6 +508,8 @@ java/beans/XMLEncoder/Test6570354.java 8015593 macosx-all # jdk_lang java/lang/StringCoding/CheckEncodings.sh 7008363 generic-all +java/lang/ProcessBuilder/PipelineTest.java 8211844 aix-ppc64 +java/lang/ProcessHandle/InfoTest.java 8211847 aix-ppc64 ############################################################################ @@ -556,6 +558,8 @@ java/net/MulticastSocket/SetGetNetworkInterfaceTest.java 8207404 aix-all java/net/DatagramSocket/SendDatagramToBadAddress.java 7143960 macosx-all +java/net/ServerSocket/AcceptInheritHandle.java 8211854 aix-ppc64 + ############################################################################ # jdk_nio @@ -564,6 +568,8 @@ java/nio/Buffer/EqualsCompareTest.java 8193917 solaris- java/nio/channels/DatagramChannel/ChangingAddress.java 7141822 macosx-all +java/nio/channels/AsynchronousSocketChannel/StressLoopback.java 8211851 aix-ppc64 + java/nio/channels/Selector/Wakeup.java 6963118 windows-all java/nio/file/WatchService/Basic.java 7158947 solaris-all Solaris 11 @@ -571,6 +577,8 @@ java/nio/file/WatchService/MayFlies.java 7158947 solaris- java/nio/file/WatchService/LotsOfCancels.java 8188039 solaris-all Solaris 11 java/nio/file/WatchService/LotsOfEvents.java 7158947 solaris-all Solaris 11 +sun/nio/cs/OLD/TestIBMDB.java 8211841 aix-ppc64 + ############################################################################ # jdk_rmi @@ -852,7 +860,7 @@ com/sun/jdi/NashornPopFrameTest.java 8187143 generic- # svc_tools sun/tools/jstat/jstatClassloadOutput1.sh 8173942 generic-all -sun/tools/jhsdb/BasicLauncherTest.java 8193639 solaris-all +sun/tools/jhsdb/BasicLauncherTest.java 8193639,8211767 solaris-all,linux-ppc64,linux-ppc64le sun/tools/jhsdb/HeapDumpTest.java 8193639 solaris-all From 7b7315dbeddb37bb882f7d829af13912d3e841cf Mon Sep 17 00:00:00 2001 From: Gary Adams Date: Mon, 8 Oct 2018 14:57:07 -0400 Subject: [PATCH 047/124] 8201603: MonitorContendedEnter failure in nsk/jvmti/scenarios/contention/TC02/tc02t001 Reviewed-by: cjplummer --- .../nsk/jvmti/scenarios/contention/TC02/tc02t001.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001.java index c4f24d73bfc..b3174091303 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001.java @@ -71,7 +71,7 @@ public class tc02t001 extends DebugeeClass { thread.waitingBarrier1.unlock(); try { - Thread.sleep(100); + Thread.sleep(1000); // Wait for contended "synchronized (M)" thread.M.wait(timeout); } catch (InterruptedException e) { throw new Failure(e); @@ -79,7 +79,7 @@ public class tc02t001 extends DebugeeClass { thread.waitingBarrier2.unlock(); try { - Thread.sleep(100); + Thread.sleep(1000); // Wait for contended "synchronized (M)" thread.M.wait(timeout); } catch (InterruptedException e) { throw new Failure(e); @@ -87,7 +87,7 @@ public class tc02t001 extends DebugeeClass { thread.waitingBarrier3.unlock(); try { - Thread.sleep(100); + Thread.sleep(1000); // Wait for contended "synchronized (M)" thread.M.wait(timeout); } catch (InterruptedException e) { throw new Failure(e); From fe3bd4703e876d26290b9a484c66b4cd37515eb7 Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Fri, 5 Oct 2018 23:45:02 +0200 Subject: [PATCH 048/124] 8211792: Fix misplaced BarrierSet forward declarations Reviewed-by: shade, zgu --- src/hotspot/share/interpreter/templateTable.hpp | 1 + src/hotspot/share/oops/oop.hpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/interpreter/templateTable.hpp b/src/hotspot/share/interpreter/templateTable.hpp index 695be6e395b..dc23da6c17c 100644 --- a/src/hotspot/share/interpreter/templateTable.hpp +++ b/src/hotspot/share/interpreter/templateTable.hpp @@ -36,6 +36,7 @@ // and the snippet generator, a template is assigned to each bytecode which can be // used to generate the bytecode's implementation if needed. +class BarrierSet; class InterpreterMacroAssembler; // A Template describes the properties of a code template for a given bytecode diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp index 0e57e46d29c..d456dd92ae4 100644 --- a/src/hotspot/share/oops/oop.hpp +++ b/src/hotspot/share/oops/oop.hpp @@ -46,7 +46,6 @@ class OopClosure; class ScanClosure; class FastScanClosure; class FilteringClosure; -class BarrierSet; class CMSIsAliveClosure; class PSPromotionManager; From 8891582e9f8d533edf410a14866e7e380ee5d064 Mon Sep 17 00:00:00 2001 From: Alex Menkov Date: Tue, 9 Oct 2018 12:26:29 -0700 Subject: [PATCH 049/124] 8211292: [TEST] convert com/sun/jdi/DeferredStepTest.sh test Reviewed-by: sspitsyn, jcbeyler --- test/jdk/com/sun/jdi/DeferredStepTest.java | 180 +++ test/jdk/com/sun/jdi/DeferredStepTest.sh | 183 --- test/jdk/com/sun/jdi/ShellScaffold.sh | 1221 -------------------- test/jdk/com/sun/jdi/ZZZcleanup.sh | 56 - 4 files changed, 180 insertions(+), 1460 deletions(-) create mode 100644 test/jdk/com/sun/jdi/DeferredStepTest.java delete mode 100644 test/jdk/com/sun/jdi/DeferredStepTest.sh delete mode 100644 test/jdk/com/sun/jdi/ShellScaffold.sh delete mode 100644 test/jdk/com/sun/jdi/ZZZcleanup.sh diff --git a/test/jdk/com/sun/jdi/DeferredStepTest.java b/test/jdk/com/sun/jdi/DeferredStepTest.java new file mode 100644 index 00000000000..a78f7ee8686 --- /dev/null +++ b/test/jdk/com/sun/jdi/DeferredStepTest.java @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 4629548 + * @summary Deferred StepRequests are lost in multithreaded debuggee + * @comment converted from test/jdk/com/sun/jdi/DeferredStepTest.sh + * + * @library /test/lib + * @build DeferredStepTest + * @run main/othervm DeferredStepTest + */ + +import jdk.test.lib.Asserts; +import jdk.test.lib.Utils; +import lib.jdb.JdbCommand; +import lib.jdb.JdbTest; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +class DeferredStepTestTarg { + static class jj1 implements Runnable { + public void run() { + int count = 0; + + for ( int ii = 0; ii < 10; ii++) { + int intInPotato04 = 666; + ++count; // @1 breakpoint + System.out.println("Thread: " + Thread.currentThread().getName()); + } + } + } + + static class jj2 implements Runnable { + public void run() { + int count2 = 0; + + for (int ii = 0; ii < 10; ii++) { + String StringInPotato05 = "I am"; + ++count2; // @2 breakpoint + System.out.println("Thread: " + Thread.currentThread().getName()); + } + } + } + + public static void main(String argv[]) { + System.out.println("Version = " + System.getProperty("java.version")); + + jj1 obj1 = new jj1(); + jj2 obj2 = new jj2(); + new Thread(obj1, "jj1").start(); + new Thread(obj2, "jj2").start(); + } +} + +public class DeferredStepTest extends JdbTest { + public static void main(String argv[]) { + new DeferredStepTest().run(); + } + + private DeferredStepTest() { + super(DeferredStepTestTarg.class.getName()); + } + + private static class ThreadData { + int lastLine = -1; // line of the last stop + int minLine = -1; // min line (-1 means "not known yet") + int maxLine = -1; // max line (-1 means "not known yet") + } + + private Map threadData = new HashMap<>(); + + private Pattern threadRegexp = Pattern.compile("^(.+)\\[\\d+\\].*"); + private Pattern lineRegexp = Pattern.compile("^(\\d+)\\b.*", Pattern.MULTILINE); + + // returns the 1st group of the pattern. + private String parse(Pattern p, String input) { + Matcher m = p.matcher(input); + if (!m.find()) { + throw new RuntimeException("Input '" + input + "' does not matches '" + p.pattern() + "'"); + } + return m.group(1); + } + + private void next() { + List reply = jdb.command(JdbCommand.next()); + /* + * Each "next" produces something like ("Breakpoint hit" line only if the line has BP) + * Step completed: + * Breakpoint hit: "thread=jj2", DeferredStepTestTarg$jj2.run(), line=74 bci=12 + * 74 ++count2; // @2 breakpoint + * + * jj2[1] + */ + // detect thread from the last line + String lastLine = reply.get(reply.size() - 1); + String threadName = parse(threadRegexp, lastLine); + String wholeReply = reply.stream().collect(Collectors.joining(Utils.NEW_LINE)); + int lineNum = Integer.parseInt(parse(lineRegexp, wholeReply)); + + System.out.println("got: thread=" + threadName + ", line=" + lineNum); + + ThreadData data = threadData.get(threadName); + if (data == null) { + data = new ThreadData(); + threadData.put(threadName, data); + } + processThreadData(threadName, lineNum, data); + } + + private void processThreadData(String threadName, int lineNum, ThreadData data) { + int lastLine = data.lastLine; + data.lastLine = lineNum; + if (lastLine < 0) { + // the 1st stop in the thread + return; + } + if (lineNum == lastLine + 1) { + // expected. + return; + } + if (lineNum < lastLine) { + // looks like step to the beginning of the cycle + if (data.minLine > 0) { + // minLine and maxLine are not set - verify + Asserts.assertEquals(lineNum, data.minLine, threadName + " - minLine"); + Asserts.assertEquals(lastLine, data.maxLine, threadName + " - maxLine"); + } else { + // set minLine/maxLine + data.minLine = lineNum; + data.maxLine = lastLine; + } + return; + } + throw new RuntimeException(threadName + " (line " + lineNum + ") - unexpected." + + " lastLine=" + lastLine + ", minLine=" + data.minLine + ", maxLine=" + data.maxLine); + } + + @Override + protected void runCases() { + setBreakpoints(jdb, DeferredStepTestTarg.jj1.class.getName(), + getTestSourcePath("DeferredStepTest.java"), 1); + setBreakpoints(jdb, DeferredStepTestTarg.jj2.class.getName(), + getTestSourcePath("DeferredStepTest.java"), 2); + + // Run to breakpoint #1 + jdb.command(JdbCommand.run()); + + // 2 cycles with 4 lines each - maximum 80 stops + for (int i=0; i<50; i++) { + next(); + } + } +} diff --git a/test/jdk/com/sun/jdi/DeferredStepTest.sh b/test/jdk/com/sun/jdi/DeferredStepTest.sh deleted file mode 100644 index 82e97ff19b9..00000000000 --- a/test/jdk/com/sun/jdi/DeferredStepTest.sh +++ /dev/null @@ -1,183 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# @ test -# This is a manual test. The script isn't smart enough -# to detect the correct ordering of the output since it -# is produced by multiple threads and can be interleaved -# in many different ways. -# -# @bug 4629548 -# @summary Deferred StepRequests are lost in multithreaded debuggee -# @author Jim Holmlund -# -# @run shell/manual DeferredStepTest.sh - -# Run this script to see the bug. See comments at the end -# of the .java file for info on what the bug looks like. - -# These are variables that can be set to control execution - -#pkg=untitled7 -classname=DeferredStepTest -#compileOptions=-g -#java=java_g -#mode=-Xcomp - -createJavaFile() -{ - cat < $classname.java.1 -public class $classname { - static class jj1 implements Runnable { - public void run() { - int count = 0; - - for ( int ii = 0; ii < 10; ii++) { // line 6 - int intInPotato04 = 666; // line 7 - ++count; // line 8; @1 breakpoint - System.out.println("Thread: " + Thread.currentThread().getName()); // line 9 - } - } - } - - static class jj2 implements Runnable { - public void run() { - int count2 = 0; - - for (int ii = 0; ii < 10; ii++) { // line 18 - String StringInPotato05 = "I am"; // line 19 - ++count2; // line 20; @1 breakpoint - System.out.println("Thread: " + Thread.currentThread().getName()); // line 21 - } - } - } - - public static void main(String argv[]) { - System.out.println("Version = " + System.getProperty("java.version")); - - jj1 aRP = new jj1(); - jj2 asRP = new jj2(); - new Thread(aRP, "jj1 *").start(); - new Thread(asRP, "jj2 **").start(); -// new Thread(aRP, "jj3 ***").start(); -// new Thread(asRP, "jj4 ****").start(); - } -} - -/**************************** -To see this bug, do this - - jdb DeferredStep - stop at DeferredStepTest$jj1:8 - stop at DeferredStepTest$jj2:20 - run - next - next - : - -********/ - -EOF -} - -#sleepcmd="sleep 2" - -# This is called to feed cmds to jdb. -dojdbCmds() -{ - #set -x - # We can't use setBkpts because it can only set bkpts in one class :-( - #setBkpts @1 - cmd stop at $classname'$jj1:8' - cmd stop at $classname'$jj2:20' - #cmd run; $sleepcmd - runToBkpt @1 - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd - cmd next; $sleepcmd -} - -mysetup() -{ - if [ -z "$TESTSRC" ] ; then - TESTSRC=. - fi - - for ii in . $TESTSRC $TESTSRC/.. ; do - if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh - break - fi - done -} - - -# You could replace this next line with the contents -# of ShellScaffold.sh and this script will run just the same. -mysetup - -cat < To use a package, define it here and put -# package $pkg -# in your java file -# classname= Omit this to use the default class name, 'shtest'. - -# compileOptions= compile options for at least the first compile, -# eg, compileOptions=-g -# compileOptions2= Options for the 2nd, ..., compile. compileOptions1 -# is used if this is not set. To use no compile -# options for the 2nd ... compiles, do -# compileOptions2=none -# -# mode=-Xcomp or mode=-Xint to run in these modes. These should not -# really be used since the tests are normally -# run in both modes. -# javacCmd=path-to-javac to use a non-standard javac for compiling -# compileOptions= Options to pass to javac -# -# See RedefineException.sh as an example of a caller script. -# -# To do RedefineClasses operations, embed @1 tags in the .java -# file to tell this script how to modify it to produce the 2nd -# version of the .class file to be used in the redefine operation. -# Here are examples of each editting tag and what change -# it causes in the new file. Note that blanks are not preserved -# in these editing operations. -# -# @1 uncomment -# orig: // @1 uncomment gus = 89; -# new: gus = 89; -# -# @1 commentout -# orig: gus = 89 // @1 commentout -# new: // gus = 89 // @1 commentout -# -# @1 delete -# orig: gus = 89 // @1 delete -# new: entire line deleted -# -# @1 newline -# orig: gus = 89; // @1 newline gus++; -# new: gus = 89; // -# gus++; -# -# @1 replace -# orig: gus = 89; // @1 replace gus = 90; -# new: gus = 90; -# -# The only other tag supported is @1 breakpoint. The setbkpts function -# sets bkpts at all lines that contain this string. -# -# Currently, all these tags are start with @1. It is envisioned that this script -# could be ehanced to allow multiple cycles of redefines by allowing -# @2, @3, ... tags. IE, processing the @i tags in the ith version of -# the file will produce the i+1th version of the file. -# -# There are problem with jtreg leaving behind orphan java and jdb processes -# when this script is run. Sometimes, on some platforms, it just doesn't -# get them all killed properly. -# The solution is to put a magic word in the cmd lines of background java -# and jdb processes this script launches. We can then do the right kind -# of ps cmds to find all these processes and kill them. We do this by -# trapping the completion of this script. -# -# An associated problem is that our trap handler (cleanup) doesn't -# always get called when jtreg terminates a test. This can leave tests -# hanging but following tests should run ok because each test uses -# unique names for the port and temp files (based on the PID returned -# by $$). -# -# mks 6.2a on win 98 presents two problems: -# $! returns the PID as a negative number whereas ps returns -# it in the form 0xFFF.... This means our trick of -# of using $! to get the PIDs of the jdb and debuggee processes -# doesn't work. This will cause some error cases to fail -# with a jtreg timeout instead of failing more gracefully. -# -# There is no form of the ps command that will show the whole -# cmd line. Thus, the magic keyword trick doesn't work. We -# resort to just killing java.exe and jdb.exes -# -# pid usage: -# debuggeepid: used in jdb process to detect if debuggee has died. -# - waitForDebuggeeMsg: fail if debuggee is gone -# -# jdbpid: dofail: used to detect if in main process or jdb process -# waitforfinish: quit if the jdb process is gone - -#killcmd=/bin/kill -killcmd=kill - -# This can be increased if timing seems to be an issue. -sleep_seconds=1 -timeout_factor=1 -if [ -n "$TESTTIMEOUTFACTOR" ] ; then - # convert float value to int - timeout_factor=$(echo $TESTTIMEOUTFACTOR | awk '{printf "%d\n", int($1)}') -fi - -echo "ShellScaffold.sh: Running with timeout_factor = $timeout_factor" >& 2 -topPid=$$ - -# Be careful to echo to >& in these general functions. -# If they are called from the functions that are sending -# cmds to jdb, then stdout is redirected to jdb. -cleanup() -{ - if [ -r "$failFile" ] ; then - ls -l "$failFile" >&2 - echo "" >&2 - cat "$failFile" >&2 - echo "" >&2 - fi - - # Kill all processes that have our special - # keyword in their cmd line. - killOrphans cleanup $jdbKeyword - killOrphans cleanup $debuggeeKeyword -} - -# Kill all processes with $2 in their cmd lines -# Print a msg about this using $1 as the prefix -killOrphans() -{ - str=$2 - - if [ -z "$isCygwin" ] ; then - toBeKilled=`$psCmd | $grep -v grep | $grep -i $str | awk '{print $1}' | tr '\n\r' ' '` - else - # The cygwin ps command doesn't show the options passed to a cmd. - # We will use jps to get the win PID of the command, and - # then use ps to find the cygwin pid to be killed. - # The form of a ps output line is - # ^ ddddd dddd dddd dddd.* - # where the 4th digits are the win pid and the first - # are the cygwin pid. - if [ -r "$jdk/bin/$jstack" ] ; then - winPid=`$jdk/bin/jps -v | $grep -i $str | sed -e 's@ .*@@'` - if [ ! -z "$winPid" ] ; then - # Here is a way to kill using a win cmd and the win PID. - #echo "$1: taskkill /F $winPid" >& 2 - #taskkill /F /PID $winPid - - toBeKilled=`$psCmd | $grep -v grep | \ - $grep '^ +[0-9]+ +[0-9]+ +[0-9]+ +'"$winPid" |\ - awk '{print $1}' | tr '\n\r' ' '` - fi - else - # Well, too bad - we can't find what to kill. - toBeKilled= - fi - fi - - if [ ! -z "$toBeKilled" ] ; then - echo "$1: kill -9 $toBeKilled" >& 2 - kill -9 $toBeKilled - fi -} - -# Returns 0 if $1 is the pid of a running process -findPid() -{ - if [ -z "$1" ] ; then - return 1 - fi - - case "$osname" in - SunOS | AIX) - $psCmd | $grep '^ *'"$1 " > $devnull 2>&1 - res=$? - ;; - Windows* | CYGWIN*) - # Don't use ps on cygwin since it sometimes misses - # some processes (!). - tasklist /NH | $grep " $1 " > $devnull 2>&1 - res=$? - ;; - *) - # Never use plain 'ps', which requires a "controlling terminal" - # and will fail with a "ps: no controlling terminal" error. - # Running under 'rsh' will cause this ps error. - $psCmd -e | $grep '^ *'"$1 " > $devnull 2>&1 - res=$? - ;; - esac - return $res -} - -setup() -{ - failed= - # This is used to tag each java and jdb cmd we issue so - # we can kill them at the end of the run. - - orphanKeyword=HANGINGJAVA-$$ - debuggeeKeyword=${orphanKeyword}_DEB - jdbKeyword=${orphanKeyword}_JDB - baseArgs=-D${debuggeeKeyword} - if [ -z "$TESTCLASSES" ] ; then - echo "--Warning: TESTCLASSES is not defined; using TESTCLASSES=." - echo " You should run: " - echo " runregress $0 -no" - echo " or" - echo " (setenv TESTCLASSES .; $0 $*)" - TESTCLASSES=. - fi - if [ ! -z "$TESTJAVA" ] ; then - jdk="$TESTJAVA" - else - echo "--Error: TESTJAVA must be defined as the pathname of a jdk to test." - exit 1 - fi - - ulimitCmd= - osname=`uname -s` - isCygwin= - case "$osname" in - Windows* | CYGWIN*) - devnull=NUL - case "$osname" in - CYGWIN*) - isCygwin=1 - devnull=/dev/null - ;; - esac - - if [ -r $jdk/bin/dt_shmem.dll ] ; then - transport=dt_shmem - address=kkkk.$$ - else - transport=dt_socket - address= - fi - baseArgs="$baseArgs -XX:-ShowMessageBoxOnError" - # jtreg puts \\s in TESTCLASSES and some uses, eg. echo - # treat them as control chars on mks (eg \t is tab) - # Oops; windows mks really seems to want this cat line - # to start in column 1 - if [ -w "$Temp" ] ; then - tmpFile=$Temp/tmp.$$ - elif [ -w "$TEMP" ] ; then - tmpFile=$TEMP/tmp.$$ - else - tmpFile=tmp.$$ - fi -cat <$tmpFile -$TESTCLASSES -EOF - TESTCLASSES=`cat $tmpFile | sed -e 's@\\\\@/@g'` - rm -f $tmpFile - # on mks - grep=egrep - psCmd=ps - jstack=jstack.exe - ;; - SunOS | Linux | Darwin | AIX) - transport=dt_socket - address= - devnull=/dev/null - grep=egrep - jstack=jstack - # On linux, core files take a long time, and can leave - # zombie processes - if [ "$osname" = SunOS ] ; then - # Experiments show Solaris '/usr/ucb/ps -axwww' and - # '/usr/bin/pgrep -f -l' provide the same small amount of the - # argv string (PRARGSZ=80 in /usr/include/sys/procfs.h) - # 1) This seems to have been working OK in ShellScaffold. - # 2) OpenSolaris does not provide /usr/ucb/ps, so use pgrep - # instead - # The alternative would be to use /usr/bin/pargs [pid] to get - # all the args for a process, splice them back into one - # long string, then grep. - UU=`/usr/xpg4/bin/id -u -n` - psCmd="pgrep -f -l -U $UU" - else - ulimit -c 0 - # See bug 6238593. - psCmd="ps axwww" - fi - ;; - *) - echo "--Error: Unknown result from 'uname -s': $osname" - exit 1 - ;; - esac - - - tmpFileDir=$TESTCLASSES/aa$$ - TESTCLASSES=$tmpFileDir - - mkdir -p $tmpFileDir - - # This must not contain 'jdb' or it shows up - # in grep of ps output for some platforms - jdbOutFile=$tmpFileDir/jxdbOutput.txt - rm -f $jdbOutFile - touch $jdbOutFile - - debuggeeOutFile=$tmpFileDir/debuggeeOutput.txt - failFile=$tmpFileDir/testFailed - debuggeepidFile=$tmpFileDir/debuggeepid - rm -f $failFile $debuggeepidFile - if [ -f "$failFile" ]; then - echo "ERROR: unable to delete existing failFile:" >&2 - ls -l "$failFile" >&2 - fi - - if [ -z "$pkg" ] ; then - pkgSlash= - pkgDot= - redefineSubdir=. - else - pkgSlash=$pkg/ - pkgDot=$pkg. - redefineSubdir=$pkgSlash - fi - if [ -z "$classname" ] ; then - classname=shtest - fi - - if [ -z "$java" ] ; then - java=java - fi - - if [ -z "$jdb" ] ; then - jdb=$jdk/bin/jdb - fi - -####################################################3 -####################################################3 -####################################################3 -####################################################3 -# sol: this gets all processes killed but -# no jstack -# linux same as above -# win mks: No dice; processes still running - trap "cleanup" 0 1 2 3 4 6 9 10 15 - - jdbOptions="$jdbOptions -J-D${jdbKeyword}" -} - -docompile() -{ - if [ "$compile" = 0 ] ; then - return - fi - saveDir=`pwd` - cd $tmpFileDir - rm -f *.java - createJavaFile $classname - - # Compile two versions of the file, the original and with the - # indicated lines modified. - cp $classname.java.1 $classname.java - echo "--Compiling first version of `pwd`/$classname.java with options: $compileOptions" - # Result is in $pkgSlash$classname.class - - if [ -z "$javacCmd" ] ; then - javacCmd=$jdk/bin/javac - fi - - echo "compiling " `ls *.java` - $javacCmd $compileOptions -d . *.java - if [ $? != 0 ] ; then - dofail "First compile failed" - fi - if [ -r vers1 ] ; then - rm -rf vers1 - fi - mkdir -p vers1 - mv *.class vers1 - if [ ! -z "$compileOptions2" ] ; then - if [ "$compileOptions2" = none ] ; then - compileOptions= - else - compileOptions=$compileOptions2 - fi - fi - - while [ 1 = 1 ] ; do - # Not really a loop; just a way to avoid goto - # by using breaks - sed -e '/@1 *delete/ d' \ - -e 's! *// *@1 *uncomment! !' \ - -e 's!\(.*@1 *commentout\)!//\1!' \ - -e 's/@1 *newline/\ - /' \ - -e 's/.*@1 *replace//' \ - $classname.java.1 >$classname.java - - cmp -s $classname.java.1 $classname.java - if [ $? = 0 ] ; then - break - fi - echo - echo "--Compiling second version of `pwd`/$classname.java with $compileOptions" - $javacCmd $compileOptions -d . $classname.java - if [ $? != 0 ] ; then - dofail "Second compile failed" - fi - if [ -r vers2 ] ; then - rm -rf vers2 - fi - mkdir -p vers2 - mv *.class vers2 - mv $classname.java $classname.java.2 - cp $classname.java.1 $classname.java - - ###### Do the same for @2, and @3 allowing 3 redefines to occur. - ###### If I had more time to write sed cmds, I would do - ###### this in a loop. But, I don't think we will ever need - ###### more than 3 redefines. - sed -e '/@2 *delete/ d' \ - -e 's! *// *@2 *uncomment! !' \ - -e 's!\(.*@2 *commentout\)!//\1!' \ - -e 's/@2 *newline/\ - /' \ - -e 's/.*@2 *replace//' \ - $classname.java.2 >$classname.java - cmp -s $classname.java.2 $classname.java - if [ $? = 0 ] ; then - break - fi - echo - echo "--Compiling third version of `pwd`/$classname.java with $compileOptions" - $javacCmd $compileOptions -d . $classname.java - if [ $? != 0 ] ; then - dofail "Third compile failed" - fi - if [ -r vers3 ] ; then - rm -rf vers3 - fi - mkdir -p vers3 - mv *.class vers3 - mv $classname.java $classname.java.3 - cp $classname.java.1 $classname.java - - ######## - sed -e '/@3 *delete/ d' \ - -e 's! *// *@3 *uncomment! !' \ - -e 's!\(.*@3 *commentout\)!//\1!' \ - -e 's/@3 *newline/\ - /' \ - -e 's/.*@3 *replace//' \ - $classname.java.3 >$classname.java - cmp -s $classname.java.3 $classname.java - if [ $? = 0 ] ; then - break - fi - echo - echo "--Compiling fourth version of `pwd`/$classname.java with $compileOptions" - $javacCmd $compileOptions -d . $classname.java - if [ $? != 0 ] ; then - dofail "fourth compile failed" - fi - if [ -r vers4 ] ; then - rm -rf vers4 - fi - mkdir -p vers4 - mv *.class vers4 - mv $classname.java $classname.java.4 - cp $classname.java.1 $classname.java - break - fgrep @4 $classname.java - if [ $? = 0 ] ; then - echo "--Error: @4 and above are not yet allowed" - exit 1 - fi - done - - cp vers1/* $redefineSubdir - cd $saveDir -} - -# Send a cmd to jdb and wait for the jdb prompt to appear. -# We don't want to allow > as a prompt because if the debuggee -# runs for awhile after a command, jdb will show this prompt -# but is not really ready to accept another command for the -# debuggee - ie, a cont in this state will be ignored. -# If it ever becomes necessary to send a jdb command before -# a main[10] form of prompt appears, then this -# code will have to be modified. -# -# Specify $1 = allowExit to show that the command given -# allows JDB to exit -cmd() -{ - allowExit= - case "$1" in - allowExit) - allowExit="allowExit" - shift - ;; - exitJdb) - # Quit JDB only with this cmd() invocation - echo "--Sending cmd: quit" >& 2 - echo quit - echo "--Quit cmd was sent" >& 2 - # See 6562090. Maybe there is a way that the exit - # can cause jdb to not get the quit. - sleep 5 - - # The exit code value here doesn't matter since this function - # is called as part of a pipeline and it is not the last command - # in the pipeline. - exit 1 - ;; - esac - command=$* - - if [ -z "$command" ] ; then - dofail "Command can't be a null string. Test failure" - fi - if [ "$command" = "quit" -o "$command" = "exit" ] ; then - # We don't want the test to manually quit jdb, - # we will do it in the end automatically - dofail "It's not allowed to send quit or exit commands from the test" - fi - if [ -r "$failFile" ] ; then - # failFile exists, it's better to finish execution - dofinish "quit" - fi - - # $jdbOutFile always exists here and is non empty - # because after starting jdb, we waited - # for the prompt. - fileSize=`wc -c $jdbOutFile | awk '{ print $1 }'` - echo "--Sending cmd: " $command >&2 - - # jjh: We have a few intermittent failures here. - # It is as if every so often, jdb doesn't - # get the first cmd that is sent to it here. - # (actually, I have seen it get the first cmd ok, - # but then not get some subsequent cmd). - # It seems like jdb really doesn't get the cmd; jdb's response - # does not appear in the jxdboutput file. It contains: - # main[1] - # The application has been disconnected - - # Is it possible - # that jdb got the cmd ok, but its response didn't make - # it to the jxdboutput file? If so, why did 'The application - # has been disconnected' make it? - - # This causes the following loop to timeout and the test to fail. - # The above echo works because the cmd (stop at ...) - # is in the System.err shown in the .jtr file. - # Also, the cmd is shown in the 'jdb never responded ...' - # msg output below after the timeout. - # And, we know jdb is started because the main[1] output is in the .jtr - # file. And, we wouldn't have gotten here if mydojdbcmds hadn't - # seen the ]. - echo $command - - # Now we have to wait for the next jdb prompt. We wait for a pattern - # to appear in the last line of jdb output. Normally, the prompt is - # - # 1) ^main[89] @ - # - # where ^ means start of line, and @ means end of file with no end of line - # and 89 is the current command counter. But we have complications e.g., - # the following jdb output can appear: - # - # 2) a[89] = 10 - # - # The above form is an array assignment and not a prompt. - # - # 3) ^main[89] main[89] ... - # - # This occurs if the next cmd is one that causes no jdb output, e.g., - # 'trace methods'. - # - # 4) ^main[89] [main[89]] .... > @ - # - # jdb prints a > as a prompt after something like a cont. - # Thus, even though the above is the last 'line' in the file, it - # isn't the next prompt we are waiting for after the cont completes. - # HOWEVER, sometimes we see this for a cont command: - # - # ^main[89] $ - # - # - # 5) ^main[89] > @ - # - # i.e., the > prompt comes out AFTER the prompt we we need to wait for. - # - # So, how do we know when the next prompt has appeared?? - # 1. Search for - # main[89] $ - # This will handle cases 1, 2, 3 - # 2. This leaves cases 4 and 5. - # - # What if we wait for 4 more chars to appear and then search for - # - # main[89] [>]$ - # - # on the last line? - # - # a. if we are currently at - # - # ^main[89] main[89] @ - # - # and a 'trace methods comes in, we will wait until at least - # - # ^main[89] main[89] main@ - # - # and then the search will find the new prompt when it completes. - # - # b. if we are currently at - # - # ^main[89] main[89] @ - # - # and the first form of cont comes in, then we will see - # - # ^main[89] main[89] > $ - # ^x@ - # - # where x is the first char of the msg output when the bkpt is hit - # and we will start our search, which will find the prompt - # when it comes out after the bkpt output, with or without the - # trailing > - # - - # wait for 4 new chars to appear in the jdb output - count=0 - desiredFileSize=`expr $fileSize + 4` - msg1=`echo At start: cmd/size/waiting : $command / $fileSize / \`date\`` - timeLimit=`expr 60 * $timeout_factor` - while [ 1 = 1 ] ; do - newFileSize=`wc -c $jdbOutFile | awk '{ print $1 } '` - #echo jj: desired = $desiredFileSize, new = $newFileSize >& 2 - - done=`expr $newFileSize \>= $desiredFileSize` - if [ $done = 1 ] ; then - break - fi - sleep ${sleep_seconds} - count=`expr $count + ${sleep_seconds}` - if [ $count -gt $timeLimit ] ; then - # record some debug info. - echo "--DEBUG: jdb $$ didn't respond to command in $count secs: $command" >& 2 - echo "--DEBUG:" $msg1 >& 2 - echo "--DEBUG: "done size/waiting : / $newFileSize / `date` >& 2 - echo "-- $jdbOutFile follows-------------------------------" >& 2 - cat $jdbOutFile >& 2 - echo "------------------------------------------" >& 2 - dojstack - dofail "jdb never responded to command: $command" - fi - done - # Note that this assumes just these chars in thread names. - waitForJdbMsg '[a-zA-Z0-9_-][a-zA-Z0-9_-]*\[[1-9][0-9]*\] [ >]*$' 1 $allowExit -} - -setBkpts() -{ - # Can set multiple bkpts, but only in one class. - # $1 is the bkpt name, eg, @1 - allLines=`$grep -n "$1 *breakpoint" $tmpFileDir/$classname.java.1 | sed -e 's@^\([0-9]*\).*@\1@g'` - for ii in $allLines ; do - cmd "stop at $pkgDot$classname:$ii" - done -} - -runToBkpt() -{ - # Don't pass allowExit here as we don't want JDB to unexpectedly exit - cmd run - # Don't need to do this - the above waits for the next prompt which comes out - # AFTER the Breakpoint hit message. - # Wait for jdb to hit the bkpt - #waitForJdbMsg "Breakpoint hit" 5 -} - -contToBkpt() -{ - # Don't pass allowExit here as we don't want JDB to unexpectedly exit - cmd cont - # Don't need to do this - the above waits for the next prompt which comes out - # AFTER the Breakpoint hit message. - # Wait for jdb to hit the bkpt - #waitForJdbMsg "Breakpoint hit" 5 -} - - -# Wait until string $1 appears in the output file, within the last $2 lines -# If $3 is allowExit, then don't fail if jdb exits before -# the desired string appears. -waitForJdbMsg() -{ - # This can be called from the jdb thread which doesn't - # have access to $debuggeepid, so we have to read it from the file. - nlines=$2 - allowExit="$3" - myCount=0 - timeLimit=`expr 40 * $timeout_factor` # wait a max of this many secs for a response from a jdb command - - while [ 1 = 1 ] ; do - if [ -r $jdbOutFile ] ; then - # Something here causes jdb to complain about Unrecognized cmd on x86. - tail -$nlines $jdbOutFile | $grep -s "$1" > $devnull 2>&1 - if [ $? = 0 ] ; then - # Found desired string - break - fi - fi - tail -2 $jdbOutFile | $grep -s "The application exited" > $devnull 2>&1 - if [ $? = 0 ] ; then - # Found 'The application exited' - echo "--JDB finished: The application exited" >&2 - if [ ! -z "$allowExit" ] ; then - # Exit is allowed - dofinish - fi - # Otherwise, it is an error if we don't find $1 - if [ -r $jdbOutFile ] ; then - tail -$nlines $jdbOutFile | $grep -s "$1" > $devnull 2>&1 - if [ $? = 0 ] ; then - break - fi - fi - dofail "JDB unexpectedly finished: Waited for jdb msg $1, but it never appeared" - fi - - sleep ${sleep_seconds} - findPid $topPid - if [ $? != 0 ] ; then - echo "--Top process ($topPid) is dead. We better die too" >&2 - dojstack - exit 1 - fi - - myCount=`expr $myCount + ${sleep_seconds}` - if [ $myCount -gt $timeLimit ] ; then - echo "--Fail: waitForJdbMsg timed out after $timeLimit seconds, looking for /$1/, in $nlines lines; exiting" >> $failFile - echo "vv jdbOutFile vvvvvvvvvvvvvvvvvvvvvvvvvvvv" >& 2 - cat $jdbOutFile >& 2 - echo "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" >& 2 - dojstack - exit 1 - fi - done - -} - -# Finishes JDB execution -# Specify command to finish if it's needed -dofinish() -{ - if [ ! -z "$*" ] ; then - echo "--Finish execution with sending \"$*\" command to JDB" >&2 - cmd "exitJdb" "$*" - else - echo "--Finish without sending \"quit\" command to JDB" >&2 - fi - exit 0 -} - -# $1 is the string to print. If $2 exists, -# it is the name of a file to print, ie, the name -# of the file that contains the $1 string. -dofail() -{ - if [ ! -z "$jdbpid" ] ; then - # we are in the main process instead of the jdb process - echo " " >> $failFile - echo "--Fail: main: $*" >> $failFile - else - # Kill the debuggee ; it could be hung so - # we want to get rid of it as soon as possible. - killOrphans "killing debuggee" $debuggeeKeyword - # Kill debugger, it could be hung - killOrphans "killing debugger" $jdbKeyword - - echo " " >>$failFile - echo "--Fail: $*" >> $failFile - fi - if [ ! -z "$2" ] ; then - echo "---- contents of $2 follows -------" >> $failFile - cat "$2" >> $failFile - echo "---------------" >>$failFile - fi - exit 1 -} - - -redefineClass() -{ - if [ -z "$1" ] ; then - vers=2 - else - vers=`echo $1 | sed -e 's/@//'` - vers=`expr $vers + 1` - fi - - cmd "redefine $pkgDot$classname $tmpFileDir/vers$vers/$classname.class" - - cp $tmpFileDir/$classname.java.$vers \ - $tmpFileDir/$classname.java -} - -mydojdbCmds() -{ - # Wait for jdb to start before we start sending cmds - waitForJdbMsg ']' 1 - # Send commands from the test - dojdbCmds - # Finish jdb with quit command - dofinish "quit" -} - -startJdb() -{ - if [ ! -r "$jdb" -a ! -r "$jdb.exe" ] ; then - dofail "$jdb does not exist" - fi - echo - echo "--Starting jdb, address=$address" - if [ -z "$address" ] ; then - # Let jdb choose the port and write it to stdout - mydojdbCmds | $jdb $jdbOptions -listenany | tee $jdbOutFile & - - while [ 1 ] ; do - lastLine=`$grep 'Listening at address' $jdbOutFile` - if [ ! -z "$lastLine" ] ; then - break - fi - sleep 1 - done - # jjh: we got the address ok, and seemed to start the debuggee - address=`echo $lastLine | sed -e 's@.*: *@@'` - else - mydojdbCmds | $jdb $jdbOptions -listen $address | tee $jdbOutFile & - fi - #echo address = $address - - - # this gets the pid of tee, at least it does on solaris - jdbpid=$! - - # This fails on linux because there is an entry for each thread in jdb - # so we get a list of numbers in jdbpid - # jdbpid=`$psCmd | $grep -v grep | $grep ${orphanKeyword}_JDB | awk '{print $1}' | tr '\n\r' ' '` -} - -startDebuggee() -{ - args="$TESTVMOPTS $TESTJAVAOPTS" - - if [ ! -z "$args" ] ; then - echo "--Starting debuggee with args from TESTVMOPTS and/or TESTJAVAOPTS: $args" - else - echo "--Starting debuggee" - fi - - debuggeepid= - waitForJdbMsg Listening 4 - - beOption="-agentlib:jdwp=transport=$transport,address=$address,server=n,suspend=y" -# beOption="-Xdebug -Xrunjdwp:transport=$transport,address=$address,server=n,suspend=y" - - thecmd="$jdk/bin/$java $mode -classpath $tmpFileDir $baseArgs $args \ - -Djtreg.classDir=$TESTCLASSES \ - -showversion \ - $beOption \ - $pkgDot$classname" - echo "Cmd: $thecmd" - - sh -c "$thecmd | tee $debuggeeOutFile" & - - # Note that the java cmd and the tee cmd will be children of - # the sh process. We can use that to find them to kill them. - debuggeepid=$! - - # Save this in a place where the jdb process can find it. - # Note that it is possible for the java cmd to abort during startup - # due to a bad classpath or whatever. - echo $debuggeepid > $debuggeepidFile -} - -dojstack() -{ - if [ -r "$jdk/bin/$jstack" ] ; then - # If jstack exists, so will jps - # Show stack traces of jdb and debuggee as a possible debugging aid. - jdbCmd=`$jdk/bin/jps -v | $grep $jdbKeyword` - realJdbPid=`echo "$jdbCmd" | sed -e 's@ .*@@'` - if [ ! -z "$realJdbPid" ] ; then - echo "-- jdb process info ----------------------" >&2 - echo " $jdbCmd" >&2 - echo "-- jdb threads: jstack $realJdbPid" >&2 - $jdk/bin/$jstack $realJdbPid >&2 - echo "------------------------------------------" >&2 - echo >&2 - fi - debuggeeCmd=`$jdk/bin/jps -v | $grep $debuggeeKeyword` - realDebuggeePid=`echo "$debuggeeCmd" | sed -e 's@ .*@@'` - if [ ! -z "$realDebuggeePid" ] ; then - echo "-- debuggee process info ----------------------" >&2 - echo " $debuggeeCmd" >&2 - echo "-- debuggee threads: jstack $moption $realDebuggeePid" >&2 - $jdk/bin/$jstack $realDebuggeePid >&2 - echo "=============================================" >&2 - echo >&2 - fi - fi -} - -waitForFinish() -{ - # This is the main process - # Wait for the jdb process to finish, or some error to occur - - while [ 1 = 1 ] ; do - findPid $jdbpid - if [ $? != 0 ] ; then - break - fi - - # (Don't use jdbFailIfPresent here since it is not safe - # to call from different processes) - $grep -s 'Input stream closed' $jdbOutFile > $devnull 2>&1 - if [ $? = 0 ] ; then - dofail "jdb input stream closed prematurely" - fi - - # If a failure has occured, quit - if [ -r "$failFile" ] ; then - break - fi - - sleep ${sleep_seconds} - done - - # jdb exited because its input stream closed prematurely - # (Don't use jdbFailIfPresent here since it is not safe - # to call from different processes) - $grep -s 'Input stream closed' $jdbOutFile > $devnull 2>&1 - if [ $? = 0 ] ; then - dofail "jdb input stream closed prematurely" - fi - - # It is necessary here to avoid the situation when JDB exited but - # mydojdbCmds() didn't finish because it waits for JDB message - # in waitForJdbMsg(), at the same time main process will finish - # the execution with no errors. - # To avoid that, wait for spawned processes to finish - case "$osname" in - SunOS) - # `wait` function doesn't work in Solaris shell as in bash, - # so create replacement that finds mydojdbCmds() shell process - # and waits for its finish - cmdsPid= - # get list of processes except main process with $topPid - processes=`$psCmd | $grep -v "$grep" | $grep -v $topPid | awk '{print $1}'` - for pid in $processes; do - # for each process grep its full args string for test name $0 - # $0 contains full test name with path - pargs -l $pid 2>$devnull | $grep "$0" >$devnull 2>&1 - if [ $? = 0 ] ; then - cmdsPid=$pid - break - fi - done - echo "--waitForFinish: Waiting for mydojdbCmds() to finish" >&2 - while [ 1 = 1 ] ; do - findPid $cmdsPid - if [ $? != 0 ] ; then - break - fi - sleep ${sleep_seconds} - done - ;; - *) - echo "--waitForFinish: Waiting for all processes to finish" >&2 - wait - ;; - esac - - if [ -r "$failFile" ] ; then - ls -l "$failFile" >&2 - echo "" >&2 - cat "$failFile" >&2 - echo "" >&2 - exit 1 - fi -} - -# $1 is the filename, $2 is the string to look for, -# $3 is the number of lines to search (from the end) -grepForString() -{ - if [ -z "$3" ] ; then - theCmd=cat - else - theCmd="tail -$3" - fi - - case "$2" in - *\>*) - # Target string contains a '>' so we better not ignore it - $theCmd $1 | $grep -s "$2" > $devnull 2>&1 - stat="$?" - ;; - *) - # Target string does not contain a '>'. - # NOTE: if $1 does not end with a new line, piping it to sed - # doesn't include the chars on the last line. Detect this - # case, and add a new line. - theFile="$1" - if [ `tail -1 "$theFile" | wc -l | sed -e 's@ @@g'` = 0 ] ; then - # The target file doesn't end with a new line so we have - # add one to a copy of the target file so the sed command - # below can filter that last line. - cp "$theFile" "$theFile.tmp" - theFile="$theFile.tmp" - echo >> "$theFile" - fi - - # See bug 6220903. Sometimes the jdb prompt chars ('> ') can - # get interleaved in the target file which can keep us from - # matching the target string. - $theCmd "$theFile" | sed -e 's@> @@g' -e 's@>@@g' \ - | $grep -s "$2" > $devnull 2>&1 - stat=$? - if [ "$theFile" != "$1" ]; then - # remove the copy of the target file - rm -f "$theFile" - fi - unset theFile - esac - - return $stat -} - -# $1 is the filename, $2 is the regexp to match and return, -# $3 is the number of lines to search (from the end) -matchRegexp() -{ - if [ -z "$3" ] ; then - theCmd=cat - else - theCmd="tail -$3" - fi - - case "$2" in - *\>*) - # Target string contains a '>' so we better not ignore it - res=`$theCmd $1 | sed -e "$2"` - ;; - *) - # Target string does not contain a '>'. - # NOTE: if $1 does not end with a new line, piping it to sed - # doesn't include the chars on the last line. Detect this - # case, and add a new line. - theFile="$1" - if [ `tail -1 "$theFile" | wc -l | sed -e 's@ @@g'` = 0 ] ; then - # The target file doesn't end with a new line so we have - # add one to a copy of the target file so the sed command - # below can filter that last line. - cp "$theFile" "$theFile.tmp" - theFile="$theFile.tmp" - echo >> "$theFile" - fi - - # See bug 6220903. Sometimes the jdb prompt chars ('> ') can - # get interleaved in the target file which can keep us from - # matching the target string. - res=`$theCmd "$theFile" | sed -e 's@> @@g' -e 's@>@@g' \ - | sed -e "$2"` - if [ "$theFile" != "$1" ]; then - # remove the copy of the target file - rm -f "$theFile" - fi - unset theFile - esac - return $res -} - -# $1 is the filename, $2 is the string to look for, -# $3 is the number of lines to search (from the end) -failIfPresent() -{ - if [ -r "$1" ] ; then - grepForString "$1" "$2" "$3" - if [ $? = 0 ] ; then - dofail "Error output found: \"$2\" in $1" $1 - fi - fi -} - -# $1 is the filename, $2 is the string to look for -# $3 is the number of lines to search (from the end) -failIfNotPresent() -{ - if [ ! -r "$1" ] ; then - dofail "Required output \"$2\" not found in $1" - fi - grepForString "$1" "$2" "$3" - if [ $? != 0 ] ; then - dofail "Required output \"$2\" not found in $1" $1 - fi - -} - -# fail if $1 is not in the jdb output -# $2 is the number of lines to search (from the end) -jdbFailIfNotPresent() -{ - failIfNotPresent $jdbOutFile "$1" $2 -} - -# fail if $1 is not in the debuggee output -# $2 is the number of lines to search (from the end) -debuggeeFailIfNotPresent() -{ - failIfNotPresent $debuggeeOutFile "$1" $2 -} - -# fail if $1 is in the jdb output -# $2 is the number of lines to search (from the end) -jdbFailIfPresent() -{ - failIfPresent $jdbOutFile "$1" $2 -} - -# fail if $1 is in the debuggee output -# $2 is the number of lines to search (from the end) -debuggeeFailIfPresent() -{ - failIfPresent $debuggeeOutFile "$1" $2 -} - -# match and return the output from the regexp $1 in the debuggee output -# $2 is the number of lines to search (from the end) -debuggeeMatchRegexp() -{ - matchRegexp $debuggeeOutFile "$1" $2 -} - - -# This should really be named 'done' instead of pass. -pass() -{ - if [ ! -r "$failFile" ] ; then - echo - echo "--Done: test passed" - exit 0 - else - ls -l "$failFile" >&2 - echo "" >&2 - cat "$failFile" >&2 - echo "" >&2 - fi -} - -runit() -{ - setup - docompile - startJdb - startDebuggee - waitForFinish - - # in hs_err file from 1.3.1 - debuggeeFailIfPresent "Virtual Machine Error" - - # in hs_err file from 1.4.2, 1.5: An unexpected error - debuggeeFailIfPresent "An unexpected error" - - # in hs_err file from 1.4.2, 1.5: Internal error - debuggeeFailIfPresent "Internal error" - - - # Don't know how this arises - debuggeeFailIfPresent "An unexpected exception" - - # Don't know how this arises - debuggeeFailIfPresent "Internal exception" -} diff --git a/test/jdk/com/sun/jdi/ZZZcleanup.sh b/test/jdk/com/sun/jdi/ZZZcleanup.sh deleted file mode 100644 index 12506166153..00000000000 --- a/test/jdk/com/sun/jdi/ZZZcleanup.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# @test -# @bug 1234567 -# @summary no bug -# @author Jim Holmlund -# -# @run shell ZZZcleanup.sh - -# This is run by jtreg after all other tests in -# this dir have run. It kills any orphan -# processes that have been left. -# If you can figure out a better way, let me know - -mysetup() -{ - if [ -z "$TESTSRC" ] ; then - TESTSRC=. - fi - - for ii in . $TESTSRC $TESTSRC/.. ; do - if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh - break - fi - done -} - -# You could replace this next line with the contents -# of ShellScaffold.sh and this script will run just the same. -mysetup -setup -pass From 856f4fe28b56bdaebbc06ded59d89064b380bbf1 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Tue, 9 Oct 2018 20:32:24 +0100 Subject: [PATCH 050/124] 8211927: Add additional diagnostic information to java/net/BindException/Test.java Reviewed-by: dfuchs --- test/jdk/java/net/BindException/Test.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/jdk/java/net/BindException/Test.java b/test/jdk/java/net/BindException/Test.java index ab13b083ffe..4e4eed93d7b 100644 --- a/test/jdk/java/net/BindException/Test.java +++ b/test/jdk/java/net/BindException/Test.java @@ -26,9 +26,15 @@ * @bug 4417734 * @key intermittent * @summary Test that we get a BindException in all expected combinations + * @library /test/lib + * @build jdk.test.lib.NetworkConfiguration + * jdk.test.lib.Platform + * @run main Test -d */ + import java.net.*; import java.util.Enumeration; +import jdk.test.lib.NetworkConfiguration; public class Test { @@ -106,6 +112,7 @@ public class Test { } catch (BindException be) { gotBindException = true; + failed_exc = be; } catch (Exception e) { failed = true; failed_exc = e; @@ -152,6 +159,7 @@ public class Test { if (!failed) { if (gotBindException) { System.out.println("Got expected BindException - test passed!"); + failed_exc.printStackTrace(System.out); } else { System.out.println("No BindException as expected - test passed!"); } @@ -160,6 +168,7 @@ public class Test { } if (gotBindException) { System.out.println("BindException unexpected - test failed!!!"); + failed_exc.printStackTrace(System.out); } else { System.out.println("No bind failure as expected - test failed!!!"); } @@ -206,6 +215,11 @@ public class Test { */ InetAddress addrs[] = { ia4_this, ia6_this }; + if (!silent) { + System.out.println("Using ia4_this:" + ia4_this); + System.out.println("Using ia6_this:" + ia6_this); + } + Object tests[][] = getTestCombinations(); for (int i=0; i 0) { + System.err.println("********************************"); + NetworkConfiguration.printSystemConfiguration(System.err); + System.out.println("********************************"); throw new Exception(failures + " tests(s) failed - see log"); } } From 4f4a2385c58f19662e4b56551a72fa4af0d4acc7 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Tue, 9 Oct 2018 12:36:51 -0700 Subject: [PATCH 051/124] 8211880: Broken links in java.util.jar Reviewed-by: alanb, mchung, martin --- src/java.base/share/classes/java/util/jar/Attributes.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java index 5d4b7e0db8b..61b7c1613e9 100644 --- a/src/java.base/share/classes/java/util/jar/Attributes.java +++ b/src/java.base/share/classes/java/util/jar/Attributes.java @@ -550,7 +550,7 @@ public class Attributes implements Map, Cloneable { * {@code Name} object for {@code Manifest-Version} * manifest attribute. This attribute indicates the version number * of the manifest standard to which a JAR file's manifest conforms. - * @see + * @see * Manifest and Signature Specification */ public static final Name MANIFEST_VERSION = new Name("Manifest-Version"); @@ -558,7 +558,7 @@ public class Attributes implements Map, Cloneable { /** * {@code Name} object for {@code Signature-Version} * manifest attribute used when signing JAR files. - * @see + * @see * Manifest and Signature Specification */ public static final Name SIGNATURE_VERSION = new Name("Signature-Version"); @@ -572,7 +572,7 @@ public class Attributes implements Map, Cloneable { /** * {@code Name} object for {@code Class-Path} * manifest attribute. - * @see + * @see * JAR file specification */ public static final Name CLASS_PATH = new Name("Class-Path"); From a2ad8f419f34deed5fc0c6f4e78d8b7c0bea4e63 Mon Sep 17 00:00:00 2001 From: Jiangli Zhou Date: Tue, 9 Oct 2018 15:58:07 -0400 Subject: [PATCH 052/124] 8206009: Move CDS java heap object archiving code to heapShared.hpp and heapShared.cpp Restructure and cleanup java heap object archiving code. Reviewed-by: coleenp, iklam --- src/hotspot/share/classfile/javaClasses.cpp | 25 +- src/hotspot/share/classfile/stringTable.cpp | 12 +- .../share/classfile/systemDictionary.cpp | 5 +- src/hotspot/share/gc/g1/g1Allocator.hpp | 2 +- .../share/gc/g1/g1Allocator.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 3 +- .../gc/g1/g1FullGCOopClosures.inline.hpp | 2 +- src/hotspot/share/gc/g1/g1HeapVerifier.cpp | 2 +- src/hotspot/share/memory/filemap.cpp | 10 +- src/hotspot/share/memory/heapShared.cpp | 213 ++++++++++++++++-- src/hotspot/share/memory/heapShared.hpp | 79 ++++++- .../share/memory/heapShared.inline.hpp | 7 + src/hotspot/share/memory/metaspaceShared.cpp | 185 ++------------- src/hotspot/share/memory/metaspaceShared.hpp | 60 +---- src/hotspot/share/memory/universe.cpp | 16 +- src/hotspot/share/oops/constantPool.cpp | 7 +- src/hotspot/share/oops/cpCache.cpp | 3 +- src/hotspot/share/oops/klass.cpp | 3 +- src/hotspot/share/oops/oop.cpp | 6 +- src/hotspot/share/oops/oop.hpp | 2 +- src/hotspot/share/oops/oop.inline.hpp | 4 +- src/hotspot/share/prims/whitebox.cpp | 9 +- 22 files changed, 350 insertions(+), 307 deletions(-) diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp index 3f3ec150f54..f94f5c655d6 100644 --- a/src/hotspot/share/classfile/javaClasses.cpp +++ b/src/hotspot/share/classfile/javaClasses.cpp @@ -36,8 +36,9 @@ #include "interpreter/linkResolver.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" +#include "memory/heapShared.inline.hpp" +#include "memory/metaspaceShared.hpp" #include "memory/oopFactory.hpp" -#include "memory/metaspaceShared.inline.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "oops/fieldStreams.hpp" @@ -750,7 +751,7 @@ static void initialize_static_field(fieldDescriptor* fd, Handle mirror, TRAPS) { { assert(fd->signature() == vmSymbols::string_signature(), "just checking"); - if (DumpSharedSpaces && MetaspaceShared::is_archive_object(mirror())) { + if (DumpSharedSpaces && HeapShared::is_archived_object(mirror())) { // Archive the String field and update the pointer. oop s = mirror()->obj_field(fd->offset()); oop archived_s = StringTable::create_archived_string(s, CHECK); @@ -788,7 +789,7 @@ void java_lang_Class::fixup_mirror(Klass* k, TRAPS) { } if (k->is_shared() && k->has_raw_archived_mirror()) { - if (MetaspaceShared::open_archive_heap_region_mapped()) { + if (HeapShared::open_archive_heap_region_mapped()) { bool present = restore_archived_mirror(k, Handle(), Handle(), Handle(), CHECK); assert(present, "Missing archived mirror for %s", k->external_name()); return; @@ -1011,14 +1012,14 @@ class ResetMirrorField: public FieldClosure { }; void java_lang_Class::archive_basic_type_mirrors(TRAPS) { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), - "MetaspaceShared::is_heap_object_archiving_allowed() must be true"); + assert(HeapShared::is_heap_object_archiving_allowed(), + "HeapShared::is_heap_object_archiving_allowed() must be true"); for (int t = 0; t <= T_VOID; t++) { oop m = Universe::_mirrors[t]; if (m != NULL) { // Update the field at _array_klass_offset to point to the relocated array klass. - oop archived_m = MetaspaceShared::archive_heap_object(m, THREAD); + oop archived_m = HeapShared::archive_heap_object(m, THREAD); assert(archived_m != NULL, "sanity"); Klass *ak = (Klass*)(archived_m->metadata_field(_array_klass_offset)); assert(ak != NULL || t == T_VOID, "should not be NULL"); @@ -1071,8 +1072,8 @@ void java_lang_Class::archive_basic_type_mirrors(TRAPS) { // be used at runtime, new mirror object is created for the shared // class. The _has_archived_raw_mirror is cleared also during the process. oop java_lang_Class::archive_mirror(Klass* k, TRAPS) { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), - "MetaspaceShared::is_heap_object_archiving_allowed() must be true"); + assert(HeapShared::is_heap_object_archiving_allowed(), + "HeapShared::is_heap_object_archiving_allowed() must be true"); // Mirror is already archived if (k->has_raw_archived_mirror()) { @@ -1101,7 +1102,7 @@ oop java_lang_Class::archive_mirror(Klass* k, TRAPS) { } // Now start archiving the mirror object - oop archived_mirror = MetaspaceShared::archive_heap_object(mirror, THREAD); + oop archived_mirror = HeapShared::archive_heap_object(mirror, THREAD); if (archived_mirror == NULL) { return NULL; } @@ -1139,7 +1140,7 @@ oop java_lang_Class::process_archived_mirror(Klass* k, oop mirror, if (k->is_typeArray_klass()) { // The primitive type mirrors are already archived. Get the archived mirror. oop comp_mirror = java_lang_Class::component_mirror(mirror); - archived_comp_mirror = MetaspaceShared::find_archived_heap_object(comp_mirror); + archived_comp_mirror = HeapShared::find_archived_heap_object(comp_mirror); assert(archived_comp_mirror != NULL, "Must be"); } else { assert(k->is_objArray_klass(), "Must be"); @@ -1202,7 +1203,7 @@ bool java_lang_Class::restore_archived_mirror(Klass *k, return true; } - oop m = MetaspaceShared::materialize_archived_object(k->archived_java_mirror_raw_narrow()); + oop m = HeapShared::materialize_archived_object(k->archived_java_mirror_raw_narrow()); if (m == NULL) { return false; @@ -1211,7 +1212,7 @@ bool java_lang_Class::restore_archived_mirror(Klass *k, log_debug(cds, mirror)("Archived mirror is: " PTR_FORMAT, p2i(m)); // mirror is archived, restore - assert(MetaspaceShared::is_archive_object(m), "must be archived mirror object"); + assert(HeapShared::is_archived_object(m), "must be archived mirror object"); Handle mirror(THREAD, m); if (!k->is_array_klass()) { diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp index 1231e3729ac..ec95e572c98 100644 --- a/src/hotspot/share/classfile/stringTable.cpp +++ b/src/hotspot/share/classfile/stringTable.cpp @@ -36,7 +36,6 @@ #include "memory/allocation.inline.hpp" #include "memory/filemap.hpp" #include "memory/heapShared.inline.hpp" -#include "memory/metaspaceShared.inline.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "oops/access.inline.hpp" @@ -798,18 +797,17 @@ oop StringTable::lookup_shared(const jchar* name, int len, unsigned int hash) { oop StringTable::create_archived_string(oop s, Thread* THREAD) { assert(DumpSharedSpaces, "this function is only used with -Xshare:dump"); - if (MetaspaceShared::is_archive_object(s)) { + if (HeapShared::is_archived_object(s)) { return s; } oop new_s = NULL; typeArrayOop v = java_lang_String::value_no_keepalive(s); - typeArrayOop new_v = - (typeArrayOop)MetaspaceShared::archive_heap_object(v, THREAD); + typeArrayOop new_v = (typeArrayOop)HeapShared::archive_heap_object(v, THREAD); if (new_v == NULL) { return NULL; } - new_s = MetaspaceShared::archive_heap_object(s, THREAD); + new_s = HeapShared::archive_heap_object(s, THREAD); if (new_s == NULL) { return NULL; } @@ -847,14 +845,14 @@ struct CopyToArchive : StackObj { }; void StringTable::copy_shared_string_table(CompactHashtableWriter* writer) { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), "must be"); + assert(HeapShared::is_heap_object_archiving_allowed(), "must be"); CopyToArchive copy(writer); StringTable::the_table()->_local_table->do_scan(Thread::current(), copy); } void StringTable::write_to_archive() { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), "must be"); + assert(HeapShared::is_heap_object_archiving_allowed(), "must be"); _shared_table.reset(); int num_buckets = CompactHashtableWriter::default_num_buckets( diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp index 3940daba703..194cc9320f2 100644 --- a/src/hotspot/share/classfile/systemDictionary.cpp +++ b/src/hotspot/share/classfile/systemDictionary.cpp @@ -52,6 +52,7 @@ #include "logging/log.hpp" #include "logging/logStream.hpp" #include "memory/filemap.hpp" +#include "memory/heapShared.hpp" #include "memory/metaspaceClosure.hpp" #include "memory/oopFactory.hpp" #include "memory/resourceArea.hpp" @@ -2037,13 +2038,13 @@ void SystemDictionary::resolve_preloaded_classes(TRAPS) { // ConstantPool::restore_unshareable_info (restores the archived // resolved_references array object). // - // MetaspaceShared::fixup_mapped_heap_regions() fills the empty + // HeapShared::fixup_mapped_heap_regions() fills the empty // spaces in the archived heap regions and may use // SystemDictionary::Object_klass(), so we can do this only after // Object_klass is resolved. See the above resolve_wk_klasses_through() // call. No mirror objects are accessed/restored in the above call. // Mirrors are restored after java.lang.Class is loaded. - MetaspaceShared::fixup_mapped_heap_regions(); + HeapShared::fixup_mapped_heap_regions(); // Initialize the constant pool for the Object_class Object_klass()->constants()->restore_unshareable_info(CHECK); diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp index 0a8f99e1377..4d5d052cc25 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.hpp @@ -270,7 +270,7 @@ public: // Check if the object is in open archive static inline bool is_open_archive_object(oop object); // Check if the object is either in closed archive or open archive - static inline bool is_archive_object(oop object); + static inline bool is_archived_object(oop object); private: static bool _archive_check_enabled; diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp index 10b5f315d62..05501c9d323 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp @@ -141,7 +141,7 @@ inline bool G1ArchiveAllocator::is_open_archive_object(oop object) { return (archive_check_enabled() && in_open_archive_range(object)); } -inline bool G1ArchiveAllocator::is_archive_object(oop object) { +inline bool G1ArchiveAllocator::is_archived_object(oop object) { return (archive_check_enabled() && (in_closed_archive_range(object) || in_open_archive_range(object))); } diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp index 8253f1ed8f1..c23980757bb 100644 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp @@ -80,7 +80,6 @@ #include "logging/log.hpp" #include "memory/allocation.hpp" #include "memory/iterator.hpp" -#include "memory/metaspaceShared.inline.hpp" #include "memory/resourceArea.hpp" #include "oops/access.inline.hpp" #include "oops/compressedOops.inline.hpp" @@ -827,7 +826,7 @@ void G1CollectedHeap::dealloc_archive_regions(MemRegion* ranges, size_t count) { oop G1CollectedHeap::materialize_archived_object(oop obj) { assert(obj != NULL, "archived obj is NULL"); - assert(MetaspaceShared::is_archive_object(obj), "must be archived object"); + assert(G1ArchiveAllocator::is_archived_object(obj), "must be archived object"); // Loading an archived object makes it strongly reachable. If it is // loaded during concurrent marking, it must be enqueued to the SATB diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp index f19a578460b..4e32b6f5cbf 100644 --- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp @@ -68,7 +68,7 @@ template inline void G1AdjustClosure::adjust_pointer(T* p) { oop obj = CompressedOops::decode_not_null(heap_oop); assert(Universe::heap()->is_in(obj), "should be in heap"); - if (G1ArchiveAllocator::is_archive_object(obj)) { + if (G1ArchiveAllocator::is_archived_object(obj)) { // We never forward archive objects. return; } diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp index 7c19509698c..a316c7a34e1 100644 --- a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp +++ b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp @@ -248,7 +248,7 @@ public: oop obj = RawAccess<>::oop_load(p); if (_hr->is_open_archive()) { - guarantee(obj == NULL || G1ArchiveAllocator::is_archive_object(obj), + guarantee(obj == NULL || G1ArchiveAllocator::is_archived_object(obj), "Archive object at " PTR_FORMAT " references a non-archive object at " PTR_FORMAT, p2i(p), p2i(obj)); } else { diff --git a/src/hotspot/share/memory/filemap.cpp b/src/hotspot/share/memory/filemap.cpp index 66864197b89..16eb8c692dd 100644 --- a/src/hotspot/share/memory/filemap.cpp +++ b/src/hotspot/share/memory/filemap.cpp @@ -191,7 +191,7 @@ void FileMapHeader::populate(FileMapInfo* mapinfo, size_t alignment) { _shared_path_table_size = mapinfo->_shared_path_table_size; _shared_path_table = mapinfo->_shared_path_table; _shared_path_entry_size = mapinfo->_shared_path_entry_size; - if (MetaspaceShared::is_heap_object_archiving_allowed()) { + if (HeapShared::is_heap_object_archiving_allowed()) { _heap_reserved = Universe::heap()->reserved_region(); } @@ -908,7 +908,7 @@ MemRegion FileMapInfo::get_heap_regions_range_with_current_oop_encoding_mode() { // regions may be added. GC may mark and update references in the mapped // open archive objects. void FileMapInfo::map_heap_regions_impl() { - if (!MetaspaceShared::is_heap_object_archiving_allowed()) { + if (!HeapShared::is_heap_object_archiving_allowed()) { log_info(cds)("CDS heap data is being ignored. UseG1GC, " "UseCompressedOops and UseCompressedClassPointers are required."); return; @@ -1000,7 +1000,7 @@ void FileMapInfo::map_heap_regions_impl() { MetaspaceShared::max_open_archive_heap_region, &num_open_archive_heap_ranges, true /* open */)) { - MetaspaceShared::set_open_archive_heap_region_mapped(); + HeapShared::set_open_archive_heap_region_mapped(); } } } @@ -1014,7 +1014,7 @@ void FileMapInfo::map_heap_regions() { assert(string_ranges == NULL && num_string_ranges == 0, "sanity"); } - if (!MetaspaceShared::open_archive_heap_region_mapped()) { + if (!HeapShared::open_archive_heap_region_mapped()) { assert(open_archive_heap_ranges == NULL && num_open_archive_heap_ranges == 0, "sanity"); } } @@ -1160,7 +1160,7 @@ bool FileMapInfo::verify_region_checksum(int i) { if ((MetaspaceShared::is_string_region(i) && !StringTable::shared_string_mapped()) || (MetaspaceShared::is_open_archive_heap_region(i) && - !MetaspaceShared::open_archive_heap_region_mapped())) { + !HeapShared::open_archive_heap_region_mapped())) { return true; // archived heap data is not mapped } const char* buf = region_addr(i); diff --git a/src/hotspot/share/memory/heapShared.cpp b/src/hotspot/share/memory/heapShared.cpp index c55415caf78..69e10b1767e 100644 --- a/src/hotspot/share/memory/heapShared.cpp +++ b/src/hotspot/share/memory/heapShared.cpp @@ -24,25 +24,200 @@ #include "precompiled.hpp" #include "classfile/javaClasses.inline.hpp" +#include "classfile/stringTable.hpp" #include "classfile/symbolTable.hpp" #include "classfile/vmSymbols.hpp" #include "logging/log.hpp" #include "logging/logMessage.hpp" #include "logging/logStream.hpp" +#include "memory/filemap.hpp" #include "memory/heapShared.inline.hpp" #include "memory/iterator.inline.hpp" #include "memory/metadataFactory.hpp" #include "memory/metaspaceClosure.hpp" -#include "memory/metaspaceShared.inline.hpp" #include "memory/resourceArea.hpp" #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/fieldDescriptor.inline.hpp" +#include "runtime/safepointVerifiers.hpp" #include "utilities/bitMap.inline.hpp" +#if INCLUDE_G1GC +#include "gc/g1/g1CollectedHeap.hpp" +#endif #if INCLUDE_CDS_JAVA_HEAP + +bool HeapShared::_open_archive_heap_region_mapped = false; +bool HeapShared::_archive_heap_region_fixed = false; + address HeapShared::_narrow_oop_base; int HeapShared::_narrow_oop_shift; + +//////////////////////////////////////////////////////////////// +// +// Java heap object archiving support +// +//////////////////////////////////////////////////////////////// +void HeapShared::fixup_mapped_heap_regions() { + FileMapInfo *mapinfo = FileMapInfo::current_info(); + mapinfo->fixup_mapped_heap_regions(); + set_archive_heap_region_fixed(); +} + +unsigned HeapShared::oop_hash(oop const& p) { + assert(!p->mark()->has_bias_pattern(), + "this object should never have been locked"); // so identity_hash won't safepoin + unsigned hash = (unsigned)p->identity_hash(); + return hash; +} + +HeapShared::ArchivedObjectCache* HeapShared::_archived_object_cache = NULL; +oop HeapShared::find_archived_heap_object(oop obj) { + assert(DumpSharedSpaces, "dump-time only"); + ArchivedObjectCache* cache = archived_object_cache(); + oop* p = cache->get(obj); + if (p != NULL) { + return *p; + } else { + return NULL; + } +} + +oop HeapShared::archive_heap_object(oop obj, Thread* THREAD) { + assert(DumpSharedSpaces, "dump-time only"); + + oop ao = find_archived_heap_object(obj); + if (ao != NULL) { + // already archived + return ao; + } + + int len = obj->size(); + if (G1CollectedHeap::heap()->is_archive_alloc_too_large(len)) { + log_debug(cds, heap)("Cannot archive, object (" PTR_FORMAT ") is too large: " SIZE_FORMAT, + p2i(obj), (size_t)obj->size()); + return NULL; + } + + // Pre-compute object identity hash at CDS dump time. + obj->identity_hash(); + + oop archived_oop = (oop)G1CollectedHeap::heap()->archive_mem_allocate(len); + if (archived_oop != NULL) { + Copy::aligned_disjoint_words((HeapWord*)obj, (HeapWord*)archived_oop, len); + MetaspaceShared::relocate_klass_ptr(archived_oop); + ArchivedObjectCache* cache = archived_object_cache(); + cache->put(obj, archived_oop); + log_debug(cds, heap)("Archived heap object " PTR_FORMAT " ==> " PTR_FORMAT, + p2i(obj), p2i(archived_oop)); + } else { + log_error(cds, heap)( + "Cannot allocate space for object " PTR_FORMAT " in archived heap region", + p2i(obj)); + vm_exit(1); + } + return archived_oop; +} + +oop HeapShared::materialize_archived_object(narrowOop v) { + assert(archive_heap_region_fixed(), + "must be called after archive heap regions are fixed"); + if (!CompressedOops::is_null(v)) { + oop obj = HeapShared::decode_from_archive(v); + return G1CollectedHeap::heap()->materialize_archived_object(obj); + } + return NULL; +} + +void HeapShared::archive_klass_objects(Thread* THREAD) { + GrowableArray* klasses = MetaspaceShared::collected_klasses(); + assert(klasses != NULL, "sanity"); + for (int i = 0; i < klasses->length(); i++) { + Klass* k = klasses->at(i); + + // archive mirror object + java_lang_Class::archive_mirror(k, CHECK); + + // archive the resolved_referenes array + if (k->is_instance_klass()) { + InstanceKlass* ik = InstanceKlass::cast(k); + ik->constants()->archive_resolved_references(THREAD); + } + } +} + +void HeapShared::archive_java_heap_objects(GrowableArray *closed, + GrowableArray *open) { + if (!is_heap_object_archiving_allowed()) { + if (log_is_enabled(Info, cds)) { + log_info(cds)( + "Archived java heap is not supported as UseG1GC, " + "UseCompressedOops and UseCompressedClassPointers are required." + "Current settings: UseG1GC=%s, UseCompressedOops=%s, UseCompressedClassPointers=%s.", + BOOL_TO_STR(UseG1GC), BOOL_TO_STR(UseCompressedOops), + BOOL_TO_STR(UseCompressedClassPointers)); + } + return; + } + + { + NoSafepointVerifier nsv; + + // Cache for recording where the archived objects are copied to + create_archived_object_cache(); + + tty->print_cr("Dumping objects to closed archive heap region ..."); + NOT_PRODUCT(StringTable::verify()); + copy_closed_archive_heap_objects(closed); + + tty->print_cr("Dumping objects to open archive heap region ..."); + copy_open_archive_heap_objects(open); + + destroy_archived_object_cache(); + } + + G1HeapVerifier::verify_archive_regions(); +} + +void HeapShared::copy_closed_archive_heap_objects( + GrowableArray * closed_archive) { + assert(is_heap_object_archiving_allowed(), "Cannot archive java heap objects"); + + Thread* THREAD = Thread::current(); + G1CollectedHeap::heap()->begin_archive_alloc_range(); + + // Archive interned string objects + StringTable::write_to_archive(); + + G1CollectedHeap::heap()->end_archive_alloc_range(closed_archive, + os::vm_allocation_granularity()); +} + +void HeapShared::copy_open_archive_heap_objects( + GrowableArray * open_archive) { + assert(is_heap_object_archiving_allowed(), "Cannot archive java heap objects"); + + Thread* THREAD = Thread::current(); + G1CollectedHeap::heap()->begin_archive_alloc_range(true /* open */); + + java_lang_Class::archive_basic_type_mirrors(THREAD); + + archive_klass_objects(THREAD); + + archive_object_subgraphs(THREAD); + + G1CollectedHeap::heap()->end_archive_alloc_range(open_archive, + os::vm_allocation_granularity()); +} + +void HeapShared::init_narrow_oop_decoding(address base, int shift) { + _narrow_oop_base = base; + _narrow_oop_shift = shift; +} + +// +// Subgraph archiving support +// HeapShared::DumpTimeKlassSubGraphInfoTable* HeapShared::_dump_time_subgraph_info_table = NULL; HeapShared::RunTimeKlassSubGraphInfoTable HeapShared::_run_time_subgraph_info_table; @@ -214,7 +389,7 @@ void HeapShared::serialize_subgraph_info_table_header(SerializeClosure* soc) { } void HeapShared::initialize_from_archived_subgraph(Klass* k) { - if (!MetaspaceShared::open_archive_heap_region_mapped()) { + if (!open_archive_heap_region_mapped()) { return; // nothing to do } assert(!DumpSharedSpaces, "Should not be called with DumpSharedSpaces"); @@ -274,8 +449,7 @@ void HeapShared::initialize_from_archived_subgraph(Klass* k) { // The object refereced by the field becomes 'known' by GC from this // point. All objects in the subgraph reachable from the object are // also 'known' by GC. - oop v = MetaspaceShared::materialize_archived_object( - entry_field_records->at(i+1)); + oop v = materialize_archived_object(entry_field_records->at(i+1)); m->obj_field_put(field_offset, v); i += 2; @@ -310,7 +484,7 @@ class WalkOopAndArchiveClosure: public BasicOopIterateClosure { template void do_oop_work(T *p) { oop obj = RawAccess<>::oop_load(p); if (!CompressedOops::is_null(obj)) { - assert(!MetaspaceShared::is_archive_object(obj), + assert(!HeapShared::is_archived_object(obj), "original objects must not point to archived objects"); size_t field_delta = pointer_delta(p, _orig_referencing_obj, sizeof(char)); @@ -329,7 +503,7 @@ class WalkOopAndArchiveClosure: public BasicOopIterateClosure { oop archived = HeapShared::archive_reachable_objects_from(_level + 1, _subgraph_info, obj, THREAD); assert(archived != NULL, "VM should have exited with unarchivable objects for _level > 1"); - assert(MetaspaceShared::is_archive_object(archived), "must be"); + assert(HeapShared::is_archived_object(archived), "must be"); if (!_record_klasses_only) { // Update the reference in the archived copy of the referencing object. @@ -347,7 +521,7 @@ class WalkOopAndArchiveClosure: public BasicOopIterateClosure { // (3) Record the klasses of all orig_obj and all reachable objects. oop HeapShared::archive_reachable_objects_from(int level, KlassSubGraphInfo* subgraph_info, oop orig_obj, TRAPS) { assert(orig_obj != NULL, "must be"); - assert(!MetaspaceShared::is_archive_object(orig_obj), "sanity"); + assert(!is_archived_object(orig_obj), "sanity"); // java.lang.Class instances cannot be included in an archived // object sub-graph. @@ -356,7 +530,7 @@ oop HeapShared::archive_reachable_objects_from(int level, KlassSubGraphInfo* sub vm_exit(1); } - oop archived_obj = MetaspaceShared::find_archived_heap_object(orig_obj); + oop archived_obj = find_archived_heap_object(orig_obj); if (java_lang_String::is_instance(orig_obj) && archived_obj != NULL) { // To save time, don't walk strings that are already archived. They just contain // pointers to a type array, whose klass doesn't need to be recorded. @@ -373,7 +547,7 @@ oop HeapShared::archive_reachable_objects_from(int level, KlassSubGraphInfo* sub bool record_klasses_only = (archived_obj != NULL); if (archived_obj == NULL) { ++_num_new_archived_objs; - archived_obj = MetaspaceShared::archive_heap_object(orig_obj, THREAD); + archived_obj = archive_heap_object(orig_obj, THREAD); if (archived_obj == NULL) { // Skip archiving the sub-graph referenced from the current entry field. ResourceMark rm; @@ -447,7 +621,7 @@ void HeapShared::archive_reachable_objects_from_static_field(InstanceKlass *k, assert(k->is_shared_boot_class(), "must be boot class"); oop m = k->java_mirror(); - oop archived_m = MetaspaceShared::find_archived_heap_object(m); + oop archived_m = find_archived_heap_object(m); if (CompressedOops::is_null(archived_m)) { return; } @@ -508,7 +682,7 @@ void HeapShared::verify_subgraph_from_static_field(InstanceKlass* k, int field_o assert(k->is_shared_boot_class(), "must be boot class"); oop m = k->java_mirror(); - oop archived_m = MetaspaceShared::find_archived_heap_object(m); + oop archived_m = find_archived_heap_object(m); if (CompressedOops::is_null(archived_m)) { return; } @@ -519,7 +693,7 @@ void HeapShared::verify_subgraph_from_static_field(InstanceKlass* k, int field_o } void HeapShared::verify_subgraph_from(oop orig_obj) { - oop archived_obj = MetaspaceShared::find_archived_heap_object(orig_obj); + oop archived_obj = find_archived_heap_object(orig_obj); if (archived_obj == NULL) { // It's OK for the root of a subgraph to be not archived. See comments in // archive_reachable_objects_from(). @@ -546,11 +720,11 @@ void HeapShared::verify_reachable_objects_from(oop obj, bool is_archived) { set_has_been_seen_during_subgraph_recording(obj); if (is_archived) { - assert(MetaspaceShared::is_archive_object(obj), "must be"); - assert(MetaspaceShared::find_archived_heap_object(obj) == NULL, "must be"); + assert(is_archived_object(obj), "must be"); + assert(find_archived_heap_object(obj) == NULL, "must be"); } else { - assert(!MetaspaceShared::is_archive_object(obj), "must be"); - assert(MetaspaceShared::find_archived_heap_object(obj) != NULL, "must be"); + assert(!is_archived_object(obj), "must be"); + assert(find_archived_heap_object(obj) != NULL, "must be"); } VerifySharedOopClosure walker(is_archived); @@ -670,7 +844,7 @@ void HeapShared::init_archivable_static_fields(Thread* THREAD) { } } -void HeapShared::archive_static_fields(Thread* THREAD) { +void HeapShared::archive_object_subgraphs(Thread* THREAD) { // For each class X that has one or more archived fields: // [1] Dump the subgraph of each archived field // [2] Create a list of all the class of the objects that can be reached @@ -767,11 +941,6 @@ ResourceBitMap HeapShared::calculate_oopmap(MemRegion region) { return oopmap; } -void HeapShared::init_narrow_oop_decoding(address base, int shift) { - _narrow_oop_base = base; - _narrow_oop_shift = shift; -} - // Patch all the embedded oop pointers inside an archived heap region, // to be consistent with the runtime oop encoding. class PatchEmbeddedPointers: public BitMapClosure { diff --git a/src/hotspot/share/memory/heapShared.hpp b/src/hotspot/share/memory/heapShared.hpp index 92c10e41120..2e357949ba6 100644 --- a/src/hotspot/share/memory/heapShared.hpp +++ b/src/hotspot/share/memory/heapShared.hpp @@ -107,7 +107,22 @@ class ArchivedKlassSubGraphInfoRecord { class HeapShared: AllStatic { friend class VerifySharedOopClosure; private: + #if INCLUDE_CDS_JAVA_HEAP + static bool _open_archive_heap_region_mapped; + static bool _archive_heap_region_fixed; + + static bool oop_equals(oop const& p1, oop const& p2) { + return oopDesc::equals(p1, p2); + } + static unsigned oop_hash(oop const& p); + + typedef ResourceHashtable ArchivedObjectCache; + static ArchivedObjectCache* _archived_object_cache; static bool klass_equals(Klass* const& p1, Klass* const& p2) { return primitive_equals(p1, p2); @@ -164,14 +179,6 @@ class HeapShared: AllStatic { static address _narrow_oop_base; static int _narrow_oop_shift; - static bool oop_equals(oop const& p1, oop const& p2) { - return primitive_equals(p1, p2); - } - - static unsigned oop_hash(oop const& p) { - return primitive_hash
    ((address)p); - } - typedef ResourceHashtable *closed, + GrowableArray *open); + static void copy_closed_archive_heap_objects(GrowableArray * closed_archive); + static void copy_open_archive_heap_objects(GrowableArray * open_archive); +#endif // INCLUDE_CDS_JAVA_HEAP + + public: + static bool is_heap_object_archiving_allowed() { + CDS_JAVA_HEAP_ONLY(return (UseG1GC && UseCompressedOops && UseCompressedClassPointers);) + NOT_CDS_JAVA_HEAP(return false;) + } + + static void set_open_archive_heap_region_mapped() { + CDS_JAVA_HEAP_ONLY(_open_archive_heap_region_mapped = true); + NOT_CDS_JAVA_HEAP_RETURN; + } + static bool open_archive_heap_region_mapped() { + CDS_JAVA_HEAP_ONLY(return _open_archive_heap_region_mapped); + NOT_CDS_JAVA_HEAP_RETURN_(false); + } + + static void fixup_mapped_heap_regions() NOT_CDS_JAVA_HEAP_RETURN; + + inline static bool is_archived_object(oop p) NOT_CDS_JAVA_HEAP_RETURN_(false); + + static void archive_java_heap_objects() NOT_CDS_JAVA_HEAP_RETURN; + static char* read_archived_subgraph_infos(char* buffer) NOT_CDS_JAVA_HEAP_RETURN_(buffer); static void write_archived_subgraph_infos() NOT_CDS_JAVA_HEAP_RETURN; static void initialize_from_archived_subgraph(Klass* k) NOT_CDS_JAVA_HEAP_RETURN; @@ -225,7 +284,7 @@ class HeapShared: AllStatic { size_t oopmap_in_bits) NOT_CDS_JAVA_HEAP_RETURN; static void init_archivable_static_fields(Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN; - static void archive_static_fields(Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN; + static void archive_object_subgraphs(Thread* THREAD) NOT_CDS_JAVA_HEAP_RETURN; static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN; static void serialize_subgraph_info_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; diff --git a/src/hotspot/share/memory/heapShared.inline.hpp b/src/hotspot/share/memory/heapShared.inline.hpp index e7b011c9dff..8a279b46e8c 100644 --- a/src/hotspot/share/memory/heapShared.inline.hpp +++ b/src/hotspot/share/memory/heapShared.inline.hpp @@ -27,9 +27,16 @@ #include "oops/compressedOops.inline.hpp" #include "memory/heapShared.hpp" +#if INCLUDE_G1GC +#include "gc/g1/g1Allocator.inline.hpp" +#endif #if INCLUDE_CDS_JAVA_HEAP +bool HeapShared::is_archived_object(oop p) { + return (p == NULL) ? false : G1ArchiveAllocator::is_archived_object(p); +} + inline oop HeapShared::decode_from_archive(narrowOop v) { assert(!CompressedOops::is_null(v), "narrow oop value can never be zero"); oop result = (oop)(void*)((uintptr_t)_narrow_oop_base + ((uintptr_t)v << _narrow_oop_shift)); diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp index 930b57457af..53102b12dd5 100644 --- a/src/hotspot/share/memory/metaspaceShared.cpp +++ b/src/hotspot/share/memory/metaspaceShared.cpp @@ -75,8 +75,6 @@ MetaspaceSharedStats MetaspaceShared::_stats; bool MetaspaceShared::_has_error_classes; bool MetaspaceShared::_archive_loading_failed = false; bool MetaspaceShared::_remapped_readwrite = false; -bool MetaspaceShared::_open_archive_heap_region_mapped = false; -bool MetaspaceShared::_archive_heap_region_fixed = false; address MetaspaceShared::_cds_i2i_entry_code_buffers = NULL; size_t MetaspaceShared::_cds_i2i_entry_code_buffers_size = 0; size_t MetaspaceShared::_core_spaces_size = 0; @@ -108,7 +106,7 @@ size_t MetaspaceShared::_core_spaces_size = 0; // [5] C++ vtables are copied into the md region. // [6] Original class files are copied into the od region. // -// The s0/s1 and oa0/oa1 regions are populated inside MetaspaceShared::dump_java_heap_objects. +// The s0/s1 and oa0/oa1 regions are populated inside HeapShared::archive_java_heap_objects. // Their layout is independent of the other 5 regions. class DumpRegion { @@ -454,6 +452,10 @@ address MetaspaceShared::cds_i2i_entry_code_buffers(size_t total_size) { // is run at a safepoint just before exit, this is the entire set of classes. static GrowableArray* _global_klass_objects; +GrowableArray* MetaspaceShared::collected_klasses() { + return _global_klass_objects; +} + static void collect_array_classes(Klass* k) { _global_klass_objects->append_if_missing(k); if (k->is_array_klass()) { @@ -512,7 +514,7 @@ static void remove_java_mirror_in_classes() { } static void clear_basic_type_mirrors() { - assert(!MetaspaceShared::is_heap_object_archiving_allowed(), "Sanity"); + assert(!HeapShared::is_heap_object_archiving_allowed(), "Sanity"); Universe::set_int_mirror(NULL); Universe::set_float_mirror(NULL); Universe::set_double_mirror(NULL); @@ -850,7 +852,7 @@ public: if (*o == NULL) { _dump_region->append_intptr_t(0); } else { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), + assert(HeapShared::is_heap_object_archiving_allowed(), "Archiving heap object is not allowed"); _dump_region->append_intptr_t( (intptr_t)CompressedOops::encode_not_null(*o)); @@ -1329,7 +1331,7 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables() { SystemDictionary::reorder_dictionary_for_sharing(); tty->print("Removing java_mirror ... "); - if (!MetaspaceShared::is_heap_object_archiving_allowed()) { + if (!HeapShared::is_heap_object_archiving_allowed()) { clear_basic_type_mirrors(); } remove_java_mirror_in_classes(); @@ -1798,47 +1800,18 @@ bool MetaspaceShared::try_link_class(InstanceKlass* ik, TRAPS) { #if INCLUDE_CDS_JAVA_HEAP void VM_PopulateDumpSharedSpace::dump_java_heap_objects() { - if (!MetaspaceShared::is_heap_object_archiving_allowed()) { - if (log_is_enabled(Info, cds)) { - log_info(cds)( - "Archived java heap is not supported as UseG1GC, " - "UseCompressedOops and UseCompressedClassPointers are required." - "Current settings: UseG1GC=%s, UseCompressedOops=%s, UseCompressedClassPointers=%s.", - BOOL_TO_STR(UseG1GC), BOOL_TO_STR(UseCompressedOops), - BOOL_TO_STR(UseCompressedClassPointers)); - } - return; - } - - { - NoSafepointVerifier nsv; - - // Cache for recording where the archived objects are copied to - MetaspaceShared::create_archive_object_cache(); - - tty->print_cr("Dumping objects to closed archive heap region ..."); - NOT_PRODUCT(StringTable::verify()); - // The closed space has maximum two regions. See FileMapInfo::write_archive_heap_regions() for details. - _closed_archive_heap_regions = new GrowableArray(2); - MetaspaceShared::dump_closed_archive_heap_objects(_closed_archive_heap_regions); - - tty->print_cr("Dumping objects to open archive heap region ..."); - _open_archive_heap_regions = new GrowableArray(2); - MetaspaceShared::dump_open_archive_heap_objects(_open_archive_heap_regions); - - MetaspaceShared::destroy_archive_object_cache(); - } - - G1HeapVerifier::verify_archive_regions(); - - { - ArchiveCompactor::OtherROAllocMark mark; - HeapShared::write_subgraph_info_table(); - } + // The closed and open archive heap space has maximum two regions. + // See FileMapInfo::write_archive_heap_regions() for details. + _closed_archive_heap_regions = new GrowableArray(2); + _open_archive_heap_regions = new GrowableArray(2); + HeapShared::archive_java_heap_objects(_closed_archive_heap_regions, + _open_archive_heap_regions); + ArchiveCompactor::OtherROAllocMark mark; + HeapShared::write_subgraph_info_table(); } void VM_PopulateDumpSharedSpace::dump_archive_heap_oopmaps() { - if (MetaspaceShared::is_heap_object_archiving_allowed()) { + if (HeapShared::is_heap_object_archiving_allowed()) { _closed_archive_heap_oopmaps = new GrowableArray(2); dump_archive_heap_oopmaps(_closed_archive_heap_regions, _closed_archive_heap_oopmaps); @@ -1866,124 +1839,6 @@ void VM_PopulateDumpSharedSpace::dump_archive_heap_oopmaps(GrowableArrayappend(info); } } - -void MetaspaceShared::dump_closed_archive_heap_objects( - GrowableArray * closed_archive) { - assert(is_heap_object_archiving_allowed(), "Cannot dump java heap objects"); - - Thread* THREAD = Thread::current(); - G1CollectedHeap::heap()->begin_archive_alloc_range(); - - // Archive interned string objects - StringTable::write_to_archive(); - - G1CollectedHeap::heap()->end_archive_alloc_range(closed_archive, - os::vm_allocation_granularity()); -} - -void MetaspaceShared::dump_open_archive_heap_objects( - GrowableArray * open_archive) { - assert(UseG1GC, "Only support G1 GC"); - assert(UseCompressedOops && UseCompressedClassPointers, - "Only support UseCompressedOops and UseCompressedClassPointers enabled"); - - Thread* THREAD = Thread::current(); - G1CollectedHeap::heap()->begin_archive_alloc_range(true /* open */); - - java_lang_Class::archive_basic_type_mirrors(THREAD); - - MetaspaceShared::archive_klass_objects(THREAD); - - HeapShared::archive_static_fields(THREAD); - - G1CollectedHeap::heap()->end_archive_alloc_range(open_archive, - os::vm_allocation_granularity()); -} - -unsigned MetaspaceShared::obj_hash(oop const& p) { - assert(!p->mark()->has_bias_pattern(), - "this object should never have been locked"); // so identity_hash won't safepoint - unsigned hash = (unsigned)p->identity_hash(); - return hash; -} - -MetaspaceShared::ArchivedObjectCache* MetaspaceShared::_archive_object_cache = NULL; -oop MetaspaceShared::find_archived_heap_object(oop obj) { - assert(DumpSharedSpaces, "dump-time only"); - ArchivedObjectCache* cache = MetaspaceShared::archive_object_cache(); - oop* p = cache->get(obj); - if (p != NULL) { - return *p; - } else { - return NULL; - } -} - -oop MetaspaceShared::archive_heap_object(oop obj, Thread* THREAD) { - assert(DumpSharedSpaces, "dump-time only"); - - oop ao = find_archived_heap_object(obj); - if (ao != NULL) { - // already archived - return ao; - } - - int len = obj->size(); - if (G1CollectedHeap::heap()->is_archive_alloc_too_large(len)) { - log_debug(cds, heap)("Cannot archive, object (" PTR_FORMAT ") is too large: " SIZE_FORMAT, - p2i(obj), (size_t)obj->size()); - return NULL; - } - - int hash = obj->identity_hash(); - oop archived_oop = (oop)G1CollectedHeap::heap()->archive_mem_allocate(len); - if (archived_oop != NULL) { - Copy::aligned_disjoint_words((HeapWord*)obj, (HeapWord*)archived_oop, len); - relocate_klass_ptr(archived_oop); - ArchivedObjectCache* cache = MetaspaceShared::archive_object_cache(); - cache->put(obj, archived_oop); - log_debug(cds, heap)("Archived heap object " PTR_FORMAT " ==> " PTR_FORMAT, - p2i(obj), p2i(archived_oop)); - } else { - log_error(cds, heap)( - "Cannot allocate space for object " PTR_FORMAT " in archived heap region", - p2i(obj)); - vm_exit(1); - } - return archived_oop; -} - -oop MetaspaceShared::materialize_archived_object(narrowOop v) { - assert(archive_heap_region_fixed(), - "must be called after archive heap regions are fixed"); - if (!CompressedOops::is_null(v)) { - oop obj = HeapShared::decode_from_archive(v); - return G1CollectedHeap::heap()->materialize_archived_object(obj); - } - return NULL; -} - -void MetaspaceShared::archive_klass_objects(Thread* THREAD) { - int i; - for (i = 0; i < _global_klass_objects->length(); i++) { - Klass* k = _global_klass_objects->at(i); - - // archive mirror object - java_lang_Class::archive_mirror(k, CHECK); - - // archive the resolved_referenes array - if (k->is_instance_klass()) { - InstanceKlass* ik = InstanceKlass::cast(k); - ik->constants()->archive_resolved_references(THREAD); - } - } -} - -void MetaspaceShared::fixup_mapped_heap_regions() { - FileMapInfo *mapinfo = FileMapInfo::current_info(); - mapinfo->fixup_mapped_heap_regions(); - set_archive_heap_region_fixed(); -} #endif // INCLUDE_CDS_JAVA_HEAP // Closure for serializing initialization data in from a data area @@ -2023,12 +1878,12 @@ public: void do_oop(oop *p) { narrowOop o = (narrowOop)nextPtr(); - if (o == 0 || !MetaspaceShared::open_archive_heap_region_mapped()) { + if (o == 0 || !HeapShared::open_archive_heap_region_mapped()) { p = NULL; } else { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), + assert(HeapShared::is_heap_object_archiving_allowed(), "Archived heap object is not allowed"); - assert(MetaspaceShared::open_archive_heap_region_mapped(), + assert(HeapShared::open_archive_heap_region_mapped(), "Open archive heap region is not mapped"); *p = HeapShared::decode_from_archive(o); } diff --git a/src/hotspot/share/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp index f0dc36a9cb7..eeb5b455d65 100644 --- a/src/hotspot/share/memory/metaspaceShared.hpp +++ b/src/hotspot/share/memory/metaspaceShared.hpp @@ -58,8 +58,6 @@ class MetaspaceShared : AllStatic { static bool _has_error_classes; static bool _archive_loading_failed; static bool _remapped_readwrite; - static bool _open_archive_heap_region_mapped; - static bool _archive_heap_region_fixed; static address _cds_i2i_entry_code_buffers; static size_t _cds_i2i_entry_code_buffers_size; static size_t _core_spaces_size; @@ -93,63 +91,7 @@ class MetaspaceShared : AllStatic { static int preload_classes(const char * class_list_path, TRAPS) NOT_CDS_RETURN_(0); -#if INCLUDE_CDS_JAVA_HEAP - private: - static bool obj_equals(oop const& p1, oop const& p2) { - return p1 == p2; - } - static unsigned obj_hash(oop const& p); - - typedef ResourceHashtable ArchivedObjectCache; - static ArchivedObjectCache* _archive_object_cache; - - public: - static ArchivedObjectCache* archive_object_cache() { - return _archive_object_cache; - } - static oop find_archived_heap_object(oop obj); - static oop archive_heap_object(oop obj, Thread* THREAD); - static oop materialize_archived_object(narrowOop v); - static void archive_klass_objects(Thread* THREAD); - - static void set_archive_heap_region_fixed() { - _archive_heap_region_fixed = true; - } - - static bool archive_heap_region_fixed() { - return _archive_heap_region_fixed; - } -#endif - - inline static bool is_archive_object(oop p) NOT_CDS_JAVA_HEAP_RETURN_(false); - - static bool is_heap_object_archiving_allowed() { - CDS_JAVA_HEAP_ONLY(return (UseG1GC && UseCompressedOops && UseCompressedClassPointers);) - NOT_CDS_JAVA_HEAP(return false;) - } - static void create_archive_object_cache() { - CDS_JAVA_HEAP_ONLY(_archive_object_cache = new (ResourceObj::C_HEAP, mtClass)ArchivedObjectCache();); - } - static void destroy_archive_object_cache() { - CDS_JAVA_HEAP_ONLY(delete _archive_object_cache; _archive_object_cache = NULL;); - } - static void fixup_mapped_heap_regions() NOT_CDS_JAVA_HEAP_RETURN; - - static void dump_closed_archive_heap_objects(GrowableArray * closed_archive) NOT_CDS_JAVA_HEAP_RETURN; - - static void dump_open_archive_heap_objects(GrowableArray * open_archive) NOT_CDS_JAVA_HEAP_RETURN; - static void set_open_archive_heap_region_mapped() { - CDS_JAVA_HEAP_ONLY(_open_archive_heap_region_mapped = true); - NOT_CDS_JAVA_HEAP_RETURN; - } - static bool open_archive_heap_region_mapped() { - CDS_JAVA_HEAP_ONLY(return _open_archive_heap_region_mapped); - NOT_CDS_JAVA_HEAP_RETURN_(false); - } + static GrowableArray* collected_klasses(); static ReservedSpace* shared_rs() { CDS_ONLY(return &_shared_rs); diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp index c1801e3f164..b62f6281a25 100644 --- a/src/hotspot/share/memory/universe.cpp +++ b/src/hotspot/share/memory/universe.cpp @@ -39,6 +39,7 @@ #include "interpreter/interpreter.hpp" #include "logging/log.hpp" #include "logging/logStream.hpp" +#include "memory/heapShared.hpp" #include "memory/filemap.hpp" #include "memory/metadataFactory.hpp" #include "memory/metaspaceClosure.hpp" @@ -242,8 +243,15 @@ void Universe::serialize(SerializeClosure* f) { f->do_ptr((void**)&_objectArrayKlassObj); #if INCLUDE_CDS_JAVA_HEAP - // The mirrors are NULL if MetaspaceShared::is_heap_object_archiving_allowed - // is false. +#ifdef ASSERT + if (DumpSharedSpaces && !HeapShared::is_heap_object_archiving_allowed()) { + assert(_int_mirror == NULL && _float_mirror == NULL && + _double_mirror == NULL && _byte_mirror == NULL && + _bool_mirror == NULL && _char_mirror == NULL && + _long_mirror == NULL && _short_mirror == NULL && + _void_mirror == NULL, "mirrors should be NULL"); + } +#endif f->do_oop(&_int_mirror); f->do_oop(&_float_mirror); f->do_oop(&_double_mirror); @@ -422,9 +430,9 @@ void Universe::genesis(TRAPS) { void Universe::initialize_basic_type_mirrors(TRAPS) { #if INCLUDE_CDS_JAVA_HEAP if (UseSharedSpaces && - MetaspaceShared::open_archive_heap_region_mapped() && + HeapShared::open_archive_heap_region_mapped() && _int_mirror != NULL) { - assert(MetaspaceShared::is_heap_object_archiving_allowed(), "Sanity"); + assert(HeapShared::is_heap_object_archiving_allowed(), "Sanity"); assert(_float_mirror != NULL && _double_mirror != NULL && _byte_mirror != NULL && _byte_mirror != NULL && _bool_mirror != NULL && _char_mirror != NULL && diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp index 9b84e21770c..5e2846a0317 100644 --- a/src/hotspot/share/oops/constantPool.cpp +++ b/src/hotspot/share/oops/constantPool.cpp @@ -33,6 +33,7 @@ #include "interpreter/linkResolver.hpp" #include "memory/allocation.inline.hpp" #include "memory/heapInspection.hpp" +#include "memory/heapShared.hpp" #include "memory/metadataFactory.hpp" #include "memory/metaspaceClosure.hpp" #include "memory/metaspaceShared.hpp" @@ -295,7 +296,7 @@ void ConstantPool::archive_resolved_references(Thread* THREAD) { } } - oop archived = MetaspaceShared::archive_heap_object(rr, THREAD); + oop archived = HeapShared::archive_heap_object(rr, THREAD); // If the resolved references array is not archived (too large), // the 'archived' object is NULL. No need to explicitly check // the return value of archive_heap_object here. At runtime, the @@ -340,7 +341,7 @@ void ConstantPool::restore_unshareable_info(TRAPS) { if (SystemDictionary::Object_klass_loaded()) { ClassLoaderData* loader_data = pool_holder()->class_loader_data(); #if INCLUDE_CDS_JAVA_HEAP - if (MetaspaceShared::open_archive_heap_region_mapped() && + if (HeapShared::open_archive_heap_region_mapped() && _cache->archived_references() != NULL) { oop archived = _cache->archived_references(); // Create handle for the archived resolved reference array object @@ -373,7 +374,7 @@ void ConstantPool::remove_unshareable_info() { // If archiving heap objects is not allowed, clear the resolved references. // Otherwise, it is cleared after the resolved references array is cached // (see archive_resolved_references()). - if (!MetaspaceShared::is_heap_object_archiving_allowed()) { + if (!HeapShared::is_heap_object_archiving_allowed()) { set_resolved_references(NULL); } diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp index cb95b635fbf..77c2305e445 100644 --- a/src/hotspot/share/oops/cpCache.cpp +++ b/src/hotspot/share/oops/cpCache.cpp @@ -30,6 +30,7 @@ #include "interpreter/linkResolver.hpp" #include "interpreter/rewriter.hpp" #include "logging/log.hpp" +#include "memory/heapShared.hpp" #include "memory/metadataFactory.hpp" #include "memory/metaspaceClosure.hpp" #include "memory/metaspaceShared.hpp" @@ -777,7 +778,7 @@ oop ConstantPoolCache::archived_references() { if (CompressedOops::is_null(_archived_references)) { return NULL; } - return MetaspaceShared::materialize_archived_object(_archived_references); + return HeapShared::materialize_archived_object(_archived_references); } void ConstantPoolCache::set_archived_references(oop o) { diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp index db6bf64ea70..a9da8f9269c 100644 --- a/src/hotspot/share/oops/klass.cpp +++ b/src/hotspot/share/oops/klass.cpp @@ -32,6 +32,7 @@ #include "gc/shared/collectedHeap.inline.hpp" #include "logging/log.hpp" #include "memory/heapInspection.hpp" +#include "memory/heapShared.hpp" #include "memory/metadataFactory.hpp" #include "memory/metaspaceClosure.hpp" #include "memory/metaspaceShared.hpp" @@ -542,7 +543,7 @@ void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protec if (this->has_raw_archived_mirror()) { ResourceMark rm; log_debug(cds, mirror)("%s has raw archived mirror", external_name()); - if (MetaspaceShared::open_archive_heap_region_mapped()) { + if (HeapShared::open_archive_heap_region_mapped()) { bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle, protection_domain, CHECK); diff --git a/src/hotspot/share/oops/oop.cpp b/src/hotspot/share/oops/oop.cpp index ef5f8b9dc72..eda422cb305 100644 --- a/src/hotspot/share/oops/oop.cpp +++ b/src/hotspot/share/oops/oop.cpp @@ -25,7 +25,7 @@ #include "precompiled.hpp" #include "classfile/altHashing.hpp" #include "classfile/javaClasses.inline.hpp" -#include "memory/metaspaceShared.inline.hpp" +#include "memory/heapShared.inline.hpp" #include "memory/resourceArea.hpp" #include "oops/access.inline.hpp" #include "oops/oop.inline.hpp" @@ -144,8 +144,8 @@ bool oopDesc::is_unlocked_oop() const { } #if INCLUDE_CDS_JAVA_HEAP -bool oopDesc::is_archive_object(oop p) { - return MetaspaceShared::is_archive_object(p); +bool oopDesc::is_archived_object(oop p) { + return HeapShared::is_archived_object(p); } #endif #endif // PRODUCT diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp index d456dd92ae4..e6665b65172 100644 --- a/src/hotspot/share/oops/oop.hpp +++ b/src/hotspot/share/oops/oop.hpp @@ -255,7 +255,7 @@ class oopDesc { static bool is_oop_or_null(oop obj, bool ignore_mark_word = false); #ifndef PRODUCT inline bool is_unlocked_oop() const; - static bool is_archive_object(oop p) NOT_CDS_JAVA_HEAP_RETURN_(false); + static bool is_archived_object(oop p) NOT_CDS_JAVA_HEAP_RETURN_(false); #endif // garbage collection diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp index ae2f6f76877..bcc44b24eb3 100644 --- a/src/hotspot/share/oops/oop.inline.hpp +++ b/src/hotspot/share/oops/oop.inline.hpp @@ -351,8 +351,8 @@ void oopDesc::forward_to(oop p) { "forwarding to something not aligned"); assert(Universe::heap()->is_in_reserved(p), "forwarding to something not in heap"); - assert(!is_archive_object(oop(this)) && - !is_archive_object(p), + assert(!is_archived_object(oop(this)) && + !is_archived_object(p), "forwarding archive object"); markOop m = markOopDesc::encode_pointer_as_mark(p); assert(m->decode_pointer() == p, "encoding must be reversable"); diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index 5aea49e0ea0..a407d8c6e20 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -36,8 +36,9 @@ #include "gc/shared/gcConfig.hpp" #include "gc/shared/genCollectedHeap.hpp" #include "jvmtifiles/jvmtiEnv.hpp" +#include "memory/heapShared.inline.hpp" +#include "memory/metaspaceShared.hpp" #include "memory/metadataFactory.hpp" -#include "memory/metaspaceShared.inline.hpp" #include "memory/iterator.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" @@ -1765,7 +1766,7 @@ WB_END WB_ENTRY(jboolean, WB_IsShared(JNIEnv* env, jobject wb, jobject obj)) oop obj_oop = JNIHandles::resolve(obj); - return MetaspaceShared::is_archive_object(obj_oop); + return HeapShared::is_archived_object(obj_oop); WB_END WB_ENTRY(jboolean, WB_IsSharedClass(JNIEnv* env, jobject wb, jclass clazz)) @@ -1789,7 +1790,7 @@ WB_ENTRY(jobject, WB_GetResolvedReferences(JNIEnv* env, jobject wb, jclass clazz WB_END WB_ENTRY(jboolean, WB_AreOpenArchiveHeapObjectsMapped(JNIEnv* env)) - return MetaspaceShared::open_archive_heap_region_mapped(); + return HeapShared::open_archive_heap_region_mapped(); WB_END WB_ENTRY(jboolean, WB_IsCDSIncludedInVmBuild(JNIEnv* env)) @@ -1807,7 +1808,7 @@ WB_ENTRY(jboolean, WB_IsCDSIncludedInVmBuild(JNIEnv* env)) WB_END WB_ENTRY(jboolean, WB_IsJavaHeapArchiveSupported(JNIEnv* env)) - return MetaspaceShared::is_heap_object_archiving_allowed(); + return HeapShared::is_heap_object_archiving_allowed(); WB_END From 11da699d9eacd17bb955b3ee5a299134f56bb4c2 Mon Sep 17 00:00:00 2001 From: Jean Christophe Beyler Date: Tue, 9 Oct 2018 13:22:19 -0700 Subject: [PATCH 053/124] 8211905: Remove multiple casts for EM06 file Remove multiple casts for EM06 file Reviewed-by: sspitsyn, cjplummer --- .../nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp index 6f836b5186b..2920cbff1c6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp @@ -73,8 +73,7 @@ handler(jvmtiEvent event, jvmtiEnv* jvmti, JNIEnv* jni_env, return; } - jclassName = (jstring) (jstring) (jstring) (jstring) (jstring) (jstring) (jstring) (jstring) (jstring) NSK_CPP_STUB3(CallObjectMethod, jni_env, klass, - methodID); + jclassName = (jstring) NSK_CPP_STUB3(CallObjectMethod, jni_env, klass, methodID); className = NSK_CPP_STUB3(GetStringUTFChars, jni_env, jclassName, 0); From a59b517d2a18afe6c535cdfddd86109b589a9c54 Mon Sep 17 00:00:00 2001 From: Gary Adams Date: Tue, 9 Oct 2018 07:33:15 -0400 Subject: [PATCH 054/124] 8211324: Link to java.lang.ThreadGroup in JDWP spec is broken Reviewed-by: sspitsyn, chegar, alanb --- make/data/jdwp/jdwp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec index 38f998d38d9..bea43605e0c 100644 --- a/make/data/jdwp/jdwp.spec +++ b/make/data/jdwp/jdwp.spec @@ -2185,7 +2185,7 @@ JDWP "Java(tm) Debug Wire Protocol" "in this thread group. Threads and thread groups in child " "thread groups are not included. " "A thread is alive if it has been started and has not yet been stopped. " - "See java.lang.ThreadGroup + "See java.lang.ThreadGroup "for information about active ThreadGroups. (Out (threadGroupObject group "The thread group object ID. ") From d3458328a28704288daccc1ed036bae3df6a37e6 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Tue, 9 Oct 2018 14:57:23 -0700 Subject: [PATCH 055/124] 8211724: Change mkdir -p to MakeDir macro where possible Reviewed-by: ihse, asemenyuk --- make/BuildStatic.gmk | 2 +- make/Bundles.gmk | 2 +- make/CopyInterimCLDRConverter.gmk | 4 ++-- make/CreateBuildJdkCopy.gmk | 2 +- make/GenerateModuleSummary.gmk | 6 +++--- make/GensrcModuleInfo.gmk | 2 +- make/MacBundles.gmk | 4 ++-- make/autoconf/basics.m4 | 3 ++- make/common/JarArchive.gmk | 2 +- make/common/JavaCompilation.gmk | 2 +- make/common/Modules.gmk | 2 +- make/common/ZipArchive.gmk | 4 ++-- make/copy/Copy-java.base.gmk | 4 ++-- make/gendata/GendataFontConfig.gmk | 2 +- make/gendata/GendataHtml32dtd.gmk | 2 +- make/gendata/GendataTZDB.gmk | 2 +- make/gensrc/GensrcCLDR.gmk | 4 ++-- make/gensrc/GensrcCharsetCoder.gmk | 8 ++++---- make/gensrc/GensrcCommonLangtools.gmk | 6 +++--- make/gensrc/GensrcLocaleData.gmk | 4 ++-- make/gensrc/GensrcModuleLoaderMap.gmk | 2 +- make/gensrc/GensrcProperties.gmk | 6 +++--- make/gensrc/GensrcSwing.gmk | 2 +- make/launcher/Launcher-java.base.gmk | 2 +- make/rmic/Rmic-java.management.rmi.gmk | 2 +- 25 files changed, 41 insertions(+), 40 deletions(-) diff --git a/make/BuildStatic.gmk b/make/BuildStatic.gmk index b8dceebafc7..51d9ba7b26b 100644 --- a/make/BuildStatic.gmk +++ b/make/BuildStatic.gmk @@ -42,7 +42,7 @@ MODULES_SYMBOLS_FILES := $(foreach module, $(EXPORTED_SYMBOLS_MODULES), \ $(GLOBAL_SYMBOLS_FILE): $(MODULES_SYMBOLS_FILES) $(call LogInfo, Generating global exported.symbols file) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(CAT) $^ > $@ TARGETS += $(GLOBAL_SYMBOLS_FILE) diff --git a/make/Bundles.gmk b/make/Bundles.gmk index de9508b767c..318b95f87be 100644 --- a/make/Bundles.gmk +++ b/make/Bundles.gmk @@ -70,6 +70,7 @@ define SetupBundleFileBody $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) + $$(call MakeTargetDir) # If any of the files contain a space in the file name, CacheFind # will have replaced it with ?. Tar does not accept that so need to # switch it back. @@ -79,7 +80,6 @@ define SetupBundleFileBody $$(CAT) $$($1_$$d_LIST_FILE) | $$(TR) '?' ' ' > $$($1_$$d_LIST_FILE).tmp \ && $(MV) $$($1_$$d_LIST_FILE).tmp $$($1_$$d_LIST_FILE) $$(NEWLINE) \ ) - $$(call MakeDir, $$(@D)) ifneq ($$($1_SPECIAL_INCLUDES), ) $$(foreach i, $$($1_SPECIAL_INCLUDES), \ $$(foreach d, $$($1_BASE_DIRS), \ diff --git a/make/CopyInterimCLDRConverter.gmk b/make/CopyInterimCLDRConverter.gmk index eabd8326fa0..9650fc0d5df 100644 --- a/make/CopyInterimCLDRConverter.gmk +++ b/make/CopyInterimCLDRConverter.gmk @@ -33,7 +33,7 @@ include MakeBase.gmk ### CLDRConverter needs the JRE time zone names from the java.base source. define cldrconverter_copytznames - $(MKDIR) -p '$(@D)' + $(call MakeTargetDir) $(RM) '$@' $(SED) -e "s/package sun.util.resources/package build.tools.cldrconverter/" \ -e "s/extends TimeZoneNamesBundle//" \ @@ -46,7 +46,7 @@ $(eval $(call SetupCopyFiles,COPY_INTERIM_CLDRCONVERTER, \ DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes/build/tools/cldrconverter, \ FILES := TimeZoneNames.java, \ MACRO := cldrconverter_copytznames)) - + ########################################################################################## all: $(COPY_INTERIM_CLDRCONVERTER) diff --git a/make/CreateBuildJdkCopy.gmk b/make/CreateBuildJdkCopy.gmk index 2f12d97e009..f77fe4bf7e0 100644 --- a/make/CreateBuildJdkCopy.gmk +++ b/make/CreateBuildJdkCopy.gmk @@ -41,7 +41,7 @@ COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk $(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \ $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY)))) - $(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)" + $(call LogInfo, Copying java modules to buildjdk: $(MODULES_TO_COPY)) $(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules $(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules $(foreach m, $(MODULES_TO_COPY), \ diff --git a/make/GenerateModuleSummary.gmk b/make/GenerateModuleSummary.gmk index 1b48e1d8626..ef4d0933497 100644 --- a/make/GenerateModuleSummary.gmk +++ b/make/GenerateModuleSummary.gmk @@ -35,18 +35,18 @@ SPEC_DOTFILES_DIR := $(GENGRAPHS_DIR)/spec-dotfiles TOOLS_MODULE_SRCDIR := $(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw $(GENGRAPHS_DIR)/jdk.dot: $(BUILD_JIGSAW_TOOLS) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(TOOL_GENGRAPHS) --output $(GENGRAPHS_DIR) $(SPEC_DOTFILES_DIR)/java.se.dot: $(BUILD_JIGSAW_TOOLS) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(TOOL_GENGRAPHS) --spec --output $(SPEC_DOTFILES_DIR) $(GENGRAPHS_DIR)/technology-summary.html: $(TOOLS_MODULE_SRCDIR)/technology-summary.html $(install-file) $(GENGRAPHS_DIR)/module-summary.html: $(BUILD_JIGSAW_TOOLS) $(GENGRAPHS_DIR)/technology-summary.html - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(TOOL_MODULESUMMARY) -o $@ --module-path $(IMAGES_OUTPUTDIR)/jmods all: $(GENGRAPHS_DIR)/jdk.dot $(GENGRAPHS_DIR)/module-summary.html $(SPEC_DOTFILES_DIR)/java.se.dot diff --git a/make/GensrcModuleInfo.gmk b/make/GensrcModuleInfo.gmk index 25ade7f131e..21bfbcf5b13 100644 --- a/make/GensrcModuleInfo.gmk +++ b/make/GensrcModuleInfo.gmk @@ -79,7 +79,7 @@ ifneq ($(MOD_FILES), ) $(BUILD_TOOLS_JDK) \ $(MOD_FILES) \ $(call DependOnVariable, ALL_MODULES) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $@.tmp $(TOOL_GENMODULEINFOSOURCE) -o $@.tmp \ --source-file $< \ diff --git a/make/MacBundles.gmk b/make/MacBundles.gmk index 998a60faa28..381de56654e 100644 --- a/make/MacBundles.gmk +++ b/make/MacBundles.gmk @@ -63,13 +63,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib: $(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $(LN) -s ../Home/lib/libjli.dylib $@ $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib: $(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $(LN) -s ../Home/lib/libjli.dylib $@ diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4 index 27a3ae1a6ea..02925e9139c 100644 --- a/make/autoconf/basics.m4 +++ b/make/autoconf/basics.m4 @@ -569,7 +569,8 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS], BASIC_REQUIRE_PROGS(GZIP, pigz gzip) BASIC_REQUIRE_PROGS(LN, ln) BASIC_REQUIRE_PROGS(LS, ls) - BASIC_REQUIRE_PROGS(MKDIR, mkdir) + # gmkdir is known to be safe for concurrent invocations with -p flag. + BASIC_REQUIRE_PROGS(MKDIR, [gmkdir mkdir]) BASIC_REQUIRE_PROGS(MKTEMP, mktemp) BASIC_REQUIRE_PROGS(MV, mv) BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk]) diff --git a/make/common/JarArchive.gmk b/make/common/JarArchive.gmk index b6487913dd4..daa1bb4b249 100644 --- a/make/common/JarArchive.gmk +++ b/make/common/JarArchive.gmk @@ -235,7 +235,7 @@ define SetupJarArchiveBody # Here is the rule that creates/updates the jar file. $$($1_JAR) : $$($1_DEPENDENCIES) $$($1_MANIFEST) $$($1_VARDEPS_FILE) - $(MKDIR) -p $$($1_BIN) + $$(call MakeTargetDir) $$($1_GREP_INCLUDE_OUTPUT) $$($1_GREP_EXCLUDE_OUTPUT) # If the vardeps file is part of the newer prereq list, it means that diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk index 2d85ba0bf61..d679f7ef289 100644 --- a/make/common/JavaCompilation.gmk +++ b/make/common/JavaCompilation.gmk @@ -423,7 +423,7 @@ define SetupJavaCompilationBody $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp $$($1_HEADERS)/_the.$1_headers: $$($1_COMPILE_TARGET) - $(MKDIR) -p $$(@D) + $$(call MakeTargetDir) if [ -d "$$($1_HEADERS).$1.tmp" ]; then \ for f in `$(CD) $$($1_HEADERS).$1.tmp && $(FIND) . -type f`; do \ if [ ! -f "$$($1_HEADERS)/$$$$f" ] \ diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index a69a6dec8ee..2327c3b4d8e 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -321,7 +321,7 @@ MODULE_INFOS := $(call FindAllModuleInfos, *) $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ $(call DependOnVariable, MODULE_INFOS, $(MAKESUPPORT_OUTPUTDIR)/MODULE_INFOS.vardeps) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $(foreach m, $(MODULE_INFOS), \ ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \ diff --git a/make/common/ZipArchive.gmk b/make/common/ZipArchive.gmk index 4ced471d9aa..bd91d340433 100644 --- a/make/common/ZipArchive.gmk +++ b/make/common/ZipArchive.gmk @@ -124,8 +124,8 @@ define SetupZipArchiveBody # If zip has nothing to do, it returns 12 and would fail the build. Check for 12 # and only fail if it's not. $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) - $(MKDIR) -p $$(@D) - $(ECHO) Updating $$($1_NAME) + $$(call LogWarn, Updating $$($1_NAME)) + $$(call MakeTargetDir) $$(foreach s,$$($1_SRC),(cd $$s && $(ZIPEXE) -qru $$($1_ZIP_OPTIONS) $$@ . \ $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* \ $$($1_ZIP_EXCLUDES_$$s) \ diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk index 04885e3469b..800ec0d846f 100644 --- a/make/copy/Copy-java.base.gmk +++ b/make/copy/Copy-java.base.gmk @@ -128,7 +128,7 @@ POLICY_DST := $(CONF_DST_DIR)/security/java.policy POLICY_SRC_LIST := $(POLICY_SRC) $(POLICY_DST): $(POLICY_SRC_LIST) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $@.tmp $(foreach f,$(POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) $(MV) $@.tmp $@ @@ -153,7 +153,7 @@ ifneq ($(IMPORT_MODULES_CONF), ) endif $(DEF_POLICY_DST): $(DEF_POLICY_SRC_LIST) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $@.tmp $(foreach f,$(DEF_POLICY_SRC_LIST),$(CAT) $(f) >> $@.tmp;) $(MV) $@.tmp $@ diff --git a/make/gendata/GendataFontConfig.gmk b/make/gendata/GendataFontConfig.gmk index 50a3bcd49d0..ea7d900826f 100644 --- a/make/gendata/GendataFontConfig.gmk +++ b/make/gendata/GendataFontConfig.gmk @@ -38,7 +38,7 @@ $(GENDATA_FONT_CONFIG_DST)/%.src: \ $(GENDATA_FONT_CONFIG_DST)/%.bfc: \ $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).%.properties \ $(BUILD_TOOLS_JDK) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $(TOOL_COMPILEFONTCONFIG) $< $@ $(CHMOD) 444 $@ diff --git a/make/gendata/GendataHtml32dtd.gmk b/make/gendata/GendataHtml32dtd.gmk index 0189a7c081e..0ce9d2b4ebc 100644 --- a/make/gendata/GendataHtml32dtd.gmk +++ b/make/gendata/GendataHtml32dtd.gmk @@ -28,7 +28,7 @@ GENDATA_HTML32DTD := HTML32DTD = $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/text/html/parser/html32.bdtd $(HTML32DTD): $(BUILD_TOOLS_JDK) $(call LogInfo, Generating HTML DTD file) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ ($(TOOL_DTDBUILDER) html32 > $@) || exit 1 diff --git a/make/gendata/GendataTZDB.gmk b/make/gendata/GendataTZDB.gmk index e9be176d873..0e7b817c60a 100644 --- a/make/gendata/GendataTZDB.gmk +++ b/make/gendata/GendataTZDB.gmk @@ -35,8 +35,8 @@ TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE)) GENDATA_TZDB_DAT := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/tzdb.dat $(GENDATA_TZDB_DAT): $(TZDATA_TZFILES) + $(call MakeTargetDir) $(RM) $(GENDATA_TZDB_DAT) - $(MKDIR) -p $(@D) $(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE) TARGETS += $(GENDATA_TZDB_DAT) diff --git a/make/gensrc/GensrcCLDR.gmk b/make/gensrc/GensrcCLDR.gmk index 2f742782637..7206e4f572c 100644 --- a/make/gensrc/GensrcCLDR.gmk +++ b/make/gensrc/GensrcCLDR.gmk @@ -50,7 +50,7 @@ $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/dtd/*.dtd) \ $(wildcard $(CLDRSRCDIR)/supplemental/*.xml) \ $(ZONENAME_TEMPLATE) \ $(BUILD_TOOLS_JDK) - $(MKDIR) -p $(GENSRC_BASEDIR) + $(call MakeDir, $(GENSRC_BASEDIR)) $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \ -baselocales $(CLDR_BASE_LOCALES) \ -o $(GENSRC_BASEDIR) \ @@ -62,7 +62,7 @@ $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/dtd/*.dtd) \ $(wildcard $(CLDRSRCDIR)/main/*.xml) \ $(wildcard $(CLDRSRCDIR)/supplemental/*.xml) \ $(BUILD_TOOLS_JDK) - $(MKDIR) -p $(GENSRC_DIR) + $(call MakeDir, $(GENSRC_DIR)) $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) \ -baselocales $(CLDR_BASE_LOCALES) \ -o $(GENSRC_DIR) diff --git a/make/gensrc/GensrcCharsetCoder.gmk b/make/gensrc/GensrcCharsetCoder.gmk index 1a8836691d0..c2b850c7974 100644 --- a/make/gensrc/GensrcCharsetCoder.gmk +++ b/make/gensrc/GensrcCharsetCoder.gmk @@ -34,8 +34,8 @@ GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Cod ################################################################################ $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java: $(GENSRC_CHARSETCODER_TEMPLATE) - $(MKDIR) -p $(@D) - -$(RM) $@.tmp + $(call MakeTargetDir) + $(RM) $@.tmp $(TOOL_SPP) < $< >$@.tmp \ -Kdecoder \ -DA='A' \ @@ -69,8 +69,8 @@ GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java ################################################################################ $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE) - $(MKDIR) -p $(@D) - -$(RM) $@.tmp + $(call MakeTargetDir) + $(RM) $@.tmp $(TOOL_SPP) < $< >$@.tmp \ -Kencoder \ -DA='An' \ diff --git a/make/gensrc/GensrcCommonLangtools.gmk b/make/gensrc/GensrcCommonLangtools.gmk index 682808c37ab..abdea20c087 100644 --- a/make/gensrc/GensrcCommonLangtools.gmk +++ b/make/gensrc/GensrcCommonLangtools.gmk @@ -49,7 +49,7 @@ TOOL_PARSEPROPS_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_tools # root. define SetupVersionProperties $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2): - $(MKDIR) -p $$(@D) + $$(call MakeTargetDir) $(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \ > $$@ @@ -92,7 +92,7 @@ define SetupCompileProperties # Now setup the rule for the generation of the resource bundles. $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_props: $$(PROPSOURCES) - $(MKDIR) -p $$(@D) $$(PROPDIRS) + $$(call MakeDir, $$(@D) $$(PROPDIRS)) $(FIND) $$(@D) -name "*.java" -a ! -name "*Properties.java" $(FIND_DELETE) $(ECHO) Compiling $$(words $$(PROPSOURCES)) properties into resource bundles for $(MODULE) $(TOOL_COMPILEPROPS_CMD) $$(PROPCMDLINE) @@ -122,7 +122,7 @@ define SetupParseProperties # Now setup the rule for the generation of the resource bundles. $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $$(PARSEPROPSOURCES) - $(MKDIR) -p $$(@D) $$(PARSEPROPDIRS) + $$(call MakeDir, $$(@D) $$(PARSEPROPDIRS)) $(FIND) $$(@D) -name "*Properties.java" $(FIND_DELETE) $(ECHO) Parsing $$(words $$(PARSEPROPSOURCES)) properties into enum-like class for $(MODULE) $(TOOL_PARSEPROPS_CMD) $$(PARSEPROPCMDLINE) diff --git a/make/gensrc/GensrcLocaleData.gmk b/make/gensrc/GensrcLocaleData.gmk index 3235136b1eb..7b8378a74f3 100644 --- a/make/gensrc/GensrcLocaleData.gmk +++ b/make/gensrc/GensrcLocaleData.gmk @@ -131,7 +131,7 @@ SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \ $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template $(call LogInfo, Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \ > $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_the.locale_resources $(SED) $(SED_BASEARGS) $< > $@ @@ -139,7 +139,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMet $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \ $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template $(call LogInfo, Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \ > $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/_the.locale_resources $(SED) $(SED_NONBASEARGS) $< > $@ diff --git a/make/gensrc/GensrcModuleLoaderMap.gmk b/make/gensrc/GensrcModuleLoaderMap.gmk index 86d4446496a..29a4efe4ad7 100644 --- a/make/gensrc/GensrcModuleLoaderMap.gmk +++ b/make/gensrc/GensrcModuleLoaderMap.gmk @@ -46,7 +46,7 @@ VARDEPS_FILE := $(call DependOnVariable, VARDEPS_VALUE) $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java: \ $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \ $(VARDEPS_FILE) $(BUILD_TOOLS_JDK) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $@.tmp $(TOOL_GENCLASSLOADERMAP) -boot $(BOOT_MODULES_LIST) \ -platform $(PLATFORM_MODULES_LIST) -o $@.tmp $< diff --git a/make/gensrc/GensrcProperties.gmk b/make/gensrc/GensrcProperties.gmk index c8d17a35539..bf7384dc751 100644 --- a/make/gensrc/GensrcProperties.gmk +++ b/make/gensrc/GensrcProperties.gmk @@ -34,7 +34,7 @@ define SetupOneCopy-zh_HK $$(subst _zh_TW,_zh_HK, $2)) $$($1_$2_TARGET): $2 - $(MKDIR) -p $$(@D) + $$(call MakeTargetDir) $(CAT) $$< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $$@ $1 += $$($1_$2_TARGET) @@ -105,8 +105,8 @@ define SetupCompilePropertiesBody # Now setup the rule for the generation of the resource bundles. $$($1_TARGET): $$($1_SRC_FILES) $$($1_JAVAS) $(BUILD_TOOLS_JDK) - $(MKDIR) -p $$(@D) $$($1_DIRS) - $(ECHO) Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE) + $$(call LogWarn, Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE)) + $$(call MakeDir, $$(@D) $$($1_DIRS)) $$(eval $$(call ListPathsSafely, $1_CMDLINE, $$($1_CMDLINE_FILE))) $(TOOL_COMPILEPROPERTIES) -quiet @$$($1_CMDLINE_FILE) $(TOUCH) $$@ diff --git a/make/gensrc/GensrcSwing.gmk b/make/gensrc/GensrcSwing.gmk index 713f1d3425d..a1485881df1 100644 --- a/make/gensrc/GensrcSwing.gmk +++ b/make/gensrc/GensrcSwing.gmk @@ -32,7 +32,7 @@ NIMBUS_SKIN_FILE = $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nim $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK) $(call LogInfo, Generating Nimbus source files) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(TOOL_GENERATENIMBUS) $(LOG_DEBUG) \ -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop \ -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk index 0ce0287d2be..44263adc5a1 100644 --- a/make/launcher/Launcher-java.base.gmk +++ b/make/launcher/Launcher-java.base.gmk @@ -45,7 +45,7 @@ $(eval $(call SetupBuildLauncher, java, \ )) $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) - $(MKDIR) -p $(@D) + $(call MakeTargetDir) $(RM) $@ $(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@ diff --git a/make/rmic/Rmic-java.management.rmi.gmk b/make/rmic/Rmic-java.management.rmi.gmk index 50c090c1deb..b6665566123 100644 --- a/make/rmic/Rmic-java.management.rmi.gmk +++ b/make/rmic/Rmic-java.management.rmi.gmk @@ -51,7 +51,7 @@ $(RMIC_GENSRC_DIR)/_classes.moved: $(RMI_GEN) $(foreach src, $(classfiles), \ $(eval target := $(patsubst $(RMIC_GENSRC_DIR)/%, \ $(STUB_CLASSES_DIR)/%, $(src))) \ - $(MKDIR) -p $(dir $(target)) ; \ + $(call MakeDir, $(dir $(target))) \ $(MV) $(src) $(target) $(NEWLINE)) $(TOUCH) $@ From 8351e4db3e8528789faf400028a4e0d8a83cff11 Mon Sep 17 00:00:00 2001 From: David Holmes Date: Tue, 9 Oct 2018 20:19:22 -0400 Subject: [PATCH 056/124] 8211065: Private method check in linkResolver is incorrect Reviewed-by: acorn, lfoltan --- .../share/interpreter/linkResolver.cpp | 18 -- .../privateMethods/TestInvokeErrors.java | 16 +- .../linkResolver/TestDeletedMethod.java | 65 +++++++ .../linkResolver/TestDeletedMethod_Sub.jcod | 172 ++++++++++++++++++ .../linkResolver/TestDeletedMethod_Super.jcod | 143 +++++++++++++++ 5 files changed, 386 insertions(+), 28 deletions(-) create mode 100644 test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod.java create mode 100644 test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Sub.jcod create mode 100644 test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Super.jcod diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp index ab17cb4e560..e48479ba80a 100644 --- a/src/hotspot/share/interpreter/linkResolver.cpp +++ b/src/hotspot/share/interpreter/linkResolver.cpp @@ -793,24 +793,6 @@ methodHandle LinkResolver::resolve_method(const LinkInfo& link_info, check_method_loader_constraints(link_info, resolved_method, "method", CHECK_NULL); } - // For private method invocation we should only find the method in the resolved class. - // If that is not the case then we have a found a supertype method that we have nestmate - // access to. - if (resolved_method->is_private() && resolved_method->method_holder() != resolved_klass) { - ResourceMark rm(THREAD); - DEBUG_ONLY(bool is_nestmate = InstanceKlass::cast(link_info.current_klass())->has_nestmate_access_to(InstanceKlass::cast(resolved_klass), THREAD);) - assert(is_nestmate, "was only expecting nestmates to get here!"); - Exceptions::fthrow( - THREAD_AND_LOCATION, - vmSymbols::java_lang_NoSuchMethodError(), - "%s: method %s%s not found", - resolved_klass->external_name(), - resolved_method->name()->as_C_string(), - resolved_method->signature()->as_C_string() - ); - return NULL; - } - return resolved_method; } diff --git a/test/hotspot/jtreg/runtime/Nestmates/privateMethods/TestInvokeErrors.java b/test/hotspot/jtreg/runtime/Nestmates/privateMethods/TestInvokeErrors.java index a73a377b647..43cc0b635b0 100644 --- a/test/hotspot/jtreg/runtime/Nestmates/privateMethods/TestInvokeErrors.java +++ b/test/hotspot/jtreg/runtime/Nestmates/privateMethods/TestInvokeErrors.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. * 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 @@ /* * @test - * @bug 8046171 + * @bug 8046171 8211065 * @summary Setup nestmate calls to private methods then use * modified jcod classes to introduce errors. Test with * and without verification enabled @@ -96,14 +96,10 @@ public class TestInvokeErrors { System.out.println("Got expected exception:" + nsme); } - try { - MissingMethodWithSuper m = new MissingMethodWithSuper(); - m.priv_invoke(); - throw new Error("Unexpected success invoking MissingMethodWithSuper.priv_invoke"); - } - catch (NoSuchMethodError nsme) { - System.out.println("Got expected exception:" + nsme); - } + // This test was revised to expect successful invocation of the + // super class method - see JDK-8211065 + MissingMethodWithSuper m = new MissingMethodWithSuper(); + m.priv_invoke(); // Verification of Helper will trigger the nestmate access check failure try { diff --git a/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod.java b/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod.java new file mode 100644 index 00000000000..c51a55ad1ef --- /dev/null +++ b/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8211065 + * @summary Test that deleting a subclass method implementation results in + * execution of a superclass implementation - if it is accessible. + * @compile TestDeletedMethod.java + * @compile TestDeletedMethod_Sub.jcod TestDeletedMethod_Super.jcod + * @run main/othervm -XX:+RelaxAccessControlCheck TestDeletedMethod + */ + +// The access control relaxation was originally done to ensure an assertion +// in the nestmate logic would not trigger unintentionally because it +// assumed only nestmates could be involved. The assertion no longer exists +// but we keep the test as a non-nestmate version of the situation. + +/* package */ class TestDeletedMethod_Super { + public static final int ID = 2; + private static int m() { + System.out.println("Super.m"); + return ID; + } +} + +/* package */ class TestDeletedMethod_Sub extends TestDeletedMethod_Super { + public static final int ID = 1; + // At runtime this implementation is not present + private static int m() { + System.out.println("Sub.m"); + return ID; + } + public static int test() { + return TestDeletedMethod_Sub.m(); + } +} + +public class TestDeletedMethod { + public static void main(String[] args) { + int x = TestDeletedMethod_Sub.test(); + if (x != TestDeletedMethod_Super.ID) + throw new RuntimeException("Wrong method invoked: " + x); + } +} diff --git a/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Sub.jcod b/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Sub.jcod new file mode 100644 index 00000000000..20c2e76f3db --- /dev/null +++ b/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Sub.jcod @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// We have deleted the local method m() by renaming it +// We have set the class file version to 49 to allow relaxed access checks + +class TestDeletedMethod_Sub { + 0xCAFEBABE; + 0; // minor version + 49; // version + [] { // Constant Pool + ; // first element is empty + Method #7 #21; // #1 + Field #22 #23; // #2 + String #24; // #3 + Method #25 #26; // #4 + class #27; // #5 + Method #5 #28; // #6 + class #29; // #7 + Utf8 "ID"; // #8 + Utf8 "I"; // #9 + Utf8 "ConstantValue"; // #10 + int 0x00000001; // #11 + Utf8 ""; // #12 + Utf8 "()V"; // #13 + Utf8 "Code"; // #14 + Utf8 "LineNumberTable"; // #15 + Utf8 "m"; // #16 + Utf8 "()I"; // #17 + Utf8 "test"; // #18 + Utf8 "SourceFile"; // #19 + Utf8 "TestDeletedMethod.java"; // #20 + NameAndType #12 #13; // #21 + class #30; // #22 + NameAndType #31 #32; // #23 + Utf8 "Sub.m"; // #24 + class #33; // #25 + NameAndType #34 #35; // #26 + Utf8 "TestDeletedMethod_Sub"; // #27 + NameAndType #16 #17; // #28 + Utf8 "TestDeletedMethod_Super"; // #29 + Utf8 "java/lang/System"; // #30 + Utf8 "out"; // #31 + Utf8 "Ljava/io/PrintStream;"; // #32 + Utf8 "java/io/PrintStream"; // #33 + Utf8 "println"; // #34 + Utf8 "(Ljava/lang/String;)V"; // #35 + Utf8 "m_renamed"; // #36 added + } // Constant Pool + + 0x0020; // access + #5;// this_cpx + #7;// super_cpx + + [] { // Interfaces + } // Interfaces + + [] { // fields + { // Member + 0x0019; // access + #8; // name_cpx + #9; // sig_cpx + [] { // Attributes + Attr(#10) { // ConstantValue + #11; + } // end ConstantValue + } // Attributes + } // Member + } // fields + + [] { // methods + { // Member + 0x0000; // access + #12; // name_cpx + #13; // sig_cpx + [] { // Attributes + Attr(#14) { // Code + 1; // max_stack + 1; // max_locals + Bytes[]{ + 0x2AB70001B1; + }; + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#15) { // LineNumberTable + [] { // LineNumberTable + 0 43; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + ; + { // Member + 0x000A; // access + #36; // name_cpx UPDATED to rename method + #17; // sig_cpx + [] { // Attributes + Attr(#14) { // Code + 2; // max_stack + 0; // max_locals + Bytes[]{ + 0xB200021203B60004; + 0x04AC; + }; + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#15) { // LineNumberTable + [] { // LineNumberTable + 0 47; + 8 48; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + ; + { // Member + 0x0009; // access + #18; // name_cpx + #17; // sig_cpx + [] { // Attributes + Attr(#14) { // Code + 1; // max_stack + 0; // max_locals + Bytes[]{ + 0xB80006AC; + }; + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#15) { // LineNumberTable + [] { // LineNumberTable + 0 51; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + } // methods + + [] { // Attributes + Attr(#19) { // SourceFile + #20; + } // end SourceFile + } // Attributes +} // end class TestDeletedMethod_Sub diff --git a/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Super.jcod b/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Super.jcod new file mode 100644 index 00000000000..c8cce05d19c --- /dev/null +++ b/test/hotspot/jtreg/runtime/linkResolver/TestDeletedMethod_Super.jcod @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// We have set the class file version to 49 to allow relaxed access checks + +class TestDeletedMethod_Super { + 0xCAFEBABE; + 0; // minor version + 49; // version + [] { // Constant Pool + ; // first element is empty + Method #6 #19; // #1 + Field #20 #21; // #2 + String #22; // #3 + Method #23 #24; // #4 + class #25; // #5 + class #26; // #6 + Utf8 "ID"; // #7 + Utf8 "I"; // #8 + Utf8 "ConstantValue"; // #9 + int 0x00000002; // #10 + Utf8 ""; // #11 + Utf8 "()V"; // #12 + Utf8 "Code"; // #13 + Utf8 "LineNumberTable"; // #14 + Utf8 "m"; // #15 + Utf8 "()I"; // #16 + Utf8 "SourceFile"; // #17 + Utf8 "TestDeletedMethod.java"; // #18 + NameAndType #11 #12; // #19 + class #27; // #20 + NameAndType #28 #29; // #21 + Utf8 "Super.m"; // #22 + class #30; // #23 + NameAndType #31 #32; // #24 + Utf8 "TestDeletedMethod_Super"; // #25 + Utf8 "java/lang/Object"; // #26 + Utf8 "java/lang/System"; // #27 + Utf8 "out"; // #28 + Utf8 "Ljava/io/PrintStream;"; // #29 + Utf8 "java/io/PrintStream"; // #30 + Utf8 "println"; // #31 + Utf8 "(Ljava/lang/String;)V"; // #32 + } // Constant Pool + + 0x0020; // access + #5;// this_cpx + #6;// super_cpx + + [] { // Interfaces + } // Interfaces + + [] { // fields + { // Member + 0x0019; // access + #7; // name_cpx + #8; // sig_cpx + [] { // Attributes + Attr(#9) { // ConstantValue + #10; + } // end ConstantValue + } // Attributes + } // Member + } // fields + + [] { // methods + { // Member + 0x0000; // access + #11; // name_cpx + #12; // sig_cpx + [] { // Attributes + Attr(#13) { // Code + 1; // max_stack + 1; // max_locals + Bytes[]{ + 0x2AB70001B1; + }; + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#14) { // LineNumberTable + [] { // LineNumberTable + 0 35; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + ; + { // Member + 0x000A; // access + #15; // name_cpx + #16; // sig_cpx + [] { // Attributes + Attr(#13) { // Code + 2; // max_stack + 0; // max_locals + Bytes[]{ + 0xB200021203B60004; + 0x05AC; + }; + [] { // Traps + } // end Traps + [] { // Attributes + Attr(#14) { // LineNumberTable + [] { // LineNumberTable + 0 38; + 8 39; + } + } // end LineNumberTable + } // Attributes + } // end Code + } // Attributes + } // Member + } // methods + + [] { // Attributes + Attr(#17) { // SourceFile + #18; + } // end SourceFile + } // Attributes +} // end class TestDeletedMethod_Super From 468b69240e0e3068827855e3f487c7ff317a917e Mon Sep 17 00:00:00 2001 From: David Holmes Date: Tue, 9 Oct 2018 20:38:13 -0400 Subject: [PATCH 057/124] 8211394: CHECK_ must be used in the rhs of an assignment statement within a block Replace "return foo(CHECK_X);" with "return foo(THREAD);" Reviewed-by: iklam, phh, stuefe, lfoltan --- src/hotspot/share/classfile/verificationType.cpp | 2 +- src/hotspot/share/classfile/verificationType.hpp | 2 +- src/hotspot/share/jvmci/jvmciEnv.cpp | 2 +- src/hotspot/share/oops/constantPool.cpp | 2 +- src/hotspot/share/oops/instanceMirrorKlass.cpp | 2 +- src/hotspot/share/runtime/javaCalls.cpp | 7 ++++--- src/hotspot/share/services/management.cpp | 4 ++-- src/hotspot/share/utilities/exceptions.hpp | 4 ++-- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/hotspot/share/classfile/verificationType.cpp b/src/hotspot/share/classfile/verificationType.cpp index aadaa7edfd2..cb3c5a1775f 100644 --- a/src/hotspot/share/classfile/verificationType.cpp +++ b/src/hotspot/share/classfile/verificationType.cpp @@ -111,7 +111,7 @@ bool VerificationType::is_reference_assignable_from( VerificationType comp_from = from.get_component(context, CHECK_false); if (!comp_this.is_bogus() && !comp_from.is_bogus()) { return comp_this.is_component_assignable_from(comp_from, context, - from_field_is_protected, CHECK_false); + from_field_is_protected, THREAD); } } return false; diff --git a/src/hotspot/share/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp index 8fa024147ac..fba473980fe 100644 --- a/src/hotspot/share/classfile/verificationType.hpp +++ b/src/hotspot/share/classfile/verificationType.hpp @@ -312,7 +312,7 @@ class VerificationType { case Short: return false; default: - return is_assignable_from(from, context, from_field_is_protected, CHECK_false); + return is_assignable_from(from, context, from_field_is_protected, THREAD); } } } diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp index ed8308ed67a..825aacad25e 100644 --- a/src/hotspot/share/jvmci/jvmciEnv.cpp +++ b/src/hotspot/share/jvmci/jvmciEnv.cpp @@ -148,7 +148,7 @@ Klass* JVMCIEnv::get_klass_by_name_impl(Klass* accessing_klass, require_local); if (elem_klass != NULL) { // Now make an array for it - return elem_klass->array_klass(CHECK_NULL); + return elem_klass->array_klass(THREAD); } } diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp index 5e2846a0317..ef2184f5af6 100644 --- a/src/hotspot/share/oops/constantPool.cpp +++ b/src/hotspot/share/oops/constantPool.cpp @@ -472,7 +472,7 @@ Klass* ConstantPool::klass_at_impl(const constantPoolHandle& this_cp, int which, // or any internal exception fields such as cause or stacktrace. But since the // detail message is often a class name or other literal string, we will repeat it // if we can find it in the symbol table. - throw_resolution_error(this_cp, which, CHECK_0); + throw_resolution_error(this_cp, which, CHECK_NULL); ShouldNotReachHere(); } diff --git a/src/hotspot/share/oops/instanceMirrorKlass.cpp b/src/hotspot/share/oops/instanceMirrorKlass.cpp index 266436a382d..8073eb30620 100644 --- a/src/hotspot/share/oops/instanceMirrorKlass.cpp +++ b/src/hotspot/share/oops/instanceMirrorKlass.cpp @@ -52,7 +52,7 @@ instanceOop InstanceMirrorKlass::allocate_instance(Klass* k, TRAPS) { // Since mirrors can be variable sized because of the static fields, store // the size in the mirror itself. - return (instanceOop)Universe::heap()->class_allocate(this, size, CHECK_NULL); + return (instanceOop)Universe::heap()->class_allocate(this, size, THREAD); } int InstanceMirrorKlass::oop_size(oop obj) const { diff --git a/src/hotspot/share/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp index 32040586b36..295fca9357d 100644 --- a/src/hotspot/share/runtime/javaCalls.cpp +++ b/src/hotspot/share/runtime/javaCalls.cpp @@ -307,25 +307,26 @@ Handle JavaCalls::construct_new_instance(InstanceKlass* klass, Symbol* construct JavaCalls::call_special(&void_result, klass, vmSymbols::object_initializer_name(), constructor_signature, args, CHECK_NH); + // Already returned a Null Handle if any exception is pending. return obj; } Handle JavaCalls::construct_new_instance(InstanceKlass* klass, Symbol* constructor_signature, TRAPS) { JavaCallArguments args; - return JavaCalls::construct_new_instance(klass, constructor_signature, &args, CHECK_NH); + return JavaCalls::construct_new_instance(klass, constructor_signature, &args, THREAD); } Handle JavaCalls::construct_new_instance(InstanceKlass* klass, Symbol* constructor_signature, Handle arg1, TRAPS) { JavaCallArguments args; args.push_oop(arg1); - return JavaCalls::construct_new_instance(klass, constructor_signature, &args, CHECK_NH); + return JavaCalls::construct_new_instance(klass, constructor_signature, &args, THREAD); } Handle JavaCalls::construct_new_instance(InstanceKlass* klass, Symbol* constructor_signature, Handle arg1, Handle arg2, TRAPS) { JavaCallArguments args; args.push_oop(arg1); args.push_oop(arg2); - return JavaCalls::construct_new_instance(klass, constructor_signature, &args, CHECK_NH); + return JavaCalls::construct_new_instance(klass, constructor_signature, &args, THREAD); } // ------------------------------------------------- diff --git a/src/hotspot/share/services/management.cpp b/src/hotspot/share/services/management.cpp index bd58e08e17a..db2cc37cff7 100644 --- a/src/hotspot/share/services/management.cpp +++ b/src/hotspot/share/services/management.cpp @@ -178,7 +178,7 @@ void Management::get_optional_support(jmmOptionalSupport* support) { InstanceKlass* Management::load_and_initialize_klass(Symbol* sh, TRAPS) { Klass* k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL); - return initialize_klass(k, CHECK_NULL); + return initialize_klass(k, THREAD); } InstanceKlass* Management::load_and_initialize_klass_or_null(Symbol* sh, TRAPS) { @@ -186,7 +186,7 @@ InstanceKlass* Management::load_and_initialize_klass_or_null(Symbol* sh, TRAPS) if (k == NULL) { return NULL; } - return initialize_klass(k, CHECK_NULL); + return initialize_klass(k, THREAD); } InstanceKlass* Management::initialize_klass(Klass* k, TRAPS) { diff --git a/src/hotspot/share/utilities/exceptions.hpp b/src/hotspot/share/utilities/exceptions.hpp index 18c40b51780..7b2328b051d 100644 --- a/src/hotspot/share/utilities/exceptions.hpp +++ b/src/hotspot/share/utilities/exceptions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -211,7 +211,7 @@ class Exceptions { // // CAUTION: make sure that the function call using a CHECK macro is not the only statement of a // conditional branch w/o enclosing {} braces, since the CHECK macros expand into several state- -// ments! +// ments! Also make sure it is not used on a function call that is part of a return statement! #define PENDING_EXCEPTION (((ThreadShadow*)THREAD)->pending_exception()) #define HAS_PENDING_EXCEPTION (((ThreadShadow*)THREAD)->has_pending_exception()) From f2d02897e135bfd88760286888137ca24fdaaf36 Mon Sep 17 00:00:00 2001 From: Daniil Titov Date: Tue, 9 Oct 2018 19:11:09 -0700 Subject: [PATCH 058/124] 8193879: Java debugger hangs on method invocation Reviewed-by: sspitsyn, amenkov, gadams --- .../com/sun/tools/jdi/InvokableTypeImpl.java | 10 +- .../classes/com/sun/tools/jdi/VMState.java | 23 +-- .../sun/jdi/MethodInvokeWithTraceOnTest.java | 169 ++++++++++++++++++ test/jdk/com/sun/jdi/TestScaffold.java | 17 +- test/jdk/com/sun/jdi/lib/jdb/JdbTest.java | 2 +- 5 files changed, 194 insertions(+), 27 deletions(-) create mode 100644 test/jdk/com/sun/jdi/MethodInvokeWithTraceOnTest.java diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java index 23fa649cff6..5d6393d489d 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java @@ -236,15 +236,7 @@ abstract class InvokableTypeImpl extends ReferenceTypeImpl { final MethodImpl method, final ValueImpl[] args, final int options) { - /* - * Cache the values of args when TRACE_SENDS is enabled, for later printing. - * If not cached, printing causes a remote call while synchronized, and deadlock. - */ - if ((vm.traceFlags & VirtualMachine.TRACE_SENDS) != 0) { - for (ValueImpl arg: args) { - arg.toString(); - } - } + CommandSender sender = getInvokeMethodSender(thread, method, args, options); PacketStream stream; if ((options & ClassType.INVOKE_SINGLE_THREADED) != 0) { diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java index 61a3b5467f7..f448531091c 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VMState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. * 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,10 +26,7 @@ package com.sun.tools.jdi; import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; +import java.util.*; import com.sun.jdi.ThreadGroupReference; import com.sun.jdi.ThreadReference; @@ -44,12 +41,10 @@ class VMState { /* * Certain information can be cached only when the entire VM is - * suspended and there are no pending resumes. The fields below - * are used to track whether there are pending resumes. (There - * is an assumption that JDWP command ids are increasing over time.) + * suspended and there are no pending resumes. The field below + * is used to track whether there are pending resumes. */ - private int lastCompletedCommandId = 0; // synchronized (this) - private int lastResumeCommandId = 0; // synchronized (this) + private final Set pendingResumeCommands = Collections.synchronizedSet(new HashSet<>()); // This is cached only while the VM is suspended private static class Cache { @@ -97,12 +92,12 @@ class VMState { * A JDWP command has been completed (reply has been received). * Update data that tracks pending resume commands. */ - synchronized void notifyCommandComplete(int id) { - lastCompletedCommandId = id; + void notifyCommandComplete(int id) { + pendingResumeCommands.remove(id); } synchronized void freeze() { - if (cache == null && (lastCompletedCommandId >= lastResumeCommandId)) { + if (cache == null && (pendingResumeCommands.isEmpty())) { /* * No pending resumes to worry about. The VM is suspended * and additional state can be cached. Notify all @@ -115,7 +110,7 @@ class VMState { synchronized PacketStream thawCommand(CommandSender sender) { PacketStream stream = sender.send(); - lastResumeCommandId = stream.id(); + pendingResumeCommands.add(stream.id()); thaw(); return stream; } diff --git a/test/jdk/com/sun/jdi/MethodInvokeWithTraceOnTest.java b/test/jdk/com/sun/jdi/MethodInvokeWithTraceOnTest.java new file mode 100644 index 00000000000..dd5fe30d603 --- /dev/null +++ b/test/jdk/com/sun/jdi/MethodInvokeWithTraceOnTest.java @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8193879 8193801 8129348 + * @summary Invokes static and instance methods when debugger trace + * mode is on. + * @library /test/lib + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g MethodInvokeWithTraceOnTest.java + * @run driver MethodInvokeWithTraceOnTest + */ + +import com.sun.jdi.*; +import com.sun.jdi.event.*; +import com.sun.jdi.request.*; + +import java.util.*; + +import static lib.jdb.JdbTest.*; + +/********** target program **********/ + +class MethodInvokeWithTraceOnTestTarg { + public static void main(String[] args) { + new MethodInvokeWithTraceOnTestTarg().test(); + } + + private void test() { + Thread thread = Thread.currentThread(); + print(thread); // @1 breakpoint + String str = "test"; + printStatic(str); // @2 breakpoint + + } + + public void print(Object obj) { + System.out.println(obj); + } + + public static void printStatic(Object obj) { + System.out.println(obj); + } + +} + + +/********** test program **********/ + +public class MethodInvokeWithTraceOnTest extends TestScaffold { + + MethodInvokeWithTraceOnTest(String args[]) { + super(args); + } + + public static void main(String[] args) + throws Exception { + new MethodInvokeWithTraceOnTest(args).startTests(); + } + + /********** test core **********/ + + protected void runTests() throws Exception { + init(); + + // Test with suspend policy set to SUSPEND_EVENT_THREAD + BreakpointEvent be = resumeToBreakpoint(true, 1); + System.out.println("Breakpoint 1 is hit, suspendPolicy:" + be.request().suspendPolicy()); + testMethods(be); + + // Test with suspend policy set to SUSPEND_ALL + be = resumeToBreakpoint(false, 2); + System.out.println("Breakpoint 2 is hit, suspendPolicy:" + be.request().suspendPolicy()); + testMethods(be); + + listenUntilVMDisconnect(); + } + + private void init() throws Exception { + startToMain("MethodInvokeWithTraceOnTestTarg"); + vm().setDebugTraceMode(VirtualMachine.TRACE_ALL); + } + + private BreakpointEvent resumeToBreakpoint(boolean suspendThread, int breakpointId) throws Exception { + int bkpLine = parseBreakpoints(getTestSourcePath("MethodInvokeWithTraceOnTest.java"), breakpointId).get(0); + System.out.println("Running to line: " + bkpLine); + return resumeTo("MethodInvokeWithTraceOnTestTarg", bkpLine, suspendThread); + } + + private void testMethods(BreakpointEvent be) throws Exception { + System.out.println("Testing methods..."); + ThreadReference thread = be.thread(); + StackFrame frame = thread.frame(0); + ObjectReference thisObj = frame.thisObject(); + LocalVariable threadVar = frame.visibleVariableByName("thread"); + ThreadReference threadObj = (ThreadReference) frame.getValue(threadVar); + StringReference stringObj = vm().mirrorOf("test string"); + int invokeOptions = getMethodInvokeOptions(be); + + testInstanceMethod1(thread, thisObj, stringObj, threadObj, invokeOptions); + testStaticMethod1(thread, thisObj, stringObj, threadObj, invokeOptions); + testStaticMethod2(thread, invokeOptions); + } + + private void testInstanceMethod1(ThreadReference thread, ObjectReference thisObj, StringReference stringObj, + ThreadReference threadObj, int invokeOptions) throws Exception { + ClassType classType = (ClassType) thisObj.referenceType(); + Method printMethod = classType.methodsByName("print", + "(Ljava/lang/Object;)V").get(0); + + System.out.println("Passing StringReference to instance method..."); + thisObj.invokeMethod(thread, printMethod, Collections.singletonList(stringObj), invokeOptions); + + System.out.println("Passing ThreadReference to instance method..."); + thisObj.invokeMethod(thread, printMethod, Collections.singletonList(threadObj), invokeOptions); + } + + private void testStaticMethod1(ThreadReference thread, ObjectReference thisObj, StringReference stringObj, + ThreadReference threadObj, int invokeOptions) throws Exception { + ClassType classType = (ClassType) thisObj.referenceType(); + Method printMethod = classType.methodsByName("printStatic", + "(Ljava/lang/Object;)V").get(0); + + System.out.println("Passing StringReference to static method..."); + classType.invokeMethod(thread, printMethod, Collections.singletonList(stringObj), invokeOptions); + + System.out.println("Passing ThreadReference to static method..."); + classType.invokeMethod(thread, printMethod, Collections.singletonList(threadObj), invokeOptions); + } + + private void testStaticMethod2(ThreadReference thread, int invokeOptions) throws Exception { + ClassType classType = getClassType("java.lang.Class"); + Method forNameMethod = classType.methodsByName("forName", + "(Ljava/lang/String;)Ljava/lang/Class;").get(0); + StringReference classNameParam = vm().mirrorOf("java.lang.String"); + classType.invokeMethod(thread, forNameMethod, Collections.singletonList(classNameParam), invokeOptions); + } + + private ClassType getClassType(String className) { + List classes = vm().classesByName(className); + return (ClassType) classes.get(0); + } + + private int getMethodInvokeOptions(BreakpointEvent be) { + return be.request().suspendPolicy() == EventRequest.SUSPEND_EVENT_THREAD ? + ObjectReference.INVOKE_SINGLE_THREADED : 0; + } +} diff --git a/test/jdk/com/sun/jdi/TestScaffold.java b/test/jdk/com/sun/jdi/TestScaffold.java index 4e80d408901..2561c5b5ba6 100644 --- a/test/jdk/com/sun/jdi/TestScaffold.java +++ b/test/jdk/com/sun/jdi/TestScaffold.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -784,9 +784,16 @@ abstract public class TestScaffold extends TargetAdapter { } public BreakpointEvent resumeTo(Location loc) { + return resumeTo(loc, false); + } + + public BreakpointEvent resumeTo(Location loc, boolean suspendThread) { final BreakpointRequest request = - requestManager.createBreakpointRequest(loc); + requestManager.createBreakpointRequest(loc); request.addCountFilter(1); + if (suspendThread) { + request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD); + } request.enable(); return (BreakpointEvent)waitForRequestedEvent(request); } @@ -845,12 +852,16 @@ abstract public class TestScaffold extends TargetAdapter { } public BreakpointEvent resumeTo(String clsName, int lineNumber) throws AbsentInformationException { + return resumeTo(clsName, lineNumber, false); + } + + public BreakpointEvent resumeTo(String clsName, int lineNumber, boolean suspendThread) throws AbsentInformationException { ReferenceType rt = findReferenceType(clsName); if (rt == null) { rt = resumeToPrepareOf(clsName).referenceType(); } - return resumeTo(findLocation(rt, lineNumber)); + return resumeTo(findLocation(rt, lineNumber), suspendThread); } public ClassPrepareEvent resumeToPrepareOf(String className) { diff --git a/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java b/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java index 716a918dbf0..3d407adb319 100644 --- a/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java +++ b/test/jdk/com/sun/jdi/lib/jdb/JdbTest.java @@ -238,7 +238,7 @@ public abstract class JdbTest { } // gets full test source path for the given test filename - protected static String getTestSourcePath(String fileName) { + public static String getTestSourcePath(String fileName) { return Paths.get(System.getProperty("test.src")).resolve(fileName).toString(); } From a9f9385cedf095915dc7502d93b92425ede7db22 Mon Sep 17 00:00:00 2001 From: Ralf Schmelter Date: Wed, 10 Oct 2018 08:36:31 +0200 Subject: [PATCH 059/124] 8211332: Space for stub routines (code_size2) is too small on new Skylake CPUs Increase code_size2 for new Skylake CPUs. Reviewed-by: kvn, stuefe, thartmann --- src/hotspot/cpu/x86/stubRoutines_x86.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp index 1fa697a624c..8648c10928a 100644 --- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp +++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp @@ -33,7 +33,7 @@ static bool returns_to_call_stub(address return_pc) { return return_pc == _call_ enum platform_dependent_constants { code_size1 = 20000 LP64_ONLY(+10000), // simply increase if too small (assembler will crash if too small) - code_size2 = 33800 LP64_ONLY(+10000) // simply increase if too small (assembler will crash if too small) + code_size2 = 35300 LP64_ONLY(+10000) // simply increase if too small (assembler will crash if too small) }; class x86 { From 3085a89f134df553c2204892f6484e97cf2604e4 Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Wed, 3 Oct 2018 15:22:16 +0200 Subject: [PATCH 060/124] 8211279: Verify missing object equals barriers Reviewed-by: pliden, shade, zgu --- src/hotspot/share/code/nmethod.cpp | 2 +- src/hotspot/share/code/relocInfo.cpp | 2 +- src/hotspot/share/compiler/oopMap.cpp | 6 +++--- src/hotspot/share/gc/shared/barrierSet.hpp | 4 ++++ src/hotspot/share/gc/shared/referenceProcessor.cpp | 6 +++--- src/hotspot/share/gc/shared/referenceProcessor.hpp | 4 ++-- .../share/gc/shared/stringdedup/stringDedupTable.cpp | 2 +- src/hotspot/share/oops/access.hpp | 2 +- src/hotspot/share/oops/accessBackend.hpp | 2 +- src/hotspot/share/oops/oop.hpp | 2 ++ src/hotspot/share/oops/oopsHierarchy.cpp | 12 ++++++++++++ src/hotspot/share/oops/oopsHierarchy.hpp | 4 ++-- 12 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp index b3d5d2f0408..8368f074dfe 100644 --- a/src/hotspot/share/code/nmethod.cpp +++ b/src/hotspot/share/code/nmethod.cpp @@ -2340,7 +2340,7 @@ void nmethod::print_recorded_oops() { for (int i = 0; i < oops_count(); i++) { oop o = oop_at(i); tty->print("#%3d: " INTPTR_FORMAT " ", i, p2i(o)); - if (o == (oop)Universe::non_oop_word()) { + if (o == Universe::non_oop_word()) { tty->print("non-oop word"); } else { if (o != NULL) { diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp index 94fb1886b68..0654df90b2f 100644 --- a/src/hotspot/share/code/relocInfo.cpp +++ b/src/hotspot/share/code/relocInfo.cpp @@ -574,7 +574,7 @@ oop* oop_Relocation::oop_addr() { oop oop_Relocation::oop_value() { oop v = *oop_addr(); // clean inline caches store a special pseudo-null - if (v == (oop)Universe::non_oop_word()) v = NULL; + if (v == Universe::non_oop_word()) v = NULL; return v; } diff --git a/src/hotspot/share/compiler/oopMap.cpp b/src/hotspot/share/compiler/oopMap.cpp index 262a2a9826f..a791fa24c50 100644 --- a/src/hotspot/share/compiler/oopMap.cpp +++ b/src/hotspot/share/compiler/oopMap.cpp @@ -350,7 +350,7 @@ void OopMapSet::all_do(const frame *fr, const RegisterMap *reg_map, // implicit null check is used in compiled code. // The narrow_oop_base could be NULL or be the address // of the page below heap depending on compressed oops mode. - if (base_loc != NULL && *base_loc != (oop)NULL && !Universe::is_narrow_oop_base(*base_loc)) { + if (base_loc != NULL && *base_loc != NULL && !Universe::is_narrow_oop_base(*base_loc)) { derived_oop_fn(base_loc, derived_loc); } oms.next(); @@ -371,7 +371,7 @@ void OopMapSet::all_do(const frame *fr, const RegisterMap *reg_map, guarantee(loc != NULL, "missing saved register"); if ( omv.type() == OopMapValue::oop_value ) { oop val = *loc; - if (val == (oop)NULL || Universe::is_narrow_oop_base(val)) { + if (val == NULL || Universe::is_narrow_oop_base(val)) { // Ignore NULL oops and decoded NULL narrow oops which // equal to Universe::narrow_oop_base when a narrow oop // implicit null check is used in compiled code. @@ -769,7 +769,7 @@ void DerivedPointerTable::add(oop *derived_loc, oop *base_loc) { assert(Universe::heap()->is_in_or_null(*base_loc), "not an oop"); assert(derived_loc != base_loc, "Base and derived in same location"); if (_active) { - assert(*derived_loc != (oop)base_loc, "location already added"); + assert(*derived_loc != (void*)base_loc, "location already added"); assert(_list != NULL, "list must exist"); intptr_t offset = value_of_loc(derived_loc) - value_of_loc(base_loc); // This assert is invalid because derived pointers can be diff --git a/src/hotspot/share/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp index 7996b721778..9780dceb2d7 100644 --- a/src/hotspot/share/gc/shared/barrierSet.hpp +++ b/src/hotspot/share/gc/shared/barrierSet.hpp @@ -130,6 +130,10 @@ public: virtual void on_thread_detach(JavaThread* thread) {} virtual void make_parsable(JavaThread* thread) {} +#ifdef CHECK_UNHANDLED_OOPS + virtual bool oop_equals_operator_allowed() { return true; } +#endif + public: // Print a description of the memory for the barrier set virtual void print_on(outputStream* st) const = 0; diff --git a/src/hotspot/share/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp index 214ee00a9df..868aac5062c 100644 --- a/src/hotspot/share/gc/shared/referenceProcessor.cpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp @@ -284,7 +284,7 @@ void DiscoveredListIterator::remove() { // First _prev_next ref actually points into DiscoveredList (gross). oop new_next; - if (_next_discovered == _current_discovered) { + if (oopDesc::equals_raw(_next_discovered, _current_discovered)) { // At the end of the list, we should make _prev point to itself. // If _ref is the first ref, then _prev_next will be in the DiscoveredList, // and _prev will be NULL. @@ -474,7 +474,7 @@ void ReferenceProcessor::clear_discovered_references(DiscoveredList& refs_list) { oop obj = NULL; oop next = refs_list.head(); - while (next != obj) { + while (!oopDesc::equals_raw(next, obj)) { obj = next; next = java_lang_ref_Reference::discovered(obj); java_lang_ref_Reference::set_discovered_raw(obj, NULL); @@ -746,7 +746,7 @@ void ReferenceProcessor::balance_queues(DiscoveredList ref_lists[]) ref_lists[to_idx].inc_length(refs_to_move); // Remove the chain from the from list. - if (move_tail == new_head) { + if (oopDesc::equals_raw(move_tail, new_head)) { // We found the end of the from list. ref_lists[from_idx].set_head(NULL); } else { diff --git a/src/hotspot/share/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp index daa7f009336..305cbd233dd 100644 --- a/src/hotspot/share/gc/shared/referenceProcessor.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp @@ -143,13 +143,13 @@ public: inline size_t removed() const { return _removed; } inline void move_to_next() { - if (_current_discovered == _next_discovered) { + if (oopDesc::equals_raw(_current_discovered, _next_discovered)) { // End of the list. _current_discovered = NULL; } else { _current_discovered = _next_discovered; } - assert(_current_discovered != _first_seen, "cyclic ref_list found"); + assert(!oopDesc::equals_raw(_current_discovered, _first_seen), "cyclic ref_list found"); _processed++; } }; diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp index 489423d96ff..42247d20865 100644 --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp @@ -375,7 +375,7 @@ void StringDedupTable::deduplicate(oop java_string, StringDedupStat* stat) { } typeArrayOop existing_value = lookup_or_add(value, latin1, hash); - if (existing_value == value) { + if (oopDesc::equals_raw(existing_value, value)) { // Same value, already known stat->inc_known(); return; diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp index 2020b133f3c..149392bc9e5 100644 --- a/src/hotspot/share/oops/access.hpp +++ b/src/hotspot/share/oops/access.hpp @@ -277,7 +277,7 @@ public: } static bool equals(oop o1, oop o2) { - verify_decorators(); + verify_decorators(); return AccessInternal::equals(o1, o2); } }; diff --git a/src/hotspot/share/oops/accessBackend.hpp b/src/hotspot/share/oops/accessBackend.hpp index 05ef31b65b6..5a170ec3d9f 100644 --- a/src/hotspot/share/oops/accessBackend.hpp +++ b/src/hotspot/share/oops/accessBackend.hpp @@ -410,7 +410,7 @@ public: static oop resolve(oop obj) { return obj; } - static bool equals(oop o1, oop o2) { return o1 == o2; } + static bool equals(oop o1, oop o2) { return (void*)o1 == (void*)o2; } }; // Below is the implementation of the first 4 steps of the template pipeline: diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp index e6665b65172..fb3cd7ae63f 100644 --- a/src/hotspot/share/oops/oop.hpp +++ b/src/hotspot/share/oops/oop.hpp @@ -153,6 +153,8 @@ class oopDesc { inline static bool equals(oop o1, oop o2) { return Access<>::equals(o1, o2); } + inline static bool equals_raw(oop o1, oop o2) { return RawAccess<>::equals(o1, o2); } + // Access to fields in a instanceOop through these methods. template oop obj_field_access(int offset) const; diff --git a/src/hotspot/share/oops/oopsHierarchy.cpp b/src/hotspot/share/oops/oopsHierarchy.cpp index 7a0bf50d6e0..afb86676fb9 100644 --- a/src/hotspot/share/oops/oopsHierarchy.cpp +++ b/src/hotspot/share/oops/oopsHierarchy.cpp @@ -23,6 +23,7 @@ */ #include "precompiled.hpp" +#include "gc/shared/barrierSet.hpp" #include "gc/shared/collectedHeap.hpp" #include "gc/shared/collectedHeap.inline.hpp" #include "oops/oopsHierarchy.hpp" @@ -53,4 +54,15 @@ void oop::unregister_oop() { t->unhandled_oops()->unregister_unhandled_oop(this); } } + +bool oop::operator==(const oop o) const { + assert(BarrierSet::barrier_set()->oop_equals_operator_allowed(), "Not allowed"); + return obj() == o.obj(); +} + +bool oop::operator!=(const volatile oop o) const { + assert(BarrierSet::barrier_set()->oop_equals_operator_allowed(), "Not allowed"); + return obj() != o.obj(); +} + #endif // CHECK_UNHANDLED_OOPS diff --git a/src/hotspot/share/oops/oopsHierarchy.hpp b/src/hotspot/share/oops/oopsHierarchy.hpp index d419aa156c0..a9bb63800ea 100644 --- a/src/hotspot/share/oops/oopsHierarchy.hpp +++ b/src/hotspot/share/oops/oopsHierarchy.hpp @@ -101,9 +101,9 @@ public: // General access oopDesc* operator->() const { return obj(); } - bool operator==(const oop o) const { return obj() == o.obj(); } + bool operator==(const oop o) const; bool operator==(void *p) const { return obj() == p; } - bool operator!=(const volatile oop o) const { return obj() != o.obj(); } + bool operator!=(const volatile oop o) const; bool operator!=(void *p) const { return obj() != p; } // Assignment From 5de31861b205bef3bd03dcb9e5cf1e9e376083b3 Mon Sep 17 00:00:00 2001 From: Roman Kennke Date: Wed, 10 Oct 2018 10:58:48 +0200 Subject: [PATCH 061/124] 8211270: GC abstraction to get real object and headers size Reviewed-by: shade, zgu, eosterlund --- src/hotspot/share/gc/shared/collectedHeap.cpp | 4 ++++ src/hotspot/share/gc/shared/collectedHeap.hpp | 2 ++ src/hotspot/share/prims/jvmtiEnv.cpp | 2 +- src/hotspot/share/prims/whitebox.cpp | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp index 6d3462d34f0..21ae92c7d79 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.cpp +++ b/src/hotspot/share/gc/shared/collectedHeap.cpp @@ -586,3 +586,7 @@ void CollectedHeap::unpin_object(JavaThread* thread, oop obj) { void CollectedHeap::deduplicate_string(oop str) { // Do nothing, unless overridden in subclass. } + +size_t CollectedHeap::obj_size(oop obj) const { + return obj->size(); +} diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp index c3454e2f924..458d3b3ace7 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.hpp @@ -576,6 +576,8 @@ class CollectedHeap : public CHeapObj { virtual bool is_oop(oop object) const; + virtual size_t obj_size(oop obj) const; + // Non product verification and debugging. #ifndef PRODUCT // Support for PromotionFailureALot. Return true if it's time to cause a diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp index 289de3c9ec2..5a4c02c0367 100644 --- a/src/hotspot/share/prims/jvmtiEnv.cpp +++ b/src/hotspot/share/prims/jvmtiEnv.cpp @@ -470,7 +470,7 @@ jvmtiError JvmtiEnv::GetObjectSize(jobject object, jlong* size_ptr) { oop mirror = JNIHandles::resolve_external_guard(object); NULL_CHECK(mirror, JVMTI_ERROR_INVALID_OBJECT); - *size_ptr = (jlong)mirror->size() * wordSize; + *size_ptr = (jlong)Universe::heap()->obj_size(mirror) * wordSize; return JVMTI_ERROR_NONE; } /* end GetObjectSize */ diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index a407d8c6e20..fea2bc89fc1 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -372,7 +372,7 @@ WB_END WB_ENTRY(jlong, WB_GetObjectSize(JNIEnv* env, jobject o, jobject obj)) oop p = JNIHandles::resolve(obj); - return p->size() * HeapWordSize; + return Universe::heap()->obj_size(p) * HeapWordSize; WB_END WB_ENTRY(jlong, WB_GetHeapSpaceAlignment(JNIEnv* env, jobject o)) From df92fc0954e309acec355b9071a06da984a1abe7 Mon Sep 17 00:00:00 2001 From: Michihiro Horie Date: Wed, 10 Oct 2018 14:28:35 +0200 Subject: [PATCH 062/124] 8211908: PPC64: Enable SuperWordLoopUnrollAnalysis by default Reviewed-by: mdoerr, goetz --- src/hotspot/cpu/ppc/c2_globals_ppc.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp index a947e45febf..96a2a5f9235 100644 --- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp +++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp @@ -62,7 +62,7 @@ define_pd_global(bool, OptoPeephole, false); define_pd_global(bool, UseCISCSpill, false); define_pd_global(bool, OptoBundling, false); define_pd_global(bool, OptoRegScheduling, false); -define_pd_global(bool, SuperWordLoopUnrollAnalysis, false); +define_pd_global(bool, SuperWordLoopUnrollAnalysis, true); // GL: // Detected a problem with unscaled compressed oops and // narrow_oop_use_complex_address() == false. From a9efcea77884f6f36219fd665073b5906ddb212d Mon Sep 17 00:00:00 2001 From: Pavel Rappo Date: Wed, 10 Oct 2018 14:13:32 +0100 Subject: [PATCH 063/124] 8212000: Verify exported symbols in java.base (libnet, libnio/ch) Reviewed-by: alanb, chegar --- src/java.base/share/native/libnet/net_util.h | 5 +---- src/java.base/unix/native/libnet/net_util_md.c | 2 +- src/java.base/unix/native/libnio/ch/Net.c | 3 +-- src/java.base/unix/native/libnio/ch/nio_util.h | 3 +-- src/java.base/windows/native/libnet/net_util_md.c | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/java.base/share/native/libnet/net_util.h b/src/java.base/share/native/libnet/net_util.h index 1caefd23001..08360d71148 100644 --- a/src/java.base/share/native/libnet/net_util.h +++ b/src/java.base/share/native/libnet/net_util.h @@ -122,8 +122,6 @@ JNIEXPORT void JNICALL Java_java_net_NetworkInterface_init(JNIEnv *env, jclass c JNIEXPORT void JNICALL NET_ThrowNew(JNIEnv *env, int errorNum, char *msg); -int NET_GetError(); - void NET_ThrowCurrent(JNIEnv *env, char *msg); jfieldID NET_GetFileDescriptorID(JNIEnv *env); @@ -202,7 +200,6 @@ NET_EnableFastTcpLoopback(int fd); unsigned short in_cksum(unsigned short *addr, int len); -JNIEXPORT jint JNICALL -NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout); +jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout); #endif /* NET_UTILS_H */ diff --git a/src/java.base/unix/native/libnet/net_util_md.c b/src/java.base/unix/native/libnet/net_util_md.c index 2a740d10b92..50ca625d08d 100644 --- a/src/java.base/unix/native/libnet/net_util_md.c +++ b/src/java.base/unix/native/libnet/net_util_md.c @@ -1546,7 +1546,7 @@ NET_Bind(int fd, SOCKETADDRESS *sa, int len) * It returns the time left from the timeout (possibly 0), or -1 if it expired. */ -JNIEXPORT jint JNICALL +jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout) { jlong prevNanoTime = JVM_NanoTime(env, 0); diff --git a/src/java.base/unix/native/libnio/ch/Net.c b/src/java.base/unix/native/libnio/ch/Net.c index e1320599102..6e5ef2ab934 100644 --- a/src/java.base/unix/native/libnio/ch/Net.c +++ b/src/java.base/unix/native/libnio/ch/Net.c @@ -747,8 +747,7 @@ Java_sun_nio_ch_Net_pollconnValue(JNIEnv *env, jclass this) /* Declared in nio_util.h */ -JNIEXPORT jint JNICALL -handleSocketError(JNIEnv *env, jint errorValue) +jint handleSocketError(JNIEnv *env, jint errorValue) { char *xn; switch (errorValue) { diff --git a/src/java.base/unix/native/libnio/ch/nio_util.h b/src/java.base/unix/native/libnio/ch/nio_util.h index 9d77f0580ca..912f78e2ba1 100644 --- a/src/java.base/unix/native/libnio/ch/nio_util.h +++ b/src/java.base/unix/native/libnio/ch/nio_util.h @@ -62,5 +62,4 @@ jlong convertLongReturnVal(JNIEnv *env, jlong n, jboolean reading); /* Defined in Net.c */ -JNIEXPORT jint JNICALL -handleSocketError(JNIEnv *env, jint errorValue); +jint handleSocketError(JNIEnv *env, jint errorValue); diff --git a/src/java.base/windows/native/libnet/net_util_md.c b/src/java.base/windows/native/libnet/net_util_md.c index c09786f9f9b..2a3e1985131 100644 --- a/src/java.base/windows/native/libnet/net_util_md.c +++ b/src/java.base/windows/native/libnet/net_util_md.c @@ -903,7 +903,7 @@ NET_IsEqual(jbyte* caddr1, jbyte* caddr2) { * It returns the time left from the timeout, or -1 if it expired. */ -JNIEXPORT jint JNICALL +jint NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout) { jlong prevTime = JVM_CurrentTimeMillis(env, 0); From a2d1b6b720a52866aded62040ab93abac9bf0090 Mon Sep 17 00:00:00 2001 From: Roland Westrelin Date: Fri, 28 Sep 2018 14:24:22 +0200 Subject: [PATCH 064/124] 8211232: GraphKit::make_runtime_call() sometimes attaches wrong memory state to call Reviewed-by: kvn --- src/hotspot/share/opto/graphKit.cpp | 9 ++++----- src/hotspot/share/opto/graphKit.hpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp index 9f51d248c13..b30689c957d 100644 --- a/src/hotspot/share/opto/graphKit.cpp +++ b/src/hotspot/share/opto/graphKit.cpp @@ -1804,12 +1804,13 @@ Node* GraphKit::set_results_for_java_call(CallJavaNode* call, bool separate_io_p // A better answer would be to separate out card marks from other memory. // For now, return the input memory state, so that it can be reused // after the call, if this call has restricted memory effects. -Node* GraphKit::set_predefined_input_for_runtime_call(SafePointNode* call) { +Node* GraphKit::set_predefined_input_for_runtime_call(SafePointNode* call, Node* narrow_mem) { // Set fixed predefined input arguments Node* memory = reset_memory(); + Node* m = narrow_mem == NULL ? memory : narrow_mem; call->init_req( TypeFunc::Control, control() ); call->init_req( TypeFunc::I_O, top() ); // does no i/o - call->init_req( TypeFunc::Memory, memory ); // may gc ptrs + call->init_req( TypeFunc::Memory, m ); // may gc ptrs call->init_req( TypeFunc::FramePtr, frameptr() ); call->init_req( TypeFunc::ReturnAdr, top() ); return memory; @@ -2465,9 +2466,7 @@ Node* GraphKit::make_runtime_call(int flags, } else { assert(!wide_out, "narrow in => narrow out"); Node* narrow_mem = memory(adr_type); - prev_mem = reset_memory(); - map()->set_memory(narrow_mem); - set_predefined_input_for_runtime_call(call); + prev_mem = set_predefined_input_for_runtime_call(call, narrow_mem); } // Hook each parm in order. Stop looking at the first NULL. diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp index d061fb6b556..bac4e45e64a 100644 --- a/src/hotspot/share/opto/graphKit.hpp +++ b/src/hotspot/share/opto/graphKit.hpp @@ -699,7 +699,7 @@ class GraphKit : public Phase { void set_predefined_output_for_runtime_call(Node* call, Node* keep_mem, const TypePtr* hook_mem); - Node* set_predefined_input_for_runtime_call(SafePointNode* call); + Node* set_predefined_input_for_runtime_call(SafePointNode* call, Node* narrow_mem = NULL); // Replace the call with the current state of the kit. Requires // that the call was generated with separate io_projs so that From 1e887a901e19515a1ea16b903ad2be41620cfefd Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 10 Oct 2018 22:13:30 +0800 Subject: [PATCH 065/124] 8211969: test/jdk/lib/security/CheckBlacklistedCerts.java searching for wrong paths Reviewed-by: mullan --- .../lib/security/CheckBlacklistedCerts.java | 44 ++++++------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/test/jdk/lib/security/CheckBlacklistedCerts.java b/test/jdk/lib/security/CheckBlacklistedCerts.java index 5c18de62111..ef3cfb4d6ce 100644 --- a/test/jdk/lib/security/CheckBlacklistedCerts.java +++ b/test/jdk/lib/security/CheckBlacklistedCerts.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8011402 + * @bug 8011402 8211969 * @summary Move blacklisting certificate logic from hard code to data * @modules java.base/sun.security.util */ @@ -60,38 +60,20 @@ public class CheckBlacklistedCerts { Set blacklisted = new HashSet<>(); // Assumes the full src is available - File[] blacklists = { - new File(System.getProperty("test.src"), - "../../../make/data/blacklistedcertsconverter/blacklisted.certs.pem"), - new File(System.getProperty("test.src"), - "../../../make/closed/data/blacklistedcertsconverter/blacklisted.certs.pem") - }; - - // Is this an OPENJDK build? - String prop = System.getProperty("java.runtime.name"); - if (prop != null && prop.startsWith("OpenJDK")) { - System.out.println("This is a OpenJDK build."); - blacklists = Arrays.copyOf(blacklists, 1); - } + File blacklist = new File(System.getProperty("test.src"), + "../../../../make/data/blacklistedcertsconverter/blacklisted.certs.pem"); CertificateFactory cf = CertificateFactory.getInstance("X.509"); - for (File blacklist: blacklists) { - System.out.print("Check for " + blacklist + ": "); - if (!blacklist.exists()) { - System.out.println("does not exist"); - } else { - try (FileInputStream fis = new FileInputStream(blacklist)) { - Collection certs - = cf.generateCertificates(fis); - System.out.println(certs.size()); - for (Certificate c: certs) { - blacklisted.add(c); - X509Certificate cert = ((X509Certificate)c); - if (!UntrustedCertificates.isUntrusted(cert)) { - System.out.println(cert.getSubjectDN() + " is trusted"); - failed = true; - } - } + try (FileInputStream fis = new FileInputStream(blacklist)) { + Collection certs + = cf.generateCertificates(fis); + System.out.println(certs.size()); + for (Certificate c: certs) { + blacklisted.add(c); + X509Certificate cert = ((X509Certificate)c); + if (!UntrustedCertificates.isUntrusted(cert)) { + System.out.println(cert.getSubjectDN() + " is trusted"); + failed = true; } } } From 8c62c2e33a4ff54f68a1fb4febac5e00e0c86980 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Wed, 10 Oct 2018 10:18:52 -0400 Subject: [PATCH 066/124] 8207689: Remove perfCounter _load_instance_class_failCounter used by deleted flag UnsyncloadClass Delete the perfCounter Reviewed-by: lfoltan, acorn, dholmes --- src/hotspot/share/classfile/classLoader.cpp | 4 ---- src/hotspot/share/classfile/classLoader.hpp | 7 ------- 2 files changed, 11 deletions(-) diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp index e37f2c5cc98..5656b952031 100644 --- a/src/hotspot/share/classfile/classLoader.cpp +++ b/src/hotspot/share/classfile/classLoader.cpp @@ -135,7 +135,6 @@ PerfCounter* ClassLoader::_sync_JVMFindLoadedClassLockFreeCounter = NULL; PerfCounter* ClassLoader::_sync_JVMDefineClassLockFreeCounter = NULL; PerfCounter* ClassLoader::_sync_JNIDefineClassLockFreeCounter = NULL; PerfCounter* ClassLoader::_unsafe_defineClassCallCounter = NULL; -PerfCounter* ClassLoader::_load_instance_class_failCounter = NULL; GrowableArray* ClassLoader::_patch_mod_entries = NULL; GrowableArray* ClassLoader::_exploded_entries = NULL; @@ -1604,9 +1603,6 @@ void ClassLoader::initialize() { NEWPERFEVENTCOUNTER(_unsafe_defineClassCallCounter, SUN_CLS, "unsafeDefineClassCalls"); - - NEWPERFEVENTCOUNTER(_load_instance_class_failCounter, SUN_CLS, - "loadInstanceClassFailRate"); } // lookup zip library entry points diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp index a103da870e7..4c765be5c92 100644 --- a/src/hotspot/share/classfile/classLoader.hpp +++ b/src/hotspot/share/classfile/classLoader.hpp @@ -192,7 +192,6 @@ class ClassLoader: AllStatic { static PerfCounter* _sync_JNIDefineClassLockFreeCounter; static PerfCounter* _unsafe_defineClassCallCounter; - static PerfCounter* _load_instance_class_failCounter; // The boot class path consists of 3 ordered pieces: // 1. the module/path pairs specified to --patch-module @@ -340,12 +339,6 @@ class ClassLoader: AllStatic { return _unsafe_defineClassCallCounter; } - // Record how many times SystemDictionary::load_instance_class call - // fails with linkageError when Unsyncloadclass flag is set. - static PerfCounter* load_instance_class_failCounter() { - return _load_instance_class_failCounter; - } - // Modular java runtime image is present vs. a build with exploded modules static bool has_jrt_entry() { return (_jrt_entry != NULL); } static ClassPathEntry* get_jrt_entry() { return _jrt_entry; } From 6ca3b398235134dd8cfbe776237dbab2d55bfe45 Mon Sep 17 00:00:00 2001 From: Jean Christophe Beyler Date: Wed, 10 Oct 2018 08:26:49 -0700 Subject: [PATCH 067/124] 8211950: Deprecate the check if a JVMTI collector is present assertion Deprecate assertion that a collector is there; it is now a nop Reviewed-by: eosterlund, phh, pliden --- src/hotspot/share/gc/shared/memAllocator.cpp | 11 ----------- src/hotspot/share/runtime/threadHeapSampler.cpp | 17 ----------------- src/hotspot/share/runtime/threadHeapSampler.hpp | 4 ---- 3 files changed, 32 deletions(-) diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp index 5012e6b8ee1..08ab85a6119 100644 --- a/src/hotspot/share/gc/shared/memAllocator.cpp +++ b/src/hotspot/share/gc/shared/memAllocator.cpp @@ -198,15 +198,6 @@ void MemAllocator::Allocation::notify_allocation_jvmti_sampler() { return; } - assert(JavaThread::current()->heap_sampler().add_sampling_collector(), - "Should never return false."); - - // Only check if the sampler could actually sample something in this path. - assert(!JvmtiExport::should_post_sampled_object_alloc() || - !JvmtiSampledObjectAllocEventCollector::object_alloc_is_safe_to_sample() || - _thread->heap_sampler().sampling_collector_present(), - "Sampling collector not present."); - if (JvmtiExport::should_post_sampled_object_alloc()) { // If we want to be sampling, protect the allocated object with a Handle // before doing the callback. The callback is done in the destructor of @@ -219,8 +210,6 @@ void MemAllocator::Allocation::notify_allocation_jvmti_sampler() { _thread->heap_sampler().check_for_sampling(obj_h(), size_in_bytes, bytes_since_last); } - assert(JavaThread::current()->heap_sampler().remove_sampling_collector(), "Should never return false."); - if (_tlab_end_reset_for_sample || _allocated_tlab_size != 0) { _thread->tlab().set_sample_end(); } diff --git a/src/hotspot/share/runtime/threadHeapSampler.cpp b/src/hotspot/share/runtime/threadHeapSampler.cpp index 5b63d7ef0f3..ac398fecaec 100644 --- a/src/hotspot/share/runtime/threadHeapSampler.cpp +++ b/src/hotspot/share/runtime/threadHeapSampler.cpp @@ -171,20 +171,3 @@ int ThreadHeapSampler::get_sampling_interval() { void ThreadHeapSampler::set_sampling_interval(int sampling_interval) { OrderAccess::release_store(&_sampling_interval, sampling_interval); } - -// Methods used in assertion mode to check if a collector is present or not at -// the moment of TLAB sampling, ie a slow allocation path. -bool ThreadHeapSampler::sampling_collector_present() const { - return _collectors_present > 0; -} - -bool ThreadHeapSampler::remove_sampling_collector() { - assert(_collectors_present > 0, "Problem with collector counter."); - _collectors_present--; - return true; -} - -bool ThreadHeapSampler::add_sampling_collector() { - _collectors_present++; - return true; -} diff --git a/src/hotspot/share/runtime/threadHeapSampler.hpp b/src/hotspot/share/runtime/threadHeapSampler.hpp index cb370c11608..06bfbc8635e 100644 --- a/src/hotspot/share/runtime/threadHeapSampler.hpp +++ b/src/hotspot/share/runtime/threadHeapSampler.hpp @@ -66,10 +66,6 @@ class ThreadHeapSampler { static void set_sampling_interval(int sampling_interval); static int get_sampling_interval(); - - bool sampling_collector_present() const; - bool remove_sampling_collector(); - bool add_sampling_collector(); }; #endif // SHARE_RUNTIME_THREADHEAPSAMPLER_HPP From 706a5b9558f2003745f1bfa9a5b14e127b7f9c0b Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Wed, 10 Oct 2018 10:00:25 -0700 Subject: [PATCH 068/124] 8211952: Broken links in java.time API Reviewed-by: lancea --- .../share/classes/java/time/Duration.java | 2 +- .../share/classes/java/time/Instant.java | 2 +- .../share/classes/java/time/LocalDate.java | 2 +- .../classes/java/time/LocalDateTime.java | 6 +- .../share/classes/java/time/LocalTime.java | 2 +- .../share/classes/java/time/MonthDay.java | 2 +- .../classes/java/time/OffsetDateTime.java | 6 +- .../share/classes/java/time/OffsetTime.java | 6 +- .../share/classes/java/time/Period.java | 2 +- .../share/classes/java/time/Ser.java | 58 +++++++++---------- .../share/classes/java/time/Year.java | 2 +- .../share/classes/java/time/YearMonth.java | 2 +- .../share/classes/java/time/ZoneId.java | 2 +- .../share/classes/java/time/ZoneOffset.java | 2 +- .../share/classes/java/time/ZoneRegion.java | 4 +- .../classes/java/time/ZonedDateTime.java | 8 +-- .../java/time/chrono/AbstractChronology.java | 4 +- .../time/chrono/ChronoLocalDateTimeImpl.java | 4 +- .../java/time/chrono/ChronoPeriodImpl.java | 4 +- .../time/chrono/ChronoZonedDateTimeImpl.java | 4 +- .../java/time/chrono/HijrahChronology.java | 4 +- .../classes/java/time/chrono/HijrahDate.java | 2 +- .../java/time/chrono/IsoChronology.java | 4 +- .../java/time/chrono/JapaneseChronology.java | 4 +- .../java/time/chrono/JapaneseDate.java | 2 +- .../classes/java/time/chrono/JapaneseEra.java | 2 +- .../java/time/chrono/MinguoChronology.java | 4 +- .../classes/java/time/chrono/MinguoDate.java | 2 +- .../share/classes/java/time/chrono/Ser.java | 50 ++++++++-------- .../time/chrono/ThaiBuddhistChronology.java | 4 +- .../java/time/chrono/ThaiBuddhistDate.java | 2 +- .../share/classes/java/time/zone/Ser.java | 14 ++--- .../java/time/zone/ZoneOffsetTransition.java | 6 +- .../time/zone/ZoneOffsetTransitionRule.java | 6 +- .../classes/java/time/zone/ZoneRules.java | 4 +- 35 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/java.base/share/classes/java/time/Duration.java b/src/java.base/share/classes/java/time/Duration.java index c446bf338ac..6fda63cc25d 100644 --- a/src/java.base/share/classes/java/time/Duration.java +++ b/src/java.base/share/classes/java/time/Duration.java @@ -1519,7 +1519,7 @@ public final class Duration //----------------------------------------------------------------------- /** * Writes the object using a - * dedicated serialized form. + * dedicated serialized form. * @serialData * 
          *  out.writeByte(1);  // identifies a Duration
diff --git a/src/java.base/share/classes/java/time/Instant.java b/src/java.base/share/classes/java/time/Instant.java
index 0aafa49fd40..8f38c76c20f 100644
--- a/src/java.base/share/classes/java/time/Instant.java
+++ b/src/java.base/share/classes/java/time/Instant.java
@@ -1332,7 +1332,7 @@ public final class Instant
     // -----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(2);  // identifies an Instant
diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index 0a89ec070c4..834a9e3e7df 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -2189,7 +2189,7 @@ public final class LocalDate
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(3);  // identifies a LocalDate
diff --git a/src/java.base/share/classes/java/time/LocalDateTime.java b/src/java.base/share/classes/java/time/LocalDateTime.java
index 9a9ca87ddc3..8d3773a36eb 100644
--- a/src/java.base/share/classes/java/time/LocalDateTime.java
+++ b/src/java.base/share/classes/java/time/LocalDateTime.java
@@ -1975,12 +1975,12 @@ public final class LocalDateTime
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(5);  // identifies a LocalDateTime
-     *  // the date excluding the one byte header
-     *  // the time excluding the one byte header
+     *  // the date excluding the one byte header
+     *  // the time excluding the one byte header
      * 
    
      *
      * @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java
index 80241339c35..6f427f04d54 100644
--- a/src/java.base/share/classes/java/time/LocalTime.java
+++ b/src/java.base/share/classes/java/time/LocalTime.java
@@ -1645,7 +1645,7 @@ public final class LocalTime
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * A twos-complement value indicates the remaining values are not in the stream
      * and should be set to zero.
diff --git a/src/java.base/share/classes/java/time/MonthDay.java b/src/java.base/share/classes/java/time/MonthDay.java
index c34a4f9c978..c8b5ca86921 100644
--- a/src/java.base/share/classes/java/time/MonthDay.java
+++ b/src/java.base/share/classes/java/time/MonthDay.java
@@ -754,7 +754,7 @@ public final class MonthDay
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(13);  // identifies a MonthDay
diff --git a/src/java.base/share/classes/java/time/OffsetDateTime.java b/src/java.base/share/classes/java/time/OffsetDateTime.java
index 39b80bc1fc6..19ae55285f0 100644
--- a/src/java.base/share/classes/java/time/OffsetDateTime.java
+++ b/src/java.base/share/classes/java/time/OffsetDateTime.java
@@ -1915,12 +1915,12 @@ public final class OffsetDateTime
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(10);  // identifies an OffsetDateTime
-     *  // the datetime excluding the one byte header
-     *  // the offset excluding the one byte header
+     *  // the datetime excluding the one byte header
+     *  // the offset excluding the one byte header
      * 
    
      *
      * @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/OffsetTime.java b/src/java.base/share/classes/java/time/OffsetTime.java
index b4e52743ba5..6301da8946a 100644
--- a/src/java.base/share/classes/java/time/OffsetTime.java
+++ b/src/java.base/share/classes/java/time/OffsetTime.java
@@ -1400,12 +1400,12 @@ public final class OffsetTime
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(9);  // identifies an OffsetTime
-     *  // the time excluding the one byte header
-     *  // the offset excluding the one byte header
+     *  // the time excluding the one byte header
+     *  // the offset excluding the one byte header
      * 
    
      *
      * @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/Period.java b/src/java.base/share/classes/java/time/Period.java
index 726c52b742b..c0eef02ca1c 100644
--- a/src/java.base/share/classes/java/time/Period.java
+++ b/src/java.base/share/classes/java/time/Period.java
@@ -1041,7 +1041,7 @@ public final class Period
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(14);  // identifies a Period
diff --git a/src/java.base/share/classes/java/time/Ser.java b/src/java.base/share/classes/java/time/Ser.java
index 885b43abd83..26cfc0b8ffc 100644
--- a/src/java.base/share/classes/java/time/Ser.java
+++ b/src/java.base/share/classes/java/time/Ser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,20 +139,20 @@ final class Ser implements Externalizable {
      * in the stream.  Refer to each class {@code writeReplace}
      * serialized form for the value of the type and sequence of values for the type.
      * 
      *
      * @param out  the data stream to write to, not null
@@ -223,20 +223,20 @@ final class Ser implements Externalizable {
      * {@code Ser} object.
      *
      * 
      
-     * 
    • Duration - {@code Duration.ofSeconds(seconds, nanos);}
-     * 
    • Instant - {@code Instant.ofEpochSecond(seconds, nanos);}
-     * 
    • LocalDate - {@code LocalDate.of(year, month, day);}
-     * 
    • LocalDateTime - {@code LocalDateTime.of(date, time);}
-     * 
    • LocalTime - {@code LocalTime.of(hour, minute, second, nano);}
-     * 
    • MonthDay - {@code MonthDay.of(month, day);}
-     * 
    • OffsetTime - {@code OffsetTime.of(time, offset);}
-     * 
    • OffsetDateTime - {@code OffsetDateTime.of(dateTime, offset);}
-     * 
    • Period - {@code Period.of(years, months, days);}
-     * 
    • Year - {@code Year.of(year);}
-     * 
    • YearMonth - {@code YearMonth.of(year, month);}
-     * 
    • ZonedDateTime - {@code ZonedDateTime.ofLenient(dateTime, offset, zone);}
-     * 
    • ZoneId - {@code ZoneId.of(id);}
-     * 
    • ZoneOffset - {@code (offsetByte == 127 ? ZoneOffset.ofTotalSeconds(in.readInt()) : ZoneOffset.ofTotalSeconds(offsetByte * 900));}
+     * 
    • Duration - {@code Duration.ofSeconds(seconds, nanos);}
+     * 
    • Instant - {@code Instant.ofEpochSecond(seconds, nanos);}
+     * 
    • LocalDate - {@code LocalDate.of(year, month, day);}
+     * 
    • LocalDateTime - {@code LocalDateTime.of(date, time);}
+     * 
    • LocalTime - {@code LocalTime.of(hour, minute, second, nano);}
+     * 
    • MonthDay - {@code MonthDay.of(month, day);}
+     * 
    • OffsetTime - {@code OffsetTime.of(time, offset);}
+     * 
    • OffsetDateTime - {@code OffsetDateTime.of(dateTime, offset);}
+     * 
    • Period - {@code Period.of(years, months, days);}
+     * 
    • Year - {@code Year.of(year);}
+     * 
    • YearMonth - {@code YearMonth.of(year, month);}
+     * 
    • ZonedDateTime - {@code ZonedDateTime.ofLenient(dateTime, offset, zone);}
+     * 
    • ZoneId - {@code ZoneId.of(id);}
+     * 
    • ZoneOffset - {@code (offsetByte == 127 ? ZoneOffset.ofTotalSeconds(in.readInt()) : ZoneOffset.ofTotalSeconds(offsetByte * 900));}
      * 
    
      *
      * @param in  the data to read, not null
diff --git a/src/java.base/share/classes/java/time/Year.java b/src/java.base/share/classes/java/time/Year.java
index 27dc53dae6e..624e2a0e7a5 100644
--- a/src/java.base/share/classes/java/time/Year.java
+++ b/src/java.base/share/classes/java/time/Year.java
@@ -1088,7 +1088,7 @@ public final class Year
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(11);  // identifies a Year
diff --git a/src/java.base/share/classes/java/time/YearMonth.java b/src/java.base/share/classes/java/time/YearMonth.java
index d1fa05b6243..40c88e4f6c5 100644
--- a/src/java.base/share/classes/java/time/YearMonth.java
+++ b/src/java.base/share/classes/java/time/YearMonth.java
@@ -1212,7 +1212,7 @@ public final class YearMonth
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(12);  // identifies a YearMonth
diff --git a/src/java.base/share/classes/java/time/ZoneId.java b/src/java.base/share/classes/java/time/ZoneId.java
index 8bd135ab611..7f4ddbd4c8b 100644
--- a/src/java.base/share/classes/java/time/ZoneId.java
+++ b/src/java.base/share/classes/java/time/ZoneId.java
@@ -641,7 +641,7 @@ public abstract class ZoneId implements Serializable {
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(7);  // identifies a ZoneId (not ZoneOffset)
diff --git a/src/java.base/share/classes/java/time/ZoneOffset.java b/src/java.base/share/classes/java/time/ZoneOffset.java
index 29b5909a57d..cc7186e8c0c 100644
--- a/src/java.base/share/classes/java/time/ZoneOffset.java
+++ b/src/java.base/share/classes/java/time/ZoneOffset.java
@@ -750,7 +750,7 @@ public final class ZoneOffset
     // -----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(8);                  // identifies a ZoneOffset
diff --git a/src/java.base/share/classes/java/time/ZoneRegion.java b/src/java.base/share/classes/java/time/ZoneRegion.java
index 83f0b43d775..cf92d7459b3 100644
--- a/src/java.base/share/classes/java/time/ZoneRegion.java
+++ b/src/java.base/share/classes/java/time/ZoneRegion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,7 +180,7 @@ final class ZoneRegion extends ZoneId implements Serializable {
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(7);  // identifies a ZoneId (not ZoneOffset)
diff --git a/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java
index 7d50644a3f7..7c89759ed18 100644
--- a/src/java.base/share/classes/java/time/ZonedDateTime.java
+++ b/src/java.base/share/classes/java/time/ZonedDateTime.java
@@ -2224,13 +2224,13 @@ public final class ZonedDateTime
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(6);  // identifies a ZonedDateTime
-     *  // the dateTime excluding the one byte header
-     *  // the offset excluding the one byte header
-     *  // the zone ID excluding the one byte header
+     *  // the dateTime excluding the one byte header
+     *  // the offset excluding the one byte header
+     *  // the zone ID excluding the one byte header
      * 
    
      *
      * @return the instance of {@code Ser}, not null
diff --git a/src/java.base/share/classes/java/time/chrono/AbstractChronology.java b/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
index a32ecb78da1..e886975fb6d 100644
--- a/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/AbstractChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -721,7 +721,7 @@ public abstract class AbstractChronology implements Chronology {
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * 
          *  out.writeByte(1);  // identifies this as a Chronology
      *  out.writeUTF(getId());
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
index ac5f7b4bfe3..4460a7a8aa4 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -399,7 +399,7 @@ final class ChronoLocalDateTimeImpl
     //-----------------------------------------------------------------------
     /**
      * Writes the ChronoLocalDateTime using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(2);              // identifies a ChronoLocalDateTime
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
index 646af14d05a..b2b9ddb610f 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -355,7 +355,7 @@ final class ChronoPeriodImpl
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * 
          *  out.writeByte(12);  // identifies this as a ChronoPeriodImpl
      *  out.writeUTF(getId());  // the chronology
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
index abd21eecaf0..aa5f0ab11ff 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -322,7 +322,7 @@ final class ChronoZonedDateTimeImpl
     //-----------------------------------------------------------------------
     /**
      * Writes the ChronoZonedDateTime using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(3);                  // identifies a ChronoZonedDateTime
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
index bc702a44d07..864cfa941c7 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1011,7 +1011,7 @@ public final class HijrahChronology extends AbstractChronology implements Serial
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(1);     // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/HijrahDate.java b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
index 48b506044c0..632aca1d73f 100644
--- a/src/java.base/share/classes/java/time/chrono/HijrahDate.java
+++ b/src/java.base/share/classes/java/time/chrono/HijrahDate.java
@@ -663,7 +663,7 @@ public final class HijrahDate
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(6);                 // identifies a HijrahDate
diff --git a/src/java.base/share/classes/java/time/chrono/IsoChronology.java b/src/java.base/share/classes/java/time/chrono/IsoChronology.java
index 18d73689569..431aaca214c 100644
--- a/src/java.base/share/classes/java/time/chrono/IsoChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/IsoChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -680,7 +680,7 @@ public final class IsoChronology extends AbstractChronology implements Serializa
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(1);     // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
index 8cd67a05908..ed2d9172a07 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -507,7 +507,7 @@ public final class JapaneseChronology extends AbstractChronology implements Seri
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(1);     // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseDate.java b/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
index 92437c3d714..e6d72ded676 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseDate.java
@@ -725,7 +725,7 @@ public final class JapaneseDate
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(4);                 // identifies a JapaneseDate
diff --git a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
index 3d318ea36b0..a9bbc5e276e 100644
--- a/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
+++ b/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
@@ -395,7 +395,7 @@ public final class JapaneseEra
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(5);        // identifies a JapaneseEra
diff --git a/src/java.base/share/classes/java/time/chrono/MinguoChronology.java b/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
index fd6fdc3e8cd..647292303e2 100644
--- a/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/MinguoChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -337,7 +337,7 @@ public final class MinguoChronology extends AbstractChronology implements Serial
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(1);     // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/MinguoDate.java b/src/java.base/share/classes/java/time/chrono/MinguoDate.java
index c827b662871..b7caf9c6410 100644
--- a/src/java.base/share/classes/java/time/chrono/MinguoDate.java
+++ b/src/java.base/share/classes/java/time/chrono/MinguoDate.java
@@ -487,7 +487,7 @@ public final class MinguoDate
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(8);                 // identifies a MinguoDate
diff --git a/src/java.base/share/classes/java/time/chrono/Ser.java b/src/java.base/share/classes/java/time/chrono/Ser.java
index 317a7696497..6ecef928d79 100644
--- a/src/java.base/share/classes/java/time/chrono/Ser.java
+++ b/src/java.base/share/classes/java/time/chrono/Ser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -136,18 +136,18 @@ final class Ser implements Externalizable {
      * in the stream.  Refer to each class {@code writeReplace}
      * serialized form for the value of the type and sequence of values for the type.
      * 
      *
      * @param out  the data stream to write to, not null
@@ -202,18 +202,18 @@ final class Ser implements Externalizable {
      * {@code Ser} object.
      *
      * 
      *
      * @param in  the data stream to read from, not null
diff --git a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
index c6938b2c530..982aa57017e 100644
--- a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
+++ b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -374,7 +374,7 @@ public final class ThaiBuddhistChronology extends AbstractChronology implements
     //-----------------------------------------------------------------------
     /**
      * Writes the Chronology using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(1);     // identifies a Chronology
diff --git a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
index 276905c0f37..6db40aa571d 100644
--- a/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
+++ b/src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java
@@ -487,7 +487,7 @@ public final class ThaiBuddhistDate
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
          *  out.writeByte(10);                // identifies a ThaiBuddhistDate
diff --git a/src/java.base/share/classes/java/time/zone/Ser.java b/src/java.base/share/classes/java/time/zone/Ser.java
index 31c2f2d2bc1..59196465a88 100644
--- a/src/java.base/share/classes/java/time/zone/Ser.java
+++ b/src/java.base/share/classes/java/time/zone/Ser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,9 +125,9 @@ final class Ser implements Externalizable {
      * serialized form for the value of the type and sequence of values for the type.
      *
      * 
      *
      * @param out  the data stream to write to, not null
@@ -168,11 +168,11 @@ final class Ser implements Externalizable {
      * {@code Ser} object.
      *
      * 
      * @param in  the data to read, not null
diff --git a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
index 94264f32cce..6d108e277a0 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,10 +190,10 @@ public final class ZoneOffsetTransition
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * Refer to the serialized form of
-     * ZoneRules.writeReplace
+     * ZoneRules.writeReplace
      * for the encoding of epoch seconds and offsets.
      * 
    {@code
      *
diff --git a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
index 9c700d5ec70..dc95f3ecde4 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -249,10 +249,10 @@ public final class ZoneOffsetTransitionRule implements Serializable {
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * Refer to the serialized form of
-     * ZoneRules.writeReplace
+     * ZoneRules.writeReplace
      * for the encoding of epoch seconds and offsets.
      * 
    {@code
      *
diff --git a/src/java.base/share/classes/java/time/zone/ZoneRules.java b/src/java.base/share/classes/java/time/zone/ZoneRules.java
index f2dee70fee6..0cb381da05e 100644
--- a/src/java.base/share/classes/java/time/zone/ZoneRules.java
+++ b/src/java.base/share/classes/java/time/zone/ZoneRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -327,7 +327,7 @@ public final class ZoneRules implements Serializable {
 
     /**
      * Writes the object using a
-     * dedicated serialized form.
+     * dedicated serialized form.
      * @serialData
      * 
    {@code
      *

From ab0128ca51de59aaaa674654ca8d4e16b3b79965 Mon Sep 17 00:00:00 2001
From: Joe Darcy 
Date: Wed, 10 Oct 2018 10:28:33 -0700
Subject: [PATCH 069/124] 8058202: AnnotatedType implementations don't override
 toString(), equals(), hashCode()

Reviewed-by: jfranck
---
 .../annotation/AnnotatedTypeFactory.java      | 167 +++++++++-
 .../typeAnnotations/TestObjectMethods.java    | 314 ++++++++++++++++++
 2 files changed, 480 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/java/lang/annotation/typeAnnotations/TestObjectMethods.java

diff --git a/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
index 9029ae676ee..b33bf079b8d 100644
--- a/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
+++ b/src/java.base/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
 
 import static sun.reflect.annotation.TypeAnnotation.*;
 
@@ -202,6 +204,68 @@ public final class AnnotatedTypeFactory {
 
         }
 
+        @Override // java.lang.Object
+        public String toString() {
+            // Reusable toString implementation, but needs to be
+            // specialized for quirks of arrays.
+            return annotationsToString(getAnnotations(), false) + type.toString();
+        }
+
+        protected String annotationsToString(Annotation[] annotations, boolean leadingSpace) {
+            if (annotations != null && annotations.length > 0) {
+                StringJoiner sj = new StringJoiner(" ");
+                if (leadingSpace) {
+                    sj.add(""); // Add a space
+                }
+
+                for (Annotation annotation : annotations) {
+                    sj.add(annotation.toString());
+                }
+
+                if (!leadingSpace) {
+                    sj.add("");
+                }
+                return sj.toString();
+            } else {
+                return "";
+            }
+        }
+
+        protected boolean equalsTypeAndAnnotations(AnnotatedType that) {
+            return getType().equals(that.getType()) &&
+                // Treat ordering of annotations as significant
+                Arrays.equals(getAnnotations(), that.getAnnotations()) &&
+                Objects.equals(getAnnotatedOwnerType(), that.getAnnotatedOwnerType());
+        }
+
+        int baseHashCode() {
+            return type.hashCode() ^
+                // Acceptable to use Objects.hash rather than
+                // Arrays.deepHashCode since the elements of the array
+                // are not themselves arrays.
+                Objects.hash((Object[])getAnnotations()) ^
+                Objects.hash(getAnnotatedOwnerType());
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof AnnotatedType &&
+                !(o instanceof AnnotatedArrayType) &&
+                !(o instanceof AnnotatedTypeVariable) &&
+                !(o instanceof AnnotatedParameterizedType) &&
+                !(o instanceof AnnotatedWildcardType)) {
+                AnnotatedType that = (AnnotatedType) o;
+                return equalsTypeAndAnnotations(that);
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return baseHashCode();
+        }
+
         // Implementation details
         final LocationInfo getLocation() {
             return location;
@@ -244,6 +308,52 @@ public final class AnnotatedTypeFactory {
             }
             return ((GenericArrayType)t).getGenericComponentType();
         }
+
+        @Override
+        public String toString() {
+            // To annotate the full type of an array, the annotations
+            // are placed between the type and the brackets. For
+            // example, to annotate an array of Strings, the syntax used is
+            //
+            // String @TypeAnnotation []
+            //
+            // and *not*
+            //
+            // @TypeAnnotation String[].
+            //
+            // The toString output should strive to be reusable in
+            // source code. Therefore, the general logic of putting
+            // the annotations before a textual representation of the
+            // type need to be overridden for arrays.
+            StringBuilder sb = new StringBuilder();
+
+            AnnotatedType componentType = this;
+            while (componentType instanceof AnnotatedArrayType) {
+                AnnotatedArrayType annotatedArrayType = (AnnotatedArrayType) componentType;
+                sb.append(annotationsToString(annotatedArrayType.getAnnotations(), true) + "[]");
+                componentType = annotatedArrayType.getAnnotatedGenericComponentType();
+            }
+
+            sb.insert(0, componentType.toString());
+            return sb.toString();
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof AnnotatedArrayType) {
+                AnnotatedArrayType that = (AnnotatedArrayType) o;
+                return equalsTypeAndAnnotations(that) &&
+                    Objects.equals(getAnnotatedGenericComponentType(),
+                                   that.getAnnotatedGenericComponentType());
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return baseHashCode() ^ getAnnotatedGenericComponentType().hashCode();
+        }
     }
 
     private static final class AnnotatedTypeVariableImpl extends AnnotatedTypeBaseImpl implements AnnotatedTypeVariable {
@@ -266,6 +376,23 @@ public final class AnnotatedTypeFactory {
         private TypeVariable getTypeVariable() {
             return (TypeVariable)getType();
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof AnnotatedTypeVariable) {
+                AnnotatedTypeVariable that = (AnnotatedTypeVariable) o;
+                return equalsTypeAndAnnotations(that) &&
+                    Arrays.equals(getAnnotatedBounds(), that.getAnnotatedBounds());
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return baseHashCode() ^
+                Objects.hash((Object[])getAnnotatedBounds());
+        }
     }
 
     private static final class AnnotatedParameterizedTypeImpl extends AnnotatedTypeBaseImpl
@@ -316,6 +443,23 @@ public final class AnnotatedTypeFactory {
         private ParameterizedType getParameterizedType() {
             return (ParameterizedType)getType();
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof AnnotatedParameterizedType) {
+                AnnotatedParameterizedType that = (AnnotatedParameterizedType) o;
+                return equalsTypeAndAnnotations(that) &&
+                    Arrays.equals(getAnnotatedActualTypeArguments(), that.getAnnotatedActualTypeArguments());
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return baseHashCode() ^
+                Objects.hash((Object[])getAnnotatedActualTypeArguments());
+        }
     }
 
     private static final class AnnotatedWildcardTypeImpl extends AnnotatedTypeBaseImpl implements AnnotatedWildcardType {
@@ -378,5 +522,26 @@ public final class AnnotatedTypeFactory {
         private boolean hasUpperBounds() {
             return hasUpperBounds;
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof AnnotatedWildcardType) {
+                AnnotatedWildcardType that = (AnnotatedWildcardType) o;
+                return equalsTypeAndAnnotations(that) &&
+                    // Treats ordering as significant
+                    Arrays.equals(getAnnotatedLowerBounds(), that.getAnnotatedLowerBounds()) &&
+                    // Treats ordering as significant
+                    Arrays.equals(getAnnotatedUpperBounds(), that.getAnnotatedUpperBounds());
+            } else {
+                return false;
+            }
+        }
+
+        @Override
+        public int hashCode() {
+            return baseHashCode() ^
+                Objects.hash((Object[])getAnnotatedLowerBounds()) ^
+                Objects.hash((Object[])getAnnotatedUpperBounds());
+        }
     }
 }
diff --git a/test/jdk/java/lang/annotation/typeAnnotations/TestObjectMethods.java b/test/jdk/java/lang/annotation/typeAnnotations/TestObjectMethods.java
new file mode 100644
index 00000000000..fc818bb36e1
--- /dev/null
+++ b/test/jdk/java/lang/annotation/typeAnnotations/TestObjectMethods.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8058202
+ * @summary Test java.lang.Object methods on AnnotatedType objects.
+ */
+
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+/**
+ * Test toString, equals, and hashCode on various AnnotatedType objects.
+ */
+public class TestObjectMethods {
+    private static int errors = 0;
+
+    /*
+     * There are various subtypes of AnnotatedType implementations:
+     *
+     * AnnotatedType
+     * AnnotatedArrayType
+     * AnnotatedParameterizedType
+     * AnnotatedTypeVariable
+     * AnnotatedWildcardType
+     *
+     * The implementations of each these implementations are
+     * examined. Wildcards don't appear as top-level types and need to
+     * be extracted from bounds.
+     *
+     * AnnotatedTypes with and without annotations are examined as
+     * well.
+     */
+    public static void main(String... args) {
+        Class[] testClasses = {TypeHost.class, AnnotatedTypeHost.class};
+
+        for (Class clazz : testClasses) {
+            testEqualsReflexivity(clazz);
+            testEquals(clazz);
+        }
+
+        testToString(TypeHost.class, false);
+        testToString(AnnotatedTypeHost.class, true);
+
+        testAnnotationsMatterForEquals(TypeHost.class, AnnotatedTypeHost.class);
+
+        testGetAnnotations(TypeHost.class, false);
+        testGetAnnotations(AnnotatedTypeHost.class, true);
+
+        testWildcards();
+
+        if (errors > 0) {
+            throw new RuntimeException(errors + " errors");
+        }
+    }
+
+    /*
+     * For non-array types, verify toString version of the annotated
+     * type ends with the same string as the generic type.
+     */
+    static void testToString(Class clazz, boolean leadingAnnotations) {
+        System.err.println("Testing toString on methods of class " + clazz.getName());
+        Method[] methods = clazz.getDeclaredMethods();
+        for (Method m : methods) {
+            AnnotatedType annotType = m.getAnnotatedReturnType();
+            String annotTypeString = annotType.toString();
+
+            Type type = m.getGenericReturnType();
+            String typeString = type.toString();
+
+            boolean isArray = annotType instanceof AnnotatedArrayType;
+            boolean isVoid = "void".equals(typeString);
+
+            boolean valid;
+            if (!isArray) {
+                if (leadingAnnotations && !isVoid) {
+                    valid =
+                        annotTypeString.endsWith(typeString) &&
+                        !annotTypeString.startsWith(typeString);
+                } else {
+                    valid = annotTypeString.equals(typeString);
+                }
+            } else {
+                // Find final non-array component type and gets its name.
+                typeString = null;
+
+                AnnotatedType componentType = annotType;
+                while (componentType instanceof AnnotatedArrayType) {
+                    AnnotatedArrayType annotatedArrayType = (AnnotatedArrayType) componentType;
+                    componentType = annotatedArrayType.getAnnotatedGenericComponentType();
+                }
+
+                String componentName = componentType.getType().getTypeName();
+                valid = annotTypeString.contains(componentName);
+            }
+
+            if (!valid) {
+                errors++;
+                System.err.println(typeString + "\n" + annotTypeString +
+                                   "\n " + valid  +
+                                   "\n\n");
+            }
+        }
+    }
+
+    static void testGetAnnotations(Class clazz, boolean annotationsExpectedOnMethods) {
+        System.err.println("Testing getAnnotations on methods of class " + clazz.getName());
+        Method[] methods = clazz.getDeclaredMethods();
+        for (Method m : methods) {
+            Type type = m.getGenericReturnType();
+            AnnotatedType annotType = m.getAnnotatedReturnType();
+            Annotation[] annotations = annotType.getAnnotations();
+
+            boolean isVoid = "void".equals(type.toString());
+
+            if (annotationsExpectedOnMethods && !isVoid) {
+                if (annotations.length == 0 ) {
+                    errors++;
+                    System.err.println("Expected annotations missing on " + annotType);
+                }
+            } else {
+                if (annotations.length > 0 ) {
+                    errors++;
+                    System.err.println("Unexpected annotations present on " + annotType);
+                }
+            }
+        }
+    }
+
+    static void testEqualsReflexivity(Class clazz) {
+        System.err.println("Testing reflexivity of equals on methods of class " + clazz.getName());
+        Method[] methods = clazz.getDeclaredMethods();
+        for (Method m : methods) {
+            checkTypesForEquality(m.getAnnotatedReturnType(),
+                                  m.getAnnotatedReturnType(),
+                                  true);
+        }
+    }
+
+    private static void checkTypesForEquality(AnnotatedType annotType1,
+                                              AnnotatedType annotType2,
+                                              boolean expected) {
+        boolean comparison = annotType1.equals(annotType2);
+
+        if (comparison) {
+            int hash1 = annotType1.hashCode();
+            int hash2 = annotType2.hashCode();
+            if (hash1 != hash2) {
+                errors++;
+                System.err.format("Equal AnnotatedTypes with unequal hash codes: %n%s%n%s%n",
+                                  annotType1.toString(), annotType2.toString());
+            }
+        }
+
+        if (comparison != expected) {
+            errors++;
+            System.err.println(annotType1);
+            System.err.println(expected ? " is not equal to " : " is equal to ");
+            System.err.println(annotType2);
+            System.err.println();
+        }
+    }
+
+    /*
+     * For each of the type host classes, the return type of a method
+     * should only equal the return type of that method.
+     */
+    static void testEquals(Class clazz) {
+        Method[] methods = clazz.getDeclaredMethods();
+
+        for (int i = 0; i < methods.length; i++) {
+            for (int j = 0; j < methods.length; j++) {
+                if (i == j)
+                    continue;
+                else {
+                    checkTypesForEquality(methods[i].getAnnotatedReturnType(),
+                                          methods[j].getAnnotatedReturnType(),
+                                          false);
+                }
+            }
+        }
+    }
+
+    /**
+     * Roughly, compare the return types of corresponding methods on
+     * TypeHost and AnnotatedtypeHost and verify the AnnotatedType
+     * objects are *not* equal even if their underlying generic types
+     * are.
+     */
+    static void testAnnotationsMatterForEquals(Class clazz1, Class clazz2) {
+        System.err.println("Testing that presence/absence of annotations matters for equals comparison.");
+
+        String methodName = null;
+        for (Method method :  clazz1.getDeclaredMethods()) {
+            if ("void".equals(method.getReturnType().toString())) {
+                continue;
+            }
+
+            methodName = method.getName();
+            try {
+                checkTypesForEquality(method.getAnnotatedReturnType(),
+                                      clazz2.getDeclaredMethod(methodName).getAnnotatedReturnType(),
+                                      false);
+            } catch (Exception e) {
+                errors++;
+                System.err.println("Method " + methodName + " not found.");
+            }
+        }
+    }
+
+
+    static void testWildcards() {
+        System.err.println("Testing wildcards");
+        // public @AnnotType(10) Set fooNumberSet() {return null;}
+        // public @AnnotType(11) Set<@AnnotType(13) ? extends Number> fooNumberSet2() {return null;}
+        AnnotatedWildcardType awt1 = extractWildcard("fooNumberSet");
+        AnnotatedWildcardType awt2 = extractWildcard("fooNumberSet2");
+
+        if (!awt1.equals(extractWildcard("fooNumberSet")) ||
+            !awt2.equals(extractWildcard("fooNumberSet2"))) {
+            errors++;
+            System.err.println("Bad equality comparison on wildcards.");
+        }
+
+        checkTypesForEquality(awt1, awt2, false);
+
+        if (awt2.getAnnotations().length == 0) {
+            errors++;
+            System.err.println("Expected annotations not found.");
+        }
+    }
+
+    private static AnnotatedWildcardType extractWildcard(String methodName) {
+        try {
+            return (AnnotatedWildcardType)
+                (((AnnotatedParameterizedType)(AnnotatedTypeHost.class.getMethod(methodName).
+                                               getAnnotatedReturnType())).
+                 getAnnotatedActualTypeArguments()[0] );
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    // The TypeHost and AnnotatedTypeHost classes declare methods with
+    // the same name and signatures but with the AnnotatedTypeHost
+    // methods having annotations on their return type, where
+    // possible.
+
+    static class TypeHost {
+        public void fooVoid() {return;}
+
+        public int foo() {return 0;}
+        public String fooString() {return null;}
+
+        public int[] fooIntArray() {return null;}
+        public String[] fooStringArray() {return null;}
+        public String [][] fooStringArrayArray() {return null;}
+
+        public Set fooSetString() {return null;}
+        public E fooE() {return null;}
+        public F fooF() {return null;}
+        public  G fooG() {return null;}
+
+        public  Set fooNumberSet() {return null;}
+        public  Set fooNumberSet2() {return null;}
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.TYPE_USE)
+    static @interface AnnotType {
+        int value() default 0;
+    }
+
+    static class AnnotatedTypeHost {
+        public /*@AnnotType(0)*/ void fooVoid() {return;} // Illegal to annotate void
+
+        public @AnnotType(1) int foo() {return 0;}
+        public @AnnotType(2) String fooString() {return null;}
+
+        public  int @AnnotType(3) [] fooIntArray() {return null;}
+        public  String @AnnotType(4) [] fooStringArray() {return null;}
+        public  @AnnotType(5) String  @AnnotType(0) [] @AnnotType(1) [] fooStringArrayArray() {return null;}
+
+        public @AnnotType(6) Set fooSetString() {return null;}
+        public @AnnotType(7) E fooE() {return null;}
+        public @AnnotType(8) F fooF() {return null;}
+        public @AnnotType(9)  G fooG() {return null;}
+
+        public @AnnotType(10) Set fooNumberSet() {return null;}
+        public @AnnotType(11) Set<@AnnotType(13) ? extends Number> fooNumberSet2() {return null;}
+    }
+}

From 3cc36e427d23f583b62f4280f90eac0b9f024af9 Mon Sep 17 00:00:00 2001
From: Ivan Gerasimov 
Date: Wed, 10 Oct 2018 10:56:24 -0700
Subject: [PATCH 070/124] 8211396: Broken link in javadoc for private
 java.util.regex.Pattern#normalize()

Reviewed-by: jjg, sherman
---
 src/java.base/share/classes/java/util/regex/Pattern.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index cd7cd39f55d..50e9be8415c 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -1433,10 +1433,10 @@ public final class Pattern
 
     /**
      * The pattern is converted to normalized form ({@link
-     * java.text.Normalizer.Form.NFC NFC}, canonical decomposition,
+     * java.text.Normalizer.Form#NFC NFC}, canonical decomposition,
      * followed by canonical composition for the character class
-     * part, and {@link java.text.Normalizer.Form.NFD NFD},
-     * canonical decomposition) for the rest), and then a pure
+     * part, and {@link java.text.Normalizer.Form#NFD NFD},
+     * canonical decomposition for the rest), and then a pure
      * group is constructed to match canonical equivalences of the
      * characters.
      */

From efa175f20e11a722f8f8a3f62ef395c863da44ac Mon Sep 17 00:00:00 2001
From: Jean Christophe Beyler 
Date: Wed, 10 Oct 2018 11:20:21 -0700
Subject: [PATCH 071/124] 8211801: Remove the NSK_CPP_STUB macros from
 vmTestbase for jvmti/scenarios/[A-E]

Remove the NSK_CPP_STUB macros

Reviewed-by: amenkov, sspitsyn
---
 .../allocation/AP06/ap06t001/ap06t001.cpp     |  30 +-
 .../allocation/AP07/ap07t001/ap07t001.cpp     |  31 +-
 .../allocation/AP07/ap07t002/ap07t002.cpp     |  18 +-
 .../allocation/AP09/ap09t001/ap09t001.cpp     |  22 +-
 .../allocation/AP10/ap10t001/ap10t001.cpp     |  49 ++--
 .../allocation/AP11/ap11t001/ap11t001.cpp     |  45 ++-
 .../allocation/AP12/ap12t001/ap12t001.cpp     |  22 +-
 .../bcinstr/BI01/bi01t001/bi01t001.cpp        |  39 ++-
 .../bcinstr/BI01/bi01t002/bi01t002.cpp        |  40 ++-
 .../bcinstr/BI02/bi02t001/bi02t001.cpp        |  37 ++-
 .../bcinstr/BI02/bi02t002/bi02t002.cpp        |  35 +--
 .../bcinstr/BI03/bi03t001/bi03t001.cpp        |  37 ++-
 .../bcinstr/BI03/bi03t002/bi03t002.cpp        |  35 +--
 .../bcinstr/BI04/bi04t002/bi04t002.cpp        |  16 +-
 .../capability/CM01/cm01t001/cm01t001.cpp     | 139 ++++-----
 .../capability/CM01/cm01t002/cm01t002.cpp     | 142 +++++----
 .../capability/CM01/cm01t003/cm01t003.cpp     | 141 ++++-----
 .../capability/CM01/cm01t004/cm01t004.cpp     | 140 ++++-----
 .../capability/CM01/cm01t005/cm01t005.cpp     | 140 ++++-----
 .../capability/CM01/cm01t006/cm01t006.cpp     | 140 ++++-----
 .../capability/CM01/cm01t007/cm01t007.cpp     | 148 +++++-----
 .../capability/CM01/cm01t008/cm01t008.cpp     | 156 +++++-----
 .../capability/CM01/cm01t009/cm01t009.cpp     | 138 ++++-----
 .../capability/CM01/cm01t010/cm01t010.cpp     | 140 ++++-----
 .../capability/CM01/cm01t011/cm01t011.cpp     | 171 +++++------
 .../capability/CM01/cm01t012/cm01t012.cpp     | 139 ++++-----
 .../capability/CM01/cm01t013/cm01t013.cpp     | 140 ++++-----
 .../capability/CM01/cm01t014/cm01t014.cpp     | 138 ++++-----
 .../capability/CM01/cm01t015/cm01t015.cpp     | 139 ++++-----
 .../capability/CM01/cm01t016/cm01t016.cpp     | 137 ++++-----
 .../capability/CM01/cm01t017/cm01t017.cpp     | 137 ++++-----
 .../capability/CM01/cm01t018/cm01t018.cpp     | 141 +++++----
 .../capability/CM01/cm01t019/cm01t019.cpp     | 139 ++++-----
 .../capability/CM01/cm01t020/cm01t020.cpp     | 141 ++++-----
 .../capability/CM01/cm01t021/cm01t021.cpp     | 141 ++++-----
 .../capability/CM02/cm02t001/cm02t001.cpp     | 160 +++++------
 .../capability/CM03/cm03t001/cm03t001.cpp     | 272 ++++++++----------
 .../contention/TC01/tc01t001/tc01t001.cpp     |  59 ++--
 .../contention/TC02/tc02t001/tc02t001.cpp     |  62 ++--
 .../contention/TC03/tc03t001/tc03t001.cpp     |  58 ++--
 .../contention/TC03/tc03t002/tc03t002.cpp     |  58 ++--
 .../contention/TC04/tc04t001/tc04t001.cpp     |  63 ++--
 .../contention/TC05/tc05t001/tc05t001.cpp     |  64 ++---
 .../events/EM01/em01t001/em01t001.cpp         |  52 ++--
 .../events/EM01/em01t002/em01t002.cpp         |  75 ++---
 .../events/EM02/em02t001/em02t001.cpp         |  80 ++----
 .../events/EM02/em02t002/em02t002.cpp         |  24 +-
 .../events/EM02/em02t003/em02t003.cpp         |  50 ++--
 .../events/EM02/em02t004/em02t004.cpp         |  54 ++--
 .../events/EM02/em02t005/em02t005.cpp         |  48 ++--
 50 files changed, 1986 insertions(+), 2636 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp
index c7dfcbd0134..4511679bb57 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp
@@ -124,7 +124,7 @@ objectReferenceCallback( jvmtiObjectReferenceKind reference_kind,
 JNIEXPORT void JNICALL
 Java_nsk_jvmti_scenarios_allocation_AP06_ap06t001Thread_setTag( JNIEnv* jni, jobject obj) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, obj, threadTag))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, threadTag))) {
         nsk_jvmti_setFailStatus();
     } else {
         NSK_DISPLAY0("setTag: the tag was set for checked thread.");
@@ -153,34 +153,26 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         }
 
         if (!NSK_JNI_VERIFY(jni, (fid =
-                NSK_CPP_STUB4(GetStaticFieldID, jni,
-                                                debugeeClass,
-                                                "thread",
-                                                THREAD_CLS_SIGNATURE)) != NULL )) {
+                jni->GetStaticFieldID(debugeeClass, "thread", THREAD_CLS_SIGNATURE)) != NULL)) {
             nsk_jvmti_setFailStatus();
             break;
         }
 
         if (!NSK_JNI_VERIFY(jni, (localRefThread =
-                NSK_CPP_STUB3(GetStaticObjectField, jni,
-                                                    debugeeClass,
-                                                    fid )) != NULL )) {
+                jni->GetStaticObjectField(debugeeClass, fid)) != NULL)) {
             NSK_COMPLAIN0("GetStaticObjectField returned NULL for 'thread' field value\n\n");
             nsk_jvmti_setFailStatus();
             break;
         }
 
-        if (!NSK_JNI_VERIFY(jni, (globalRefThread =
-                 NSK_CPP_STUB2(NewGlobalRef, jni, localRefThread)) != NULL))
+        if (!NSK_JNI_VERIFY(jni, (globalRefThread = jni->NewGlobalRef(localRefThread)) != NULL))
             return;
 
         NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                                                           heapRootCallback,
-                                                           stackReferenceCallback,
-                                                           objectReferenceCallback,
-                                                           NULL /*user_data*/))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
+                                                                 stackReferenceCallback,
+                                                                 objectReferenceCallback,
+                                                                 NULL /*user_data*/))) {
             nsk_jvmti_setFailStatus();
             break;
         }
@@ -234,12 +226,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(jvmtiCapabilities));
     caps.can_tag_objects = 1;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     if (!caps.can_tag_objects)
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp
index d312e8bc48c..f7a99a4f5d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp
@@ -111,15 +111,14 @@ Java_nsk_jvmti_scenarios_allocation_AP07_ap07t001_setTag( JNIEnv* jni,
                                                           jobject target,
                                                           jlong   tag ) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
         nsk_jvmti_setFailStatus();
     }
 }
 
 JNIEXPORT void JNICALL
 Java_nsk_jvmti_scenarios_allocation_AP07_ap07t001_setRoot( JNIEnv* jni, jobject obj) {
-    if (!NSK_JNI_VERIFY(jni, (root =
-            NSK_CPP_STUB2(NewGlobalRef, jni, obj)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (root = jni->NewGlobalRef(obj)) != NULL))
         nsk_jvmti_setFailStatus();
 }
 
@@ -135,30 +134,24 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     do {
 
         NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                                                           heapRootCallback,
-                                                           stackReferenceCallback,
-                                                           objectReferenceCallback,
-                                                           NULL /*user_data*/))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
+                                                                 stackReferenceCallback,
+                                                                 objectReferenceCallback,
+                                                                 NULL /*user_data*/))) {
             nsk_jvmti_setFailStatus();
             break;
         }
 
         NSK_DISPLAY0("Calling IterateOverObjectsReachableFromObject\n");
         {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(IterateOverObjectsReachableFromObject,
-                        jvmti,
-                        root,
-                        objectReferenceCallback,
-                        NULL /*user_data*/))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(
+                    root, objectReferenceCallback, NULL /*user_data*/))) {
                 nsk_jvmti_setFailStatus();
                 break;
             }
         }
 
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, root));
+        NSK_TRACE(jni->DeleteGlobalRef(root));
 
     } while (0);
 
@@ -191,12 +184,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(jvmtiCapabilities));
     caps.can_tag_objects = 1;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     if (!caps.can_tag_objects)
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp
index 7918278e5ec..e503a3e5def 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp
@@ -111,7 +111,7 @@ Java_nsk_jvmti_scenarios_allocation_AP07_ap07t002_setTag( JNIEnv* jni,
                                                           jobject target,
                                                           jlong   tag ) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
         nsk_jvmti_setFailStatus();
     }
 }
@@ -128,12 +128,10 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     do {
 
         NSK_DISPLAY0("Calling IterateOverReachableObjects\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                                                           heapRootCallback,
-                                                           stackReferenceCallback,
-                                                           objectReferenceCallback,
-                                                           NULL /*user_data*/))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(heapRootCallback,
+                                                                 stackReferenceCallback,
+                                                                 objectReferenceCallback,
+                                                                 NULL /*user_data*/))) {
             nsk_jvmti_setFailStatus();
             break;
         }
@@ -169,12 +167,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(jvmtiCapabilities));
     caps.can_tag_objects = 1;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     if (!caps.can_tag_objects)
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp
index 997fef490ea..67ef31f446b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp
@@ -132,15 +132,14 @@ Java_nsk_jvmti_scenarios_allocation_AP09_ap09t001_setTag( JNIEnv* jni,
                                                           jobject target,
                                                           jlong   tag ) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag, jvmti, target, tag))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(target, tag))) {
         nsk_jvmti_setFailStatus();
     }
 }
 
 JNIEXPORT void JNICALL
 Java_nsk_jvmti_scenarios_allocation_AP09_ap09t001_setReferrer( JNIEnv* jni, jclass klass, jobject ref) {
-    if (!NSK_JNI_VERIFY(jni, (referrer =
-            NSK_CPP_STUB2(NewGlobalRef, jni, ref)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (referrer = jni->NewGlobalRef(ref)) != NULL))
         nsk_jvmti_setFailStatus();
 }
 
@@ -155,12 +154,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
     do {
         NSK_DISPLAY0("\nCalling IterateOverObjectsReachableFromObject\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(IterateOverObjectsReachableFromObject,
-                    jvmti,
-                    referrer,
-                    objectReferenceCallback,
-                    NULL /*user_data*/))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(referrer,
+                                                                           objectReferenceCallback,
+                                                                           NULL /*user_data*/))) {
             nsk_jvmti_setFailStatus();
         }
         if (!classFound) {
@@ -192,7 +188,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
             nsk_jvmti_setFailStatus();
         }
 
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, referrer));
+        NSK_TRACE(jni->DeleteGlobalRef(referrer));
     } while (0);
 
     NSK_DISPLAY0("Let debugee to finish\n");
@@ -224,12 +220,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(jvmtiCapabilities));
     caps.can_tag_objects = 1;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     if (!caps.can_tag_objects) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp
index 201077cd0dc..d4977a45a26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp
@@ -61,8 +61,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) {
 
     NSK_DISPLAY2("%s: setting an environment local storage 0x%p ...\n",
         msg, (void*) &stor);
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SetEnvironmentLocalStorage,
-            jvmti_env, (const void*) &stor))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->SetEnvironmentLocalStorage((const void*) &stor))) {
         nsk_jvmti_setFailStatus();
         NSK_COMPLAIN1("%s: unable to set an environment local storage\n\n",
             msg);
@@ -71,8 +70,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) {
 
     NSK_DISPLAY1("%s: getting an environment local storage ...\n",
         msg);
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetEnvironmentLocalStorage,
-            jvmti_env, (void**) &obtainedData))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetEnvironmentLocalStorage((void**) &obtainedData))) {
         nsk_jvmti_setFailStatus();
         NSK_COMPLAIN1("%s: unable to get an environment local storage\n\n",
             msg);
@@ -90,8 +88,7 @@ static void envStorageFunc(jvmtiEnv *jvmti_env, const char *msg) {
 }
 
 static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti_env, &timer_info1 ))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetCurrentThreadCpuTimerInfo(&timer_info1))) {
         nsk_jvmti_setFailStatus();
         NSK_COMPLAIN1("%s: GetCurrentThreadCpuTimerInfo returned unexpected error code\n\n",
             msg);
@@ -114,8 +111,7 @@ static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
     }
     /* ---------------------------------------------------------------------- */
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti_env, &nanos ))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetCurrentThreadCpuTime(&nanos))) {
         nsk_jvmti_setFailStatus();
         NSK_COMPLAIN1("%s: GetCurrentThreadCpuTime returned unexpected error code\n\n",
             msg);
@@ -123,8 +119,7 @@ static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
     /* ---------------------------------------------------------------------- */
 
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetTimerInfo, jvmti_env, &timer_info2 ))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetTimerInfo(&timer_info2))) {
         nsk_jvmti_setFailStatus();
         NSK_COMPLAIN1("%s: GetTimerInfo returned unexpected error code\n\n",
             msg);
@@ -148,8 +143,7 @@ static void timerFunc(jvmtiEnv *jvmti_env, const char *msg) {
     /* ---------------------------------------------------------------------- */
 
     nanos = 0;
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetTime, jvmti_env, &nanos ))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetTime(&nanos))) {
         nsk_jvmti_setFailStatus();
         NSK_COMPLAIN1("%s: GetTime returned unexpected error code\n\n",
             msg);
@@ -223,10 +217,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
     NSK_DISPLAY0("Call IterateOverHeap to tag random objects for ObjectFree evnts\n\n");
     {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(IterateOverHeap, jvmti,
-                    JVMTI_HEAP_OBJECT_UNTAGGED, heapObjectCallback,
-                    &user_data))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_UNTAGGED,
+                                                     heapObjectCallback,
+                                                     &user_data))) {
             nsk_jvmti_setFailStatus();
         }
     }
@@ -276,12 +269,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     caps.can_get_thread_cpu_time = 1;
     caps.can_generate_object_free_events = 1;
     caps.can_generate_garbage_collection_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     if (!caps.can_generate_garbage_collection_events)
@@ -299,19 +290,21 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     callbacks.GarbageCollectionFinish = &GarbageCollectionFinish;
     callbacks.ObjectFree = &ObjectFree;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_GARBAGE_COLLECTION_START,
+                                                          NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_GARBAGE_COLLECTION_FINISH,
+                                                          NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_OBJECT_FREE,
+                                                          NULL)))
         return JNI_ERR;
     NSK_DISPLAY0("enabling the events done\n\n");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp
index 9163045e4fc..9b5046158b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp
@@ -43,8 +43,7 @@ static int lookup(jvmtiEnv* jvmti,
     jint i;
 
     for (i = 0; i < classCount && !found; i++) {
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti,
-                classes[i], &signature, &generic)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(classes[i], &signature, &generic)))
             break;
 
         if (signature != NULL && strcmp(signature, exp_sig) == 0) {
@@ -52,10 +51,10 @@ static int lookup(jvmtiEnv* jvmti,
         }
 
         if (signature != NULL)
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+            jvmti->Deallocate((unsigned char*)signature);
 
         if (generic != NULL)
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)generic);
+            jvmti->Deallocate((unsigned char*)generic);
     }
 
     return found;
@@ -74,7 +73,7 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
     */
     {
         jvmtiPhase phase;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti, &phase ))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetPhase(&phase))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -85,14 +84,12 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
     }
 
     do {
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti,
-                object_klass, &signature, &generic))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(object_klass, &signature, &generic))) {
             nsk_jvmti_setFailStatus();
             break;
         }
 
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti,
-                thread, &threadInfo))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &threadInfo))) {
             nsk_jvmti_setFailStatus();
             break;
         }
@@ -108,14 +105,13 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
         jint i;
         jboolean found = JNI_FALSE;
 
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetAllThreads, jvmti,
-                 &threadCount, &threads))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threadCount, &threads))) {
             nsk_jvmti_setFailStatus();
             break;
         }
 
         for (i = 0; i < threadCount && !found; i++) {
-            found = NSK_CPP_STUB3(IsSameObject, jni, threads[i], thread);
+            found = jni->IsSameObject(threads[i], thread);
             if (found == JNI_TRUE) {
                 break;
             }
@@ -134,8 +130,7 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
         jint classCount;
         jclass *classes;
 
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetLoadedClasses, jvmti,
-                 &classCount, &classes))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetLoadedClasses(&classCount, &classes))) {
             nsk_jvmti_setFailStatus();
             break;
         }
@@ -147,7 +142,7 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
         }
 
         if (classes != NULL)
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)classes);
+            jvmti->Deallocate((unsigned char*)classes);
     } while(0);
 
 
@@ -155,8 +150,8 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
     */
     {
         jclass klass;
-        klass = NSK_CPP_STUB2(GetObjectClass, jni, object);
-        if (!(NSK_CPP_STUB3(IsSameObject, jni, object_klass, klass))) {
+        klass = jni->GetObjectClass(object);
+        if (!(jni->IsSameObject(object_klass, klass))) {
             nsk_jvmti_setFailStatus();
             NSK_COMPLAIN1("VMObjectAlloc: unexpected object_klass : \"%s\"\n\n", signature);
         }
@@ -167,8 +162,7 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
 
     do {
         jlong objSize;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectSize, jvmti,
-                 object, &objSize))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetObjectSize(object, &objSize))) {
             nsk_jvmti_setFailStatus();
             break;
         }
@@ -181,10 +175,10 @@ VMObjectAlloc(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread, jobject object,
     } while(0);
 
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
     if (generic != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)generic);
+        jvmti->Deallocate((unsigned char*)generic);
 }
 
 /* ========================================================================== */
@@ -234,21 +228,18 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_vm_object_alloc_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.VMObjectAlloc= &VMObjectAlloc;
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     /* enable VMObjectAlloc event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp
index ad488069b73..3076676e791 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp
@@ -79,8 +79,7 @@ VMDeath(jvmtiEnv *jvmti_env, JNIEnv *env) {
 JNIEXPORT void JNICALL
 Java_nsk_jvmti_scenarios_allocation_AP12_ap12t001_setTag( JNIEnv* jni, jobject obj, jlong tag) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetTag,
-         jvmti, obj, tag))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(obj, tag))) {
          nsk_jvmti_setFailStatus();
     }
 }
@@ -129,12 +128,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(jvmtiCapabilities));
     caps.can_generate_object_free_events = 1;
     caps.can_tag_objects = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities,
-            jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     if (!caps.can_generate_object_free_events)
@@ -149,16 +146,17 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     callbacks.ObjectFree = &ObjectFree;
     callbacks.VMDeath = &VMDeath;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     NSK_DISPLAY0("setting event callbacks done\nenabling JVMTI events ...\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_OBJECT_FREE,
+                                                          NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_VM_DEATH,
+                                                          NULL)))
         return JNI_ERR;
     NSK_DISPLAY0("enabling the events done\n\n");
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
index be1955de105..0da3cf8f1d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
@@ -52,23 +52,20 @@ Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t001_setNewByteCode(JNIEnv *jni_env,
     jbyte* elements;
     jboolean isCopy;
 
-    if (!NSK_JNI_VERIFY(jni_env, (newClassSize =
-            NSK_CPP_STUB2(GetArrayLength, jni_env, byteCode)) > 0)) {
+    if (!NSK_JNI_VERIFY(jni_env, (newClassSize = jni_env->GetArrayLength(byteCode)) > 0)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     NSK_DISPLAY1("\t... got array size: %d\n", newClassSize);
 
     if (!NSK_JNI_VERIFY(jni_env, (elements =
-            NSK_CPP_STUB3(GetByteArrayElements, jni_env, byteCode,
-                                                        &isCopy)) != NULL)) {
+            jni_env->GetByteArrayElements(byteCode, &isCopy)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     NSK_DISPLAY1("\t... got elements list: 0x%p\n", (void*)elements);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, jvmti,
-                                newClassSize, &newClassBytes))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(newClassSize, &newClassBytes))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -82,7 +79,7 @@ Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t001_setNewByteCode(JNIEnv *jni_env,
     NSK_DISPLAY1("\t... copied bytecode: %d bytes\n", (int)newClassSize);
 
     NSK_DISPLAY1("\t... release elements list: 0x%p\n", (void*)elements);
-    NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni_env, byteCode, elements, JNI_ABORT));
+    NSK_TRACE(jni_env->ReleaseByteArrayElements(byteCode, elements, JNI_ABORT));
     NSK_DISPLAY0("\t... released\n");
     return NSK_TRUE;
 }
@@ -98,7 +95,7 @@ Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t001_setClass(JNIEnv *jni_env,
                         jobject o, jclass cls) {
 
     if (!NSK_JNI_VERIFY(jni_env, (oldClassDef.klass = (jclass)
-             NSK_CPP_STUB2(NewGlobalRef, jni_env, cls)) != NULL)) {
+             jni_env->NewGlobalRef(cls)) != NULL)) {
         nsk_jvmti_setFailStatus();
     }
 }
@@ -129,9 +126,7 @@ cbClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
         unsigned char *arr;
 
         oldClassDef.class_byte_count = class_data_len;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(Allocate, jvmti_env, class_data_len,
-                                &arr))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(class_data_len, &arr))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -181,9 +176,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
         return;
 
     NSK_DISPLAY0("Notification disabled for CLASS_FILE_LOAD_HOOK event\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                                JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -205,8 +200,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
         nsk_printHexBytes("   ", 16, oldClassDef.class_byte_count,
                                 oldClassDef.class_bytes);
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &oldClassDef))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &oldClassDef))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -219,7 +213,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
     if (!nsk_jvmti_waitForSync(timeout))
         return;
 
-    NSK_CPP_STUB2(DeleteGlobalRef, agentJNI, oldClassDef.klass);
+    agentJNI->DeleteGlobalRef(oldClassDef.klass);
 
     NSK_DISPLAY0("Let debuggee to finish\n");
     if (!nsk_jvmti_resumeSync())
@@ -256,7 +250,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_redefine_classes = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
@@ -267,16 +261,15 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
         memset(&callbacks, 0, size);
         callbacks.ClassFileLoadHook = cbClassFileLoadHook;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) {
             return JNI_ERR;
         }
     }
 
     NSK_DISPLAY0("Set notification enabled for CLASS_FILE_LOAD_HOOK event\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                                JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp
index c42d7a224ff..4d6869b9777 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp
@@ -54,23 +54,20 @@ Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t002_setNewByteCode(JNIEnv *jni_env,
     jbyte* elements;
     jboolean isCopy;
 
-    if (!NSK_JNI_VERIFY(jni_env, (newClassSize[ind] =
-            NSK_CPP_STUB2(GetArrayLength, jni_env, byteCode)) > 0)) {
+    if (!NSK_JNI_VERIFY(jni_env, (newClassSize[ind] = jni_env->GetArrayLength(byteCode)) > 0)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     NSK_DISPLAY1("\t... got array size: %d\n", newClassSize[ind]);
 
     if (!NSK_JNI_VERIFY(jni_env, (elements =
-            NSK_CPP_STUB3(GetByteArrayElements, jni_env, byteCode,
-                                                        &isCopy)) != NULL)) {
+            jni_env->GetByteArrayElements(byteCode, &isCopy)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
     NSK_DISPLAY1("\t... got elements list: 0x%p\n", (void*)elements);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, jvmti,
-                                newClassSize[ind], &newClassBytes[ind]))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(newClassSize[ind], &newClassBytes[ind]))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -84,7 +81,7 @@ Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t002_setNewByteCode(JNIEnv *jni_env,
     NSK_DISPLAY1("\t... copied bytecode: %d bytes\n", (int)newClassSize[ind]);
 
     NSK_DISPLAY1("\t... release elements list: 0x%p\n", (void*)elements);
-    NSK_TRACE(NSK_CPP_STUB4(ReleaseByteArrayElements, jni_env, byteCode, elements, JNI_ABORT));
+    NSK_TRACE(jni_env->ReleaseByteArrayElements(byteCode, elements, JNI_ABORT));
     NSK_DISPLAY0("\t... released\n");
     return NSK_TRUE;
 }
@@ -100,7 +97,7 @@ Java_nsk_jvmti_scenarios_bcinstr_BI01_bi01t002_setClass(JNIEnv *jni_env,
                         jobject o, jint ind, jclass cls) {
 
     if (!NSK_JNI_VERIFY(jni_env, (oldClassDef[ind].klass = (jclass)
-             NSK_CPP_STUB2(NewGlobalRef, jni_env, cls)) != NULL)) {
+             jni_env->NewGlobalRef(cls)) != NULL)) {
         nsk_jvmti_setFailStatus();
     }
 }
@@ -131,9 +128,7 @@ cbClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
         unsigned char *arr;
 
         oldClassDef[clsLoadedIdx].class_byte_count = class_data_len;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(Allocate, jvmti_env, class_data_len,
-                                &arr))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(class_data_len, &arr))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -189,9 +184,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
         return;
 
     NSK_DISPLAY0("Notification disabled for CLASS_FILE_LOAD_HOOK event\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                                JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -216,9 +211,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
                                     oldClassDef[i].class_bytes);
         }
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(RedefineClasses, jvmti, TOTAL_INSTRUMENTED_CLASSES,
-                            oldClassDef))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(TOTAL_INSTRUMENTED_CLASSES, oldClassDef))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -232,7 +225,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
         return;
 
     for (i = 0; i < TOTAL_INSTRUMENTED_CLASSES; i++) {
-        NSK_CPP_STUB2(DeleteGlobalRef, agentJNI, oldClassDef[i].klass);
+        agentJNI->DeleteGlobalRef(oldClassDef[i].klass);
     }
 
     NSK_DISPLAY0("Let debuggee to finish\n");
@@ -270,7 +263,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_redefine_classes = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
@@ -281,16 +274,15 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
         memset(&callbacks, 0, size);
         callbacks.ClassFileLoadHook = cbClassFileLoadHook;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, size))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, size))) {
             return JNI_ERR;
         }
     }
 
     NSK_DISPLAY0("Set notification enabled for CLASS_FILE_LOAD_HOOK event\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                                JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
index 0728b72ede5..569ceadc4d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
@@ -63,13 +63,13 @@ ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
             /* sent by class load */
 
             if (!NSK_JNI_VERIFY(jni_env, (*new_class_data_len =
-                    NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes)) > 0)) {
+                    jni_env->GetArrayLength(classBytes)) > 0)) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
 
             if (!NSK_JNI_VERIFY(jni_env, (*new_class_data = (unsigned char*)
-                    NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, NULL))
+                    jni_env->GetByteArrayElements(classBytes, NULL))
                         != NULL)) {
                 nsk_jvmti_setFailStatus();
                 return;
@@ -86,30 +86,27 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     jfieldID field = NULL;
 
     NSK_DISPLAY1("Find class: %s\n", DEBUGEE_CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                "newClassBytes", "[B")) != NULL))
+            jni->GetStaticFieldID(debugeeClass, "newClassBytes", "[B")) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, field))
+            jni->GetStaticObjectField(debugeeClass, field))
                 != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB2(NewGlobalRef, jni, classBytes)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)jni->NewGlobalRef(classBytes)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL)))
         return JNI_ERR;
 
     return NSK_TRUE;
@@ -140,12 +137,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL)))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, classBytes));
+    NSK_TRACE(jni->DeleteGlobalRef(debugeeClass));
+    NSK_TRACE(jni->DeleteGlobalRef(classBytes));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -183,7 +181,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_all_class_hook_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
@@ -191,8 +189,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.ClassFileLoadHook = &ClassFileLoadHook;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp
index d6f6be129fd..3ec2bff1ab2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp
@@ -52,35 +52,29 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     jfieldID field = NULL;
 
     NSK_DISPLAY1("Find class: %s\n", DEBUGEE_CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                "newClassBytes", "[B")) != NULL))
+            jni->GetStaticFieldID(debugeeClass, "newClassBytes", "[B")) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, field))
+            jni->GetStaticObjectField(debugeeClass, field))
                 != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB2(NewGlobalRef, jni, classBytes)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)jni->NewGlobalRef(classBytes)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (testedClass =
-            NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (testedClass = jni->FindClass(CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)jni->NewGlobalRef(testedClass)) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -93,17 +87,16 @@ static int redefine(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     NSK_DISPLAY0("Redefining ...\n");
 
-    if (!NSK_JNI_VERIFY(jni, (class_def.class_byte_count =
-            NSK_CPP_STUB2(GetArrayLength, jni, classBytes)) > 0))
+    if (!NSK_JNI_VERIFY(jni, (class_def.class_byte_count = jni->GetArrayLength(classBytes)) > 0))
         return NSK_TRUE;
 
     if (!NSK_JNI_VERIFY(jni, (class_def.class_bytes = (unsigned char*)
-            NSK_CPP_STUB3(GetByteArrayElements, jni, classBytes, NULL))
+            jni->GetByteArrayElements(classBytes, NULL))
                 != NULL))
         return NSK_TRUE;
 
     class_def.klass = testedClass;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -132,9 +125,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!nsk_jvmti_waitForSync(timeout))
         return;
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, classBytes));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass));
+    NSK_TRACE(jni->DeleteGlobalRef(debugeeClass));
+    NSK_TRACE(jni->DeleteGlobalRef(classBytes));
+    NSK_TRACE(jni->DeleteGlobalRef(testedClass));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -171,7 +164,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_redefine_classes = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
index 7e54ac51eeb..2f0ce597dd8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
@@ -63,13 +63,13 @@ ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
             /* sent by class load */
 
             if (!NSK_JNI_VERIFY(jni_env, (*new_class_data_len =
-                    NSK_CPP_STUB2(GetArrayLength, jni_env, classBytes)) > 0)) {
+                    jni_env->GetArrayLength(classBytes)) > 0)) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
 
             if (!NSK_JNI_VERIFY(jni_env, (*new_class_data = (unsigned char*)
-                    NSK_CPP_STUB3(GetByteArrayElements, jni_env, classBytes, NULL))
+                    jni_env->GetByteArrayElements(classBytes, NULL))
                         != NULL)) {
                 nsk_jvmti_setFailStatus();
                 return;
@@ -86,30 +86,27 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     jfieldID field = NULL;
 
     NSK_DISPLAY1("Find class: %s\n", DEBUGEE_CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                "newClassBytes", "[B")) != NULL))
+            jni->GetStaticFieldID(debugeeClass, "newClassBytes", "[B")) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, field))
+            jni->GetStaticObjectField(debugeeClass, field))
                 != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB2(NewGlobalRef, jni, classBytes)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)jni->NewGlobalRef(classBytes)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL)))
         return JNI_ERR;
 
     return NSK_TRUE;
@@ -140,12 +137,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE,
+                                                          JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
+                                                          NULL)))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, classBytes));
+    NSK_TRACE(jni->DeleteGlobalRef(debugeeClass));
+    NSK_TRACE(jni->DeleteGlobalRef(classBytes));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -183,7 +181,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_all_class_hook_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
@@ -191,8 +189,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.ClassFileLoadHook = &ClassFileLoadHook;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp
index 4cc97d3e57b..da2c9233dbe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp
@@ -52,35 +52,29 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     jfieldID field = NULL;
 
     NSK_DISPLAY1("Find class: %s\n", DEBUGEE_CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, debugeeClass)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = (jclass)jni->NewGlobalRef(debugeeClass)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                "newClassBytes", "[B")) != NULL))
+            jni->GetStaticFieldID(debugeeClass, "newClassBytes", "[B")) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, field))
+            jni->GetStaticObjectField(debugeeClass, field))
                 != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)
-            NSK_CPP_STUB2(NewGlobalRef, jni, classBytes)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (classBytes = (jbyteArray)jni->NewGlobalRef(classBytes)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY1("Find class: %s\n", CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (testedClass =
-            NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (testedClass = jni->FindClass(CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, testedClass)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (testedClass = (jclass)jni->NewGlobalRef(testedClass)) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -93,17 +87,16 @@ static int redefine(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     NSK_DISPLAY0("Redefining ...\n");
 
-    if (!NSK_JNI_VERIFY(jni, (class_def.class_byte_count =
-            NSK_CPP_STUB2(GetArrayLength, jni, classBytes)) > 0))
+    if (!NSK_JNI_VERIFY(jni, (class_def.class_byte_count = jni->GetArrayLength(classBytes)) > 0))
         return NSK_TRUE;
 
     if (!NSK_JNI_VERIFY(jni, (class_def.class_bytes = (unsigned char*)
-            NSK_CPP_STUB3(GetByteArrayElements, jni, classBytes, NULL))
+            jni->GetByteArrayElements(classBytes, NULL))
                 != NULL))
         return NSK_TRUE;
 
     class_def.klass = testedClass;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -132,9 +125,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!nsk_jvmti_waitForSync(timeout))
         return;
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, debugeeClass));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, classBytes));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedClass));
+    NSK_TRACE(jni->DeleteGlobalRef(debugeeClass));
+    NSK_TRACE(jni->DeleteGlobalRef(classBytes));
+    NSK_TRACE(jni->DeleteGlobalRef(testedClass));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -171,7 +164,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_redefine_classes = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     if (!NSK_VERIFY(nsk_jvmti_setAgentProc(agentProc, NULL)))
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp
index 9a00f3ed8c1..497486c7c1e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp
@@ -69,9 +69,7 @@ int readNewBytecode(jvmtiEnv* jvmti) {
     classDef.class_byte_count = ftell(bytecode);
     rewind(bytecode);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, jvmti,
-                                classDef.class_byte_count,
-                                &newClassBytes))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(classDef.class_byte_count, &newClassBytes))) {
         NSK_COMPLAIN0("buffer couldn't be allocated\n");
         return NSK_FALSE;
     }
@@ -99,14 +97,13 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         return;
 
     NSK_DISPLAY1("Find class: %s\n", TESTED_CLASS_NAME);
-    if (!NSK_JNI_VERIFY(jni, (classDef.klass =
-            NSK_CPP_STUB2(FindClass, jni, TESTED_CLASS_NAME)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni, (classDef.klass = jni->FindClass(TESTED_CLASS_NAME)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
 
     if (!NSK_JNI_VERIFY(jni, (classDef.klass = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, classDef.klass)) != NULL)) {
+            jni->NewGlobalRef(classDef.klass)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -120,13 +117,12 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         nsk_printHexBytes("   ", 16, classDef.class_byte_count,
                                 classDef.class_bytes);
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &classDef))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &classDef))) {
         nsk_jvmti_setFailStatus();
         return;
     }
 
-    NSK_CPP_STUB2(DeleteGlobalRef, jni, classDef.klass);
+    jni->DeleteGlobalRef(classDef.klass);
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -163,7 +159,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
         caps.can_redefine_classes = 1;
         caps.can_redefine_any_class = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp
index 6a388983359..a59b82a5c5c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp
@@ -79,8 +79,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -92,8 +91,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -105,24 +103,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -136,23 +130,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -168,27 +160,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -202,7 +190,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -215,7 +203,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -225,8 +213,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -269,44 +256,36 @@ static int checkHeapFunctions() {
     jint dummy_user_data = 0;
 
     NSK_DISPLAY0("Checking positive: SetTag\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetTag\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetObjectsWithTags\n");
     tag = TAG_VALUE;
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverInstancesOfClass\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IterateOverInstancesOfClass(
+            klass, JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverObjectsReachableFromObject\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IterateOverObjectsReachableFromObject(
+            thread, ObjectReference, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverReachableObjects\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IterateOverReachableObjects(
+            HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -325,58 +304,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -391,18 +369,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -418,7 +395,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -431,7 +408,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -444,12 +421,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -463,7 +440,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -477,12 +454,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -496,12 +473,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -597,7 +574,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -609,13 +586,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -627,13 +604,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -645,10 +622,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp
index 1e1f4120779..cb44c78abd4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp
@@ -72,8 +72,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -85,8 +84,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -98,24 +96,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -129,23 +123,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -161,27 +153,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -195,7 +183,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -208,7 +196,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -218,8 +206,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -263,43 +250,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -318,58 +307,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -384,18 +372,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -411,7 +398,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -424,7 +411,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -437,12 +424,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -455,10 +442,9 @@ static int checkGetBytecodes() {
     unsigned char *bytecodes;
 
     NSK_DISPLAY0("Checking positive: GetBytecodes\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti, bytecodes)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -472,12 +458,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,12 +477,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -592,7 +578,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -604,13 +590,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -622,13 +608,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -640,10 +626,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp
index bdfc69e073f..f92d0d29805 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp
@@ -74,8 +74,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -87,8 +86,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -100,24 +98,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -131,23 +125,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -163,27 +155,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -197,7 +185,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -210,7 +198,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -220,8 +208,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -265,43 +252,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -320,58 +309,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -386,18 +374,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -413,7 +400,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -426,7 +413,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -438,13 +425,11 @@ static int checkIsSyntheticFunctions() {
     jboolean is_synthetic;
 
     NSK_DISPLAY0("Checking positive: IsFieldSynthetic\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IsMethodSynthetic\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -458,7 +443,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -472,12 +457,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,12 +476,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -592,7 +577,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -604,13 +589,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -622,13 +607,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -640,10 +625,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp
index 1547e87bad3..6b52f4c9695 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp
@@ -72,8 +72,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -85,8 +84,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -98,24 +96,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -129,23 +123,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -161,27 +153,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -194,8 +182,7 @@ static int checkGetOwnedMonitorInfo() {
     jobject *monitors = NULL;
 
     NSK_DISPLAY0("Checking positive: GetOwnedMonitorInfo\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -208,7 +195,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -218,8 +205,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -263,43 +249,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -318,58 +306,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -384,18 +371,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -411,7 +397,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -424,7 +410,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -437,12 +423,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -456,7 +442,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -470,12 +456,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -489,12 +475,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: checkGetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -590,7 +576,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -602,13 +588,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -620,13 +606,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -638,10 +624,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp
index e547a0e6d33..adbb0d83cba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp
@@ -72,8 +72,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -85,8 +84,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -98,24 +96,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -129,23 +123,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -161,27 +153,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -195,7 +183,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -207,8 +195,7 @@ static int checkGetCurrentContendedMonitor() {
     jobject monitor = NULL;
 
     NSK_DISPLAY0("Checking positive: GetCurrentContendedMonitor\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -218,8 +205,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -263,43 +249,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -318,58 +306,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -384,18 +371,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -411,7 +397,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -424,7 +410,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -437,12 +423,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -456,7 +442,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -470,12 +456,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -489,12 +475,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -590,7 +576,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -602,13 +588,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -620,13 +606,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -638,10 +624,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp
index 77a82d3309d..011c53aa0c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp
@@ -72,8 +72,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -85,8 +84,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -98,24 +96,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -129,23 +123,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -161,27 +153,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -195,7 +183,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -208,7 +196,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -218,8 +206,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -263,43 +250,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -318,58 +307,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -384,18 +372,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -411,7 +398,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -423,8 +410,7 @@ static int checkGetObjectMonitorUsage() {
     jvmtiMonitorUsage monitor_info;
 
     NSK_DISPLAY0("Checking positive: GetObjectMonitorUsage\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -437,12 +423,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -456,7 +442,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -470,12 +456,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -489,12 +475,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -590,7 +576,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -602,13 +588,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -620,13 +606,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -638,10 +624,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp
index dfefa6fb78d..b9519d59054 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp
@@ -72,8 +72,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -85,8 +84,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -98,23 +96,19 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingFlag' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "waitingFlag", "Z")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "waitingFlag", "Z")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -128,23 +122,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -160,27 +152,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -194,7 +182,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -207,7 +195,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -223,23 +211,23 @@ static int checkPopFrame() {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_suspend = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     // PopFrame is allowed to fail with JVMTI_ERROR_OPAQUE_FRAME.
     // That will happen if we are in a native function, for example while waiting for a Condition.
     // See JCK-5020108.
-    err = NSK_CPP_STUB2(PopFrame, jvmti, thread);
+    err = jvmti->PopFrame(thread);
     if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_OPAQUE_FRAME) {
       NSK_DISPLAY1("jvmti error from PopFrame: %d\n", err);
       return NSK_FALSE;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         return NSK_FALSE;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     return NSK_TRUE;
@@ -283,43 +271,47 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED,
+                                   HeapObject,
+                                   &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -338,58 +330,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -404,18 +395,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -431,7 +421,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -444,7 +434,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -457,12 +447,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -476,7 +466,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -490,12 +480,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -509,12 +499,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -610,7 +600,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -622,13 +612,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -640,13 +630,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -658,10 +648,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp
index aeb2ebe6506..8f35fd2bf20 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp
@@ -76,8 +76,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -89,8 +88,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -102,24 +100,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -133,23 +127,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -165,27 +157,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -199,7 +187,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -212,7 +200,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -222,8 +210,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -267,43 +254,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -322,58 +311,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -388,18 +376,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -415,12 +402,11 @@ static int checkRedefineClasses() {
     class_def.klass = klass;
     class_def.class_byte_count = klass_byte_count;
     class_def.class_bytes = klass_bytes;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IsMethodObsolete\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(IsMethodObsolete, jvmti, method, &is_obsolete)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IsMethodObsolete(method, &is_obsolete)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -433,7 +419,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -446,12 +432,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -465,7 +451,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -479,12 +465,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -498,12 +484,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -521,15 +507,14 @@ ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *env, jclass class_beeing_redefine
 
     if (name != NULL && (strcmp(name, CLASS_NAME) == 0)) {
         NSK_DISPLAY1("ClassFileLoadHook: %s\n", name);
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate,
-            jvmti, class_data_len, &klass_bytes)))
+        if (!NSK_JVMTI_VERIFY(jvmti->Allocate(class_data_len, &klass_bytes)))
             nsk_jvmti_setFailStatus();
         else {
             memcpy(klass_bytes, class_data, class_data_len);
             klass_byte_count = class_data_len;
         }
-        NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL));
+        NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL));
     }
 }
 
@@ -624,7 +609,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -636,13 +621,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -654,13 +639,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -672,10 +657,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -686,11 +671,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     /* activate ClassFileLoadHook to get class file data */
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.ClassFileLoadHook = &ClassFileLoadHook;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+        jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp
index d49903a0084..535398b2a96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp
@@ -74,8 +74,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -87,8 +86,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -100,24 +98,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -131,23 +125,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -163,25 +155,22 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: StopThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+    if (!NSK_JVMTI_VERIFY(jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -195,7 +184,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -208,7 +197,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -218,8 +207,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -263,43 +251,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -318,58 +308,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -384,18 +373,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -411,7 +399,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -424,7 +412,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -437,12 +425,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -456,7 +444,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -470,12 +458,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -489,12 +477,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -590,7 +578,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -602,13 +590,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -620,13 +608,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -638,10 +626,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp
index 767f2fba303..f7e8c060772 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp
@@ -73,8 +73,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -86,8 +85,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -99,24 +97,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -130,23 +124,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -162,27 +154,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -196,7 +184,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -209,7 +197,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -219,8 +207,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -264,43 +251,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -319,58 +308,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -384,19 +372,17 @@ static int checkSourceInfoFunctions() {
     jvmtiLineNumberEntry *line_number_table = NULL;
 
     NSK_DISPLAY0("Checking positive: GetSourceFileName\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -412,7 +398,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -425,7 +411,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -438,12 +424,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -457,7 +443,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -471,12 +457,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -490,12 +476,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -591,7 +577,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -603,13 +589,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -621,13 +607,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -639,10 +625,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp
index 3613f0642be..6e07ea5c7e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp
@@ -83,8 +83,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -96,8 +95,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -109,24 +107,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -140,23 +134,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -172,27 +164,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -206,7 +194,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -219,7 +207,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -229,8 +217,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -274,43 +261,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -333,83 +322,80 @@ static int checkLocalVariableFunctions() {
 */
 
     NSK_DISPLAY0("Checking positive: GetLocalVariableTable\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
 /* DEBUG -- while thread should be suspended
     memset(&caps, 0, sizeof(caps));
     caps.can_suspend = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 */
 
     for (i = 0; i < count; i++) {
         if (strcmp(local_variable_table[i].name, "o") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalObject\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalObject, jvmti,
-                    thread, 1, local_variable_table[i].slot, &object_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalObject(thread, 1, local_variable_table[i].slot, &object_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalObject\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalObject, jvmti,
-                    thread, 1, local_variable_table[i].slot, object_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalObject(thread, 1, local_variable_table[i].slot, object_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "i") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalInt\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalInt, jvmti,
-                    thread, 1, local_variable_table[i].slot, &int_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalInt(thread, 1, local_variable_table[i].slot, &int_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalInt\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalInt, jvmti,
-                    thread, 1, local_variable_table[i].slot, int_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalInt(thread, 1, local_variable_table[i].slot, int_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "l") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalLong\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalLong, jvmti,
-                    thread, 1, local_variable_table[i].slot, &long_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalLong(thread, 1, local_variable_table[i].slot, &long_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalLong\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalLong, jvmti,
-                    thread, 1, local_variable_table[i].slot, long_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalLong(thread, 1, local_variable_table[i].slot, long_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "f") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalFloat\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalFloat, jvmti,
-                    thread, 1, local_variable_table[i].slot, &float_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalFloat(thread, 1, local_variable_table[i].slot, &float_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalFloat\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalFloat, jvmti,
-                    thread, 1, local_variable_table[i].slot, float_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalFloat(thread, 1, local_variable_table[i].slot, float_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "d") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalDouble\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalDouble, jvmti,
-                    thread, 1, local_variable_table[i].slot, &double_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalDouble(thread, 1, local_variable_table[i].slot, &double_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalDouble\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalDouble, jvmti,
-                    thread, 1, local_variable_table[i].slot, double_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalDouble(thread, 1, local_variable_table[i].slot, double_value)))
                 return NSK_FALSE;
         }
     }
 
 /* DEBUG -- while thread should be suspended
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         return NSK_FALSE;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 */
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti,
-            (unsigned char*)local_variable_table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)local_variable_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -424,18 +410,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -451,7 +436,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -464,7 +449,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -477,12 +462,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -496,7 +481,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -510,12 +495,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -529,12 +514,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -630,7 +615,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -642,13 +627,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -660,13 +645,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -678,10 +663,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp
index 762d25ce0ab..68b6461161c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp
@@ -76,8 +76,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -89,8 +88,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -102,24 +100,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -133,21 +127,19 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking positive: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: SuspendThreadList\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: ResumeThreadList\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -163,27 +155,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -197,7 +185,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -210,7 +198,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -220,8 +208,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -265,43 +252,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -320,58 +309,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -386,18 +374,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -413,7 +400,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -426,7 +413,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -439,12 +426,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -458,7 +445,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -472,12 +459,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,12 +478,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -592,7 +579,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -604,13 +591,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -622,13 +609,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -640,10 +627,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp
index b39c724aed6..b6ce11d590e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp
@@ -73,8 +73,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -86,8 +85,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -99,24 +97,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -130,23 +124,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -162,27 +154,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -196,7 +184,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -209,7 +197,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -219,8 +207,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -264,43 +251,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -319,58 +308,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -385,18 +373,16 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetLineNumberTable\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -412,7 +398,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -425,7 +411,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -438,12 +424,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -457,7 +443,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -471,12 +457,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -490,12 +476,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -591,7 +577,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -603,13 +589,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -621,13 +607,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -639,10 +625,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp
index 7a4930959fc..58d80995614 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp
@@ -74,8 +74,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -87,8 +86,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -100,24 +98,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -130,7 +124,7 @@ static int prepare() {
 static int checkGetPotentialCapabilities() {
     jvmtiCapabilities caps;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return NSK_FALSE;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -148,7 +142,7 @@ static int checkAddCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -160,7 +154,7 @@ static int checkGetCapabilities(int owe) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (owe && !caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -182,7 +176,7 @@ static int checkRelinquishCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -196,23 +190,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -228,27 +220,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -262,7 +250,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -275,7 +263,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -285,8 +273,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -330,43 +317,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -385,58 +374,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -451,18 +439,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -478,7 +465,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,7 +478,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -504,12 +491,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -523,15 +510,14 @@ static int checkGetBytecodes(int positive) {
 
     if (positive) {
         NSK_DISPLAY0("Checking positive: GetBytecodes\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetBytecodes(method, &count, &bytecodes)))
             return NSK_FALSE;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti, bytecodes)))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(bytecodes)))
             return NSK_FALSE;
     } else {
         NSK_DISPLAY0("Checking negative: GetBytecodes\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+                jvmti->GetBytecodes(method, &count, &bytecodes)))
             return NSK_FALSE;
     }
 
@@ -546,12 +532,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -565,12 +551,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp
index dbcecbf7360..4919c2874dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp
@@ -76,8 +76,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -89,8 +88,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -102,24 +100,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -132,7 +126,7 @@ static int prepare() {
 static int checkGetPotentialCapabilities() {
     jvmtiCapabilities caps;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return NSK_FALSE;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -150,7 +144,7 @@ static int checkAddCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -162,7 +156,7 @@ static int checkGetCapabilities(int owe) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (owe && !caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -184,7 +178,7 @@ static int checkRelinquishCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -198,23 +192,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -230,27 +222,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -264,7 +252,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -277,7 +265,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -287,8 +275,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -332,43 +319,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -387,58 +376,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -453,18 +441,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -480,7 +467,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -493,7 +480,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -506,23 +493,21 @@ static int checkIsSyntheticFunctions(int positive) {
 
     if (positive) {
         NSK_DISPLAY0("Checking positive: IsFieldSynthetic\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+        if (!NSK_JVMTI_VERIFY(jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking positive: IsMethodSynthetic\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+        if (!NSK_JVMTI_VERIFY(jvmti->IsMethodSynthetic(method, &is_synthetic)))
             return NSK_FALSE;
     } else {
         NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+                jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+                jvmti->IsMethodSynthetic(method, &is_synthetic)))
             return NSK_FALSE;
     }
 
@@ -537,7 +522,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -551,12 +536,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -570,12 +555,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp
index 01731a4a811..0952ff8d3dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp
@@ -74,8 +74,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -87,8 +86,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -100,24 +98,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -130,7 +124,7 @@ static int prepare() {
 static int checkGetPotentialCapabilities() {
     jvmtiCapabilities caps;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return NSK_FALSE;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -148,7 +142,7 @@ static int checkAddCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -160,7 +154,7 @@ static int checkGetCapabilities(int owe) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (owe && !caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -182,7 +176,7 @@ static int checkRelinquishCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -196,23 +190,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -228,27 +220,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -262,7 +250,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -275,7 +263,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -285,8 +273,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -330,43 +317,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -385,58 +374,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -451,18 +439,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -478,7 +465,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,14 +478,12 @@ static int checkGetObjectMonitorUsage(int positive) {
 
     if (positive) {
         NSK_DISPLAY0("Checking positive: GetObjectMonitorUsage\n");
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti,
-                thread, &monitor_info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
             return NSK_FALSE;
     } else {
         NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti,
-                    thread, &monitor_info)))
+                jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
             return NSK_FALSE;
     }
 
@@ -512,12 +497,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -531,7 +516,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -545,12 +530,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -564,12 +549,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp
index 3f3381d8fcd..13804681b1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp
@@ -76,8 +76,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -89,8 +88,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -102,24 +100,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -132,7 +126,7 @@ static int prepare() {
 static int checkGetPotentialCapabilities() {
     jvmtiCapabilities caps;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return NSK_FALSE;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -150,7 +144,7 @@ static int checkAddCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -162,7 +156,7 @@ static int checkGetCapabilities(int owe) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (owe && !caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -184,7 +178,7 @@ static int checkRelinquishCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -198,23 +192,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -230,37 +222,33 @@ static int checkSignalThread(int positive) {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     if (positive) {
         NSK_DISPLAY0("Checking positive: InterruptThread\n");
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+        if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(thread)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking positive: StopThread\n");
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(StopThread, jvmti,
-                thread, exception)))
+        if (!NSK_JVMTI_VERIFY(jvmti->StopThread(thread, exception)))
             return NSK_FALSE;
     } else {
         NSK_DISPLAY0("Checking negative: StopThread\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+                jvmti->StopThread(thread, exception)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking negative: InterruptThread\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+                jvmti->InterruptThread(thread)))
             return NSK_FALSE;
     }
 
@@ -275,7 +263,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -288,7 +276,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -298,8 +286,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -343,43 +330,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -398,58 +387,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -464,18 +452,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,7 +478,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -504,7 +491,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -517,12 +504,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -536,7 +523,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -550,12 +537,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -569,12 +556,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp
index 540519feda8..7e53745ccac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp
@@ -78,8 +78,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -91,8 +90,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -104,24 +102,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -134,7 +128,7 @@ static int prepare() {
 static int checkGetPotentialCapabilities() {
     jvmtiCapabilities caps;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return NSK_FALSE;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -152,7 +146,7 @@ static int checkAddCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -164,7 +158,7 @@ static int checkGetCapabilities(int owe) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (owe && !caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -186,7 +180,7 @@ static int checkRelinquishCapabilities() {
 
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -201,41 +195,39 @@ static int checkSuspend(int positive) {
 
     if (positive) {
         NSK_DISPLAY0("Checking positive: SuspendThread\n");
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+        if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking positive: ResumeThread\n");
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+        if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking positive: SuspendThreadList\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+        if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(1, &thread, &err)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking positive: ResumeThreadList\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+        if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(1, &thread, &err)))
             return NSK_FALSE;
     } else {
         NSK_DISPLAY0("Checking negative: SuspendThread\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+                jvmti->SuspendThread(thread)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking negative: ResumeThread\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+                jvmti->ResumeThread(thread)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+                jvmti->SuspendThreadList(1, &thread, &err)))
             return NSK_FALSE;
 
         NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+                jvmti->ResumeThreadList(1, &thread, &err)))
             return NSK_FALSE;
     }
 
@@ -252,27 +244,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -286,7 +274,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -299,7 +287,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -309,8 +297,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -354,43 +341,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -409,58 +398,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -475,18 +463,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -502,7 +489,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -515,7 +502,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -528,12 +515,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -547,7 +534,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -561,12 +548,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -580,12 +567,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp
index 292c7660fa4..9fe8b204387 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp
@@ -73,8 +73,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -86,8 +85,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -99,24 +97,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -130,23 +124,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -162,27 +154,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -196,7 +184,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -209,7 +197,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -219,8 +207,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -264,43 +251,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -319,58 +308,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -385,18 +373,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_ABSENT_INFORMATION,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -412,7 +399,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -425,7 +412,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -438,12 +425,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -457,7 +444,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -471,12 +458,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -490,12 +477,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -591,7 +578,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -603,13 +590,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -621,13 +608,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -639,10 +626,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp
index b436b4ff437..25d4ed9a06e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp
@@ -74,8 +74,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -87,8 +86,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -100,24 +98,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -131,23 +125,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -163,27 +155,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -197,7 +185,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -210,7 +198,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -220,8 +208,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -265,43 +252,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -320,58 +309,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -386,18 +374,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -413,7 +400,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -426,7 +413,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -439,12 +426,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -458,7 +445,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -471,13 +458,11 @@ static int checkGetCurrentThreadCpuTime() {
     jlong nanos;
 
     NSK_DISPLAY0("Checking positive: GetCurrentThreadCpuTimerInfo\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetCurrentThreadCpuTime\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -491,12 +476,12 @@ static int checkGetThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: checkGetThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+            jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -592,7 +577,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -604,13 +589,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -622,13 +607,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -640,10 +625,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp
index 32f5ff88bcb..829a7c8f3dd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp
@@ -74,8 +74,7 @@ static int prepare() {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -87,8 +86,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -100,24 +98,20 @@ static int prepare() {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingMonitor' */
     if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass,
-                "waitingMonitor", "Ljava/lang/Object;")) != NULL))
+            jni->GetFieldID(klass, "waitingMonitor", "Ljava/lang/Object;")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -131,23 +125,21 @@ static int checkSuspend() {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking negative: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SuspendThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+            jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: ResumeThreadList\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+            jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -163,27 +155,23 @@ static int checkSignalThread() {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: StopThread\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+            jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -197,7 +185,7 @@ static int checkGetOwnedMonitorInfo() {
 
     NSK_DISPLAY0("Checking negative: GetOwnedMonitorInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+            jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -210,7 +198,7 @@ static int checkGetCurrentContendedMonitor() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentContendedMonitor\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+            jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -220,8 +208,7 @@ static int checkGetCurrentContendedMonitor() {
  */
 static int checkPopFrame() {
     NSK_DISPLAY0("Checking negative: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(PopFrame, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->PopFrame(thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -265,43 +252,45 @@ static int checkHeapFunctions() {
 
     NSK_DISPLAY0("Checking negative: SetTag\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+            jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetTag\n");
-    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY, jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetObjectsWithTags\n");
     tag = TAG_VALUE;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+            jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -320,58 +309,57 @@ static int checkLocalVariableFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetLocalVariableTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+            jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalObject, jvmti, thread, 0, 0, &object_value)))
+            jvmti->GetLocalObject(thread, 0, 0, &object_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalInt, jvmti, thread, 0, 0, &int_value)))
+            jvmti->GetLocalInt(thread, 0, 0, &int_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalLong, jvmti, thread, 0, 0, &long_value)))
+            jvmti->GetLocalLong(thread, 0, 0, &long_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalFloat, jvmti, thread, 0, 0, &float_value)))
+            jvmti->GetLocalFloat(thread, 0, 0, &float_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(GetLocalDouble, jvmti, thread, 0, 0, &double_value)))
+            jvmti->GetLocalDouble(thread, 0, 0, &double_value)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalObject\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalObject, jvmti, thread, 0, 0, thread)))
+            jvmti->SetLocalObject(thread, 0, 0, thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalInt\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalInt, jvmti, thread, 0, 0, (jint)0)))
+            jvmti->SetLocalInt(thread, 0, 0, (jint)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalLong\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalLong, jvmti, thread, 0, 0, (jlong)0)))
+            jvmti->SetLocalLong(thread, 0, 0, (jlong)0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalFloat\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalFloat, jvmti, thread, 0, 0, (jfloat)0.0)))
+            jvmti->SetLocalFloat(thread, 0, 0, (jfloat)0.0)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: SetLocalDouble\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB5(SetLocalDouble, jvmti, thread, 0, 0, (jdouble)0.0)))
+            jvmti->SetLocalDouble(thread, 0, 0, (jdouble)0.0)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -386,18 +374,17 @@ static int checkSourceInfoFunctions() {
 
     NSK_DISPLAY0("Checking negative: GetSourceFileName\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+            jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetLineNumberTable\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+            jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -413,7 +400,7 @@ static int checkRedefineClasses() {
     class_def.class_byte_count = 0;
     class_def.class_bytes = NULL;
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+            jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -426,7 +413,7 @@ static int checkGetObjectMonitorUsage() {
 
     NSK_DISPLAY0("Checking negative: GetObjectMonitorUsage\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+            jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -439,12 +426,12 @@ static int checkIsSyntheticFunctions() {
 
     NSK_DISPLAY0("Checking negative: IsFieldSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+            jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: IsMethodSynthetic\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+            jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -458,7 +445,7 @@ static int checkGetBytecodes() {
 
     NSK_DISPLAY0("Checking negative: GetBytecodes\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+            jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -472,12 +459,12 @@ static int checkGetCurrentThreadCpuTime() {
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTimerInfo\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+            jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking negative: GetCurrentThreadCpuTime\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+            jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -490,13 +477,11 @@ static int checkGetThreadCpuTime() {
     jlong nanos;
 
     NSK_DISPLAY0("Checking positive: GetThreadCpuTimerInfo\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: checkGetThreadCpuTime\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -592,7 +577,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     /* testcase #1: check GetPotentialCapabilities */
     NSK_DISPLAY0("Testcase #1: check if GetPotentialCapabilities returns the capability\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPotentialCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetPotentialCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetPotentialCapabilities does not return \"%s\" capability\n",
@@ -604,13 +589,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #2: add the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #3: check if GetCapabilities returns the capability */
     NSK_DISPLAY0("Testcase #3: check if GetCapabilities returns the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
@@ -622,13 +607,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #4: relinquish the capability during Onload phase\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RelinquishCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RelinquishCapabilities(&caps)))
         return JNI_ERR;
 
     /* testcase #5: check if GetCapabilities does not return the capability */
     NSK_DISPLAY0("Testcase #5: check if GetCapabilities does not return the capability\n");
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities returns relinquished \"%s\" capability\n",
@@ -640,10 +625,10 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     NSK_DISPLAY0("Testcase #6: add back the capability and check with GetCapabilities\n");
     memset(&caps, 0, sizeof(caps));
     caps.CAPABILITY = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
     if (!caps.CAPABILITY) {
         NSK_COMPLAIN1("GetCapabilities does not return \"%s\" capability\n",
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp
index c6e857a4cfe..2f85f7a09dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp
@@ -99,17 +99,16 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
 
     CompiledMethodLoadEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY3("CompiledMethodLoad event: %s%s (0x%p)\n",
         name, signature, code_addr);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -126,8 +125,8 @@ CompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method,
     if (err == JVMTI_ERROR_NONE) {
         NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n",
           name, sig, code_addr);
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig);
+        jvmti_env->Deallocate((unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)sig);
     }
 }
 
@@ -139,8 +138,7 @@ MonitorContendedEnter(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorContendedEnterEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -156,8 +154,7 @@ MonitorContendedEntered(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorContendedEnteredEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -173,8 +170,7 @@ MonitorWait(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorWaitEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -190,8 +186,7 @@ MonitorWaited(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorWaitedEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -207,14 +202,13 @@ VMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
 
     VMObjectAllocEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            object_klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(object_klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("VMObjectAlloc: \"%s\", size=%d\n", signature, size);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -226,7 +220,7 @@ NativeMethodBind(jvmtiEnv* jvmti_env, JNIEnv *jni_env,
 
     NativeMethodBindEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -234,8 +228,7 @@ NativeMethodBind(jvmtiEnv* jvmti_env, JNIEnv *jni_env,
     if (phase != JVMTI_PHASE_START && phase != JVMTI_PHASE_LIVE)
         return;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -243,9 +236,9 @@ NativeMethodBind(jvmtiEnv* jvmti_env, JNIEnv *jni_env,
     NSK_DISPLAY2("NativeMethodBind event: %s%s\n", name, signature);
 
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -280,8 +273,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -293,8 +285,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -305,18 +296,15 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
     }
 
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -330,7 +318,7 @@ static int checkGetCapabilities(jvmtiEnv* jvmti) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (!NSK_VERIFY(caps.can_tag_objects))
         return NSK_FALSE;
@@ -373,8 +361,7 @@ static int checkGetOwnedMonitorInfo(jvmtiEnv* jvmti) {
     jobject *monitors = NULL;
 
     NSK_DISPLAY0("Checking positive: GetOwnedMonitorInfo\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetOwnedMonitorInfo, jvmti, thread, &count, &monitors)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetOwnedMonitorInfo(thread, &count, &monitors)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -386,8 +373,7 @@ static int checkGetCurrentContendedMonitor(jvmtiEnv* jvmti) {
     jobject monitor = NULL;
 
     NSK_DISPLAY0("Checking positive: GetCurrentContendedMonitor\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetCurrentContendedMonitor, jvmti, thread, &monitor)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentContendedMonitor(thread, &monitor)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -439,44 +425,44 @@ static int checkHeapFunctions(jvmtiEnv* jvmti) {
     jint dummy_user_data = 0;
 
     NSK_DISPLAY0("Checking positive: SetTag\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetTag, jvmti, thread, TAG_VALUE)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetTag(thread, TAG_VALUE)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetTag\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetTag, jvmti, thread, &tag)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetTag(thread, &tag)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetObjectsWithTags\n");
     tag = TAG_VALUE;
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB6(GetObjectsWithTags, jvmti, 1, &tag,
-                &count, &res_objects, &res_tags)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetObjectsWithTags(1, &tag, &count, &res_objects, &res_tags)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverHeap\n");
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(IterateOverHeap, jvmti, JVMTI_HEAP_OBJECT_TAGGED,
-                HeapObject, &dummy_user_data)))
+            jvmti->IterateOverHeap(JVMTI_HEAP_OBJECT_TAGGED, HeapObject, &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverInstancesOfClass\n");
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(IterateOverInstancesOfClass, jvmti, klass,
-                JVMTI_HEAP_OBJECT_UNTAGGED, HeapObject, &dummy_user_data)))
+            jvmti->IterateOverInstancesOfClass(klass,
+                                               JVMTI_HEAP_OBJECT_UNTAGGED,
+                                               HeapObject,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverObjectsReachableFromObject\n");
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(IterateOverObjectsReachableFromObject, jvmti, thread,
-                ThreadObjectReference, &dummy_user_data)))
+            jvmti->IterateOverObjectsReachableFromObject(thread,
+                                                         ThreadObjectReference,
+                                                         &dummy_user_data)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IterateOverReachableObjects\n");
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(IterateOverReachableObjects, jvmti,
-                HeapRoot, StackReference, ObjectReference, &dummy_user_data)))
+            jvmti->IterateOverReachableObjects(HeapRoot,
+                                               StackReference,
+                                               ObjectReference,
+                                               &dummy_user_data)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -488,8 +474,7 @@ static int checkGetObjectMonitorUsage(jvmtiEnv* jvmti) {
     jvmtiMonitorUsage monitor_info;
 
     NSK_DISPLAY0("Checking positive: GetObjectMonitorUsage\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetObjectMonitorUsage, jvmti, thread, &monitor_info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(thread, &monitor_info)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -502,13 +487,11 @@ static int checkGetCurrentThreadCpuTime(jvmtiEnv* jvmti) {
     jlong nanos;
 
     NSK_DISPLAY0("Checking positive: GetCurrentThreadCpuTimerInfo\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetCurrentThreadCpuTimerInfo, jvmti, &info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: GetCurrentThreadCpuTime\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetCurrentThreadCpuTime, jvmti, &nanos)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCurrentThreadCpuTime(&nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -521,13 +504,11 @@ static int checkGetThreadCpuTime(jvmtiEnv* jvmti) {
     jlong nanos;
 
     NSK_DISPLAY0("Checking positive: GetThreadCpuTimerInfo\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetThreadCpuTimerInfo, jvmti, &info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTimerInfo(&info)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: checkGetThreadCpuTime\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetThreadCpuTime, jvmti, thread, &nanos)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTime(thread, &nanos)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -641,7 +622,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!checkGetThreadCpuTime(jvmti))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, thread));
+    NSK_TRACE(jni->DeleteGlobalRef(thread));
 
     /* resume debugee and wait for sync */
     if (!nsk_jvmti_resumeSync())
@@ -706,7 +687,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     caps.can_generate_native_method_bind_events = 1;
     caps.can_generate_garbage_collection_events = 1;
     caps.can_generate_object_free_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* set event callbacks */
@@ -723,46 +704,45 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     callbacks.GarbageCollectionStart = &GarbageCollectionStart;
     callbacks.GarbageCollectionFinish = &GarbageCollectionFinish;
     callbacks.ObjectFree = &ObjectFree;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     /* enable events */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_NATIVE_METHOD_BIND, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(
+            JVMTI_ENABLE, JVMTI_EVENT_OBJECT_FREE, NULL)))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp
index a26107419a5..3dad6406c42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp
@@ -95,15 +95,15 @@ ClassFileLoadHook(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
 
     if (name != NULL && (strcmp(name, CLASS_NAME) == 0)) {
         NSK_DISPLAY1("ClassFileLoadHook: %s\n", name);
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate,
-                jvmti_env, class_data_len, &klass_bytes)))
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Allocate(class_data_len, &klass_bytes)))
             nsk_jvmti_setFailStatus();
         else {
             memcpy(klass_bytes, class_data, class_data_len);
             klass_byte_count = class_data_len;
         }
-        NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti_env, JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL));
+        NSK_JVMTI_VERIFY(
+            jvmti_env->SetEventNotificationMode(
+                JVMTI_DISABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL));
     }
 }
 
@@ -116,20 +116,18 @@ FieldAccess(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
 
     FieldAccessEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(ClearFieldAccessWatch, jvmti_env, klass, field)))
+    if (!NSK_JVMTI_VERIFY(jvmti_env->ClearFieldAccessWatch(klass, field)))
         return;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB6(GetFieldName,
-            jvmti_env, field_klass, field, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetFieldName(field_klass, field, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("FieldAccess event: %s:%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -142,16 +140,15 @@ FieldModification(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
 
     FieldModificationEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB6(GetFieldName,
-            jvmti_env, field_klass, field, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetFieldName(field_klass, field, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("FieldModification event: %s:%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -162,19 +159,19 @@ SingleStep(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
 
     SingleStepEventsCount++;
 
-    NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-        jvmti_env, JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL));
+    NSK_JVMTI_VERIFY(
+        jvmti_env->SetEventNotificationMode(
+            JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL));
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("SingleStep event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -186,19 +183,17 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     ExceptionEventsCount++;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY1("Exception event: %s\n", signature);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 void JNICALL
@@ -209,19 +204,17 @@ ExceptionCatch(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     ExceptionCatchEventsCount++;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY1("ExceptionCatch event: %s\n", signature);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -231,18 +224,17 @@ Breakpoint(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     BreakpointEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("Breakpoint event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 
-    NSK_CPP_STUB3(NotifyFramePop, jvmti_env, thread, 0);
+    jvmti_env->NotifyFramePop(thread, 0);
 }
 
 static void JNICALL
@@ -253,16 +245,15 @@ FramePop(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     FramePopEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("FramePop event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -272,16 +263,15 @@ MethodEntry(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     MethodEntryEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("MethodEntry event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -292,16 +282,15 @@ MethodExit(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     MethodExitEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("MethodExit event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -316,8 +305,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -329,8 +317,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -341,28 +328,23 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
     }
 
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'delay' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "delay", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "delay", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingFlag' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "waitingFlag", "Z")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "waitingFlag", "Z")) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -372,41 +354,37 @@ static int prepareEvents(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare events ...\n");
 
     /* get tested thread method 'letItGo' */
-    if (!NSK_JNI_VERIFY(jni, (method =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "letItGo", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "letItGo", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'waitingFlag' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "waitingFlag", "Z")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "waitingFlag", "Z")) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(SetFieldAccessWatch, jvmti, klass, field)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetFieldAccessWatch(klass, field)))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(SetFieldModificationWatch, jvmti, klass, field)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetFieldModificationWatch(klass, field)))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetBreakpoint, jvmti, method, 0)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetBreakpoint(method, 0)))
         return NSK_FALSE;
 
     /* enable events */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, thread)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, thread)))
         return NSK_FALSE;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, thread)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, thread)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -420,7 +398,7 @@ static int checkGetCapabilities(jvmtiEnv* jvmti) {
     jvmtiCapabilities caps;
 
     memset(&caps, 0, sizeof(caps));
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return NSK_FALSE;
     if (!NSK_VERIFY(caps.can_get_bytecodes))
         return NSK_FALSE;
@@ -471,10 +449,9 @@ static int checkGetBytecodes(jvmtiEnv* jvmti) {
     unsigned char *bytecodes;
 
     NSK_DISPLAY0("Checking positive: GetBytecodes\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetBytecodes, jvmti, method, &count, &bytecodes)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetBytecodes(method, &count, &bytecodes)))
         return NSK_FALSE;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti, bytecodes)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate(bytecodes)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -486,13 +463,11 @@ static int checkIsSyntheticFunctions(jvmtiEnv* jvmti) {
     jboolean is_synthetic;
 
     NSK_DISPLAY0("Checking positive: IsFieldSynthetic\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(IsFieldSynthetic, jvmti, klass, field, &is_synthetic)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IsFieldSynthetic(klass, field, &is_synthetic)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IsMethodSynthetic\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(IsMethodSynthetic, jvmti, method, &is_synthetic)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IsMethodSynthetic(method, &is_synthetic)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -511,12 +486,11 @@ static int checkRedefineClasses(jvmtiEnv* jvmti) {
     class_def.klass = klass;
     class_def.class_byte_count = klass_byte_count;
     class_def.class_bytes = klass_bytes;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(RedefineClasses, jvmti, 1, &class_def)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RedefineClasses(1, &class_def)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: IsMethodObsolete\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(IsMethodObsolete, jvmti, method, &is_obsolete)))
+    if (!NSK_JVMTI_VERIFY(jvmti->IsMethodObsolete(method, &is_obsolete)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -528,8 +502,7 @@ static int checkGetSourceFileName(jvmtiEnv* jvmti) {
     char *name;
 
     NSK_DISPLAY0("Checking positive: GetSourceFileName\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetSourceFileName, jvmti, klass, &name)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetSourceFileName(klass, &name)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -542,9 +515,7 @@ static int checkGetLineNumberTable(jvmtiEnv* jvmti) {
     jvmtiLineNumberEntry *line_number_table = NULL;
 
     NSK_DISPLAY0("Checking positive: GetLineNumberTable\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetLineNumberTable, jvmti, method, &count,
-                &line_number_table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetLineNumberTable(method, &count, &line_number_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -557,7 +528,7 @@ static int checkGetSourceDebugExtension(jvmtiEnv* jvmti) {
 
     NSK_DISPLAY0("Checking positive: GetSourceDebugExtension\n");
     if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_ABSENT_INFORMATION,
-            NSK_CPP_STUB3(GetSourceDebugExtension, jvmti, klass, &name)))
+            jvmti->GetSourceDebugExtension(klass, &name)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -576,77 +547,74 @@ static int checkLocalVariableFunctions(jvmtiEnv* jvmti) {
     int i;
 
     NSK_DISPLAY0("Checking positive: GetLocalVariableTable\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetLocalVariableTable, jvmti, method, &count,
-                &local_variable_table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetLocalVariableTable(method, &count, &local_variable_table)))
         return NSK_FALSE;
 
 /* DEBUG -- while 4913796 bug not fixed thread should be suspended
  */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     for (i = 0; i < count; i++) {
         if (strcmp(local_variable_table[i].name, "o") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalObject\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalObject, jvmti,
-                    thread, 1, local_variable_table[i].slot, &object_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalObject(thread, 1, local_variable_table[i].slot, &object_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalObject\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalObject, jvmti,
-                    thread, 1, local_variable_table[i].slot, object_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalObject(thread, 1, local_variable_table[i].slot, object_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "i") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalInt\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalInt, jvmti,
-                    thread, 1, local_variable_table[i].slot, &int_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalInt(thread, 1, local_variable_table[i].slot, &int_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalInt\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalInt, jvmti,
-                    thread, 1, local_variable_table[i].slot, int_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalInt(thread, 1, local_variable_table[i].slot, int_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "l") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalLong\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalLong, jvmti,
-                    thread, 1, local_variable_table[i].slot, &long_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalLong(thread, 1, local_variable_table[i].slot, &long_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalLong\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalLong, jvmti,
-                    thread, 1, local_variable_table[i].slot, long_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalLong(thread, 1, local_variable_table[i].slot, long_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "f") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalFloat\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalFloat, jvmti,
-                    thread, 1, local_variable_table[i].slot, &float_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalFloat(thread, 1, local_variable_table[i].slot, &float_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalFloat\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalFloat, jvmti,
-                    thread, 1, local_variable_table[i].slot, float_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalFloat(thread, 1, local_variable_table[i].slot, float_value)))
                 return NSK_FALSE;
         } else if (strcmp(local_variable_table[i].name, "d") ==0) {
             NSK_DISPLAY0("Checking positive: GetLocalDouble\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetLocalDouble, jvmti,
-                    thread, 1, local_variable_table[i].slot, &double_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->GetLocalDouble(thread, 1, local_variable_table[i].slot, &double_value)))
                 return NSK_FALSE;
 
             NSK_DISPLAY0("Checking positive: SetLocalDouble\n");
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(SetLocalDouble, jvmti,
-                    thread, 1, local_variable_table[i].slot, double_value)))
+            if (!NSK_JVMTI_VERIFY(
+                    jvmti->SetLocalDouble(thread, 1, local_variable_table[i].slot, double_value)))
                 return NSK_FALSE;
         }
     }
 
 /* DEBUG -- while 4913796 bug not fixed thread should be suspended
  */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate, jvmti,
-            (unsigned char*)local_variable_table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)local_variable_table)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -658,21 +626,19 @@ static int checkSuspend(jvmtiEnv* jvmti) {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking positive: SuspendThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: ResumeThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: SuspendThreadList\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SuspendThreadList, jvmti, 1, &thread, &err)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: ResumeThreadList\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(ResumeThreadList, jvmti, 1, &thread, &err)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(1, &thread, &err)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -685,20 +651,20 @@ static int checkPopFrame(jvmtiEnv* jvmti) {
     jvmtiError err;
 
     NSK_DISPLAY0("Checking positive: PopFrame\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
     // PopFrame is allowed to fail with JVMTI_ERROR_OPAQUE_FRAME.
     // That will happen if we are in a native function,
     // for example while waiting for a Condition.
     // See JCK-5020108.
-    err = NSK_CPP_STUB2(PopFrame, jvmti, thread);
+    err = jvmti->PopFrame(thread);
     if (err != JVMTI_ERROR_NONE && err != JVMTI_ERROR_OPAQUE_FRAME) {
       result = NSK_FALSE;
       NSK_DISPLAY1("jvmti error from PopFrame: %d\n", err);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         result = NSK_FALSE;
 
     return result;
@@ -714,25 +680,22 @@ static int checkSignalThread(jvmtiEnv* jvmti, JNIEnv* jni) {
     jmethodID ctor = NULL;
     jobject exception = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (exception =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (exception = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: InterruptThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(InterruptThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(thread)))
         return NSK_FALSE;
 
     NSK_DISPLAY0("Checking positive: StopThread\n");
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(StopThread, jvmti, thread, exception)))
+    if (!NSK_JVMTI_VERIFY(jvmti->StopThread(thread, exception)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -847,7 +810,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!checkSignalThread(jvmti, jni))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, thread));
+    NSK_TRACE(jni->DeleteGlobalRef(thread));
 
     /* resume debugee and wait for sync */
     if (!nsk_jvmti_resumeSync())
@@ -916,7 +879,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     caps.can_generate_breakpoint_events = 1;
     caps.can_generate_method_entry_events = 1;
     caps.can_generate_method_exit_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* set event callbacks */
@@ -931,25 +894,24 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     callbacks.FramePop = &FramePop;
     callbacks.MethodEntry = &MethodEntry;
     callbacks.MethodExit = &MethodExit;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks,
-            jvmti, &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     /* enable events */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_FILE_LOAD_HOOK, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_FIELD_ACCESS, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FIELD_ACCESS, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_FIELD_MODIFICATION, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FIELD_MODIFICATION, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_BREAKPOINT, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_FRAME_POP, NULL)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_FRAME_POP, NULL)))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp
index 3b4458420a4..852c148dc6d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp
@@ -54,8 +54,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -67,8 +66,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -79,38 +77,31 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
 
         if (info.name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)info.name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)info.name)))
                 return NSK_FALSE;
         }
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'M1' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "M1", FIELD_SIG)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "M1", FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (object_M1 =
-            NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M1 = jni->GetObjectField(thread, field)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'M2' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "M2", FIELD_SIG)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "M2", FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (object_M2 =
-            NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M2 = jni->GetObjectField(thread, field)) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -126,22 +117,19 @@ static int checkGetObjectMonitorUsage(jvmtiEnv* jvmti, JNIEnv* jni,
     int i;
 
     NSK_DISPLAY1("Checking GetObjectMonitorUsage for 0x%p\n", object);
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(
-            GetObjectMonitorUsage, jvmti, object, &inf)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(object, &inf)))
         return NSK_FALSE;
 
     if (nsk_getVerboseMode()) {
         if (inf.owner == NULL) {
             NSK_DISPLAY0("\towner: none (0x0)\n");
         } else {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(
-                    GetThreadInfo, jvmti, inf.owner, &tinf))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(inf.owner, &tinf))) {
                 result = NSK_FALSE;
             } else {
                 NSK_DISPLAY2("\towner: %s (0x%p)\n", tinf.name, inf.owner);
                 if (tinf.name != NULL) {
-                    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                            Deallocate, jvmti, (unsigned char*)tinf.name)))
+                    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)tinf.name)))
                         result = NSK_FALSE;
                 }
             }
@@ -152,15 +140,13 @@ static int checkGetObjectMonitorUsage(jvmtiEnv* jvmti, JNIEnv* jni,
         if (inf.waiter_count > 0) {
             NSK_DISPLAY0("\twaiters:\n");
             for (i = 0; i < inf.waiter_count; i++) {
-                if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(
-                        GetThreadInfo, jvmti, inf.waiters[i], &tinf))) {
+                if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(inf.waiters[i], &tinf))) {
                     result = NSK_FALSE;
                 } else {
                     NSK_DISPLAY3("\t\t%2d: %s (0x%p)\n",
                         i, tinf.name, inf.waiters[i]);
                     if (tinf.name != NULL) {
-                        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                                Deallocate, jvmti, (unsigned char*)tinf.name)))
+                        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)tinf.name)))
                             result = NSK_FALSE;
                     }
                 }
@@ -171,15 +157,13 @@ static int checkGetObjectMonitorUsage(jvmtiEnv* jvmti, JNIEnv* jni,
         if (inf.notify_waiter_count > 0) {
             NSK_DISPLAY0("\tnotify_waiters:\n");
             for (i = 0; i < inf.notify_waiter_count; i++) {
-                if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(
-                        GetThreadInfo, jvmti, inf.notify_waiters[i], &tinf))) {
+                if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(inf.notify_waiters[i], &tinf))) {
                     result = NSK_FALSE;
                 } else {
                     NSK_DISPLAY3("\t\t%2d: %s (0x%p)\n",
                         i, tinf.name, inf.notify_waiters[i]);
                     if (tinf.name != NULL) {
-                        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                                Deallocate, jvmti, (unsigned char*)tinf.name)))
+                        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)tinf.name)))
                             result = NSK_FALSE;
                     }
                 }
@@ -188,8 +172,7 @@ static int checkGetObjectMonitorUsage(jvmtiEnv* jvmti, JNIEnv* jni,
     }
 
     /* check owner to be debugee thread */
-    if (!NSK_JNI_VERIFY(jni, (NSK_CPP_STUB3(
-            IsSameObject, jni, inf.owner, thread)) == JNI_TRUE))
+    if (!NSK_JNI_VERIFY(jni, (jni->IsSameObject(inf.owner, thread)) == JNI_TRUE))
         result = NSK_FALSE;
 
     if (!NSK_VERIFY(inf.entry_count == 2))
@@ -203,13 +186,11 @@ static int checkGetObjectMonitorUsage(jvmtiEnv* jvmti, JNIEnv* jni,
 
     /* deallocate monitor waiters arrays */
     if (inf.waiters != NULL) {
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                Deallocate, jvmti, (unsigned char*)inf.waiters)))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)inf.waiters)))
             result = NSK_FALSE;
     }
     if (inf.notify_waiters != NULL) {
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                Deallocate, jvmti, (unsigned char*)inf.notify_waiters)))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)inf.notify_waiters)))
             result = NSK_FALSE;
     }
 
@@ -279,7 +260,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     /* add capabilities */
     memset(&caps, 0, sizeof(caps));
     caps.can_get_monitor_info = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp
index 53ce7aacb8c..853e2403903 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp
@@ -52,8 +52,7 @@ static jint findLineNumber(jvmtiEnv *jvmti, jthread thread) {
     jint line = 0;
     int i;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(
-            GetFrameLocation, jvmti, thread, 0, &method, &location)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetFrameLocation(thread, 0, &method, &location)))
         return 0;
 
     if (!NSK_VERIFY(method != NULL))
@@ -62,8 +61,7 @@ static jint findLineNumber(jvmtiEnv *jvmti, jthread thread) {
     if (!NSK_VERIFY(location != -1))
         return 0;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(
-            GetLineNumberTable, jvmti, method, &count, &table)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetLineNumberTable(method, &count, &table)))
         return 0;
 
     if (!NSK_VERIFY(table != NULL))
@@ -81,8 +79,7 @@ static jint findLineNumber(jvmtiEnv *jvmti, jthread thread) {
     line = table[i-1].line_number;
 
     if (table != NULL) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)table)))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)table)))
             return 0;
     }
 
@@ -108,8 +105,8 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj) {
     }
 
     /* check if event is for tested thread and object */
-    if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) &&
-            NSK_CPP_STUB3(IsSameObject, jni, object_M, obj)) {
+    if (jni->IsSameObject(thread, thr) &&
+            jni->IsSameObject(object_M, obj)) {
 
         if (!(line = findLineNumber(jvmti, thread))) {
             nsk_jvmti_setFailStatus();
@@ -152,8 +149,8 @@ MonitorContendedEntered(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj)
     }
 
     /* check if event is for tested thread and object */
-    if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) &&
-            NSK_CPP_STUB3(IsSameObject, jni, object_M, obj)) {
+    if (jni->IsSameObject(thread, thr) &&
+            jni->IsSameObject(object_M, obj)) {
 
         if (!(line = findLineNumber(jvmti, thread))) {
             nsk_jvmti_setFailStatus();
@@ -194,8 +191,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -207,8 +203,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -219,15 +214,13 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
 
         if (info.name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)info.name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)info.name)))
                 return NSK_FALSE;
         }
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     if (thread == NULL) {
@@ -236,39 +229,34 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* make thread accessable for a long time */
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'M' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "M", FIELD_SIG)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "M", FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (object_M =
-            NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M = jni->GetObjectField(thread, field)) != NULL))
         return NSK_FALSE;
 
     /* make object accessable for a long time */
-    if (!NSK_JNI_VERIFY(jni, (object_M =
-            NSK_CPP_STUB2(NewGlobalRef, jni, object_M)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M = jni->NewGlobalRef(object_M)) != NULL))
         return NSK_FALSE;
 
     /* enable MonitorContendedEntered event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
         return NSK_FALSE;
 
     /* enable MonitorContendedEntered event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -278,8 +266,8 @@ static int clean(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     /* disable MonitorContendedEntered event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_DISABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
         nsk_jvmti_setFailStatus();
 
     return NSK_TRUE;
@@ -364,15 +352,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_monitor_events = 1;
     caps.can_get_line_numbers = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.MonitorContendedEnter = &MonitorContendedEnter;
     callbacks.MonitorContendedEntered = &MonitorContendedEntered;
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp
index 91d2cab6995..9760e0c0207 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp
@@ -57,38 +57,32 @@ static int printDeadlock(jvmtiEnv* jvmti, JNIEnv* jni, int dThread) {
     NSK_DISPLAY1("Found deadlock #%d:\n", numberOfDeadlocks);
     for (pThread = dThread;;pThread = cThread) {
         NSK_DISPLAY1(" \"%s\":\n", threadList[pThread].name);
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetCurrentContendedMonitor,
-                jvmti, threadList[pThread].thread, &monitor)))
+        if (!NSK_JVMTI_VERIFY(
+                jvmti->GetCurrentContendedMonitor(threadList[pThread].thread, &monitor)))
             return NSK_FALSE;
         if (monitor != NULL) {
-            if (!NSK_JNI_VERIFY(jni, (klass =
-                    NSK_CPP_STUB2(GetObjectClass, jni, monitor)) != NULL))
+            if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(monitor)) != NULL))
                 return NSK_FALSE;
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(
-                    GetClassSignature, jvmti, klass, &name, NULL)))
+            if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(klass, &name, NULL)))
                 return NSK_FALSE;
             NSK_DISPLAY2("    waiting to lock %p (%s),\n", monitor, name);
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+            jvmti->Deallocate((unsigned char*)name);
         } else {
             NSK_DISPLAY0(" (JVMTI raw monitor),\n");
         }
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectMonitorUsage,
-                jvmti, monitor, &usageInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(monitor, &usageInfo)))
             return NSK_FALSE;
         if (usageInfo.owner == NULL)
             break;
         for (cThread = 0; cThread < threads_count; cThread++) {
-            if (NSK_CPP_STUB3(IsSameObject, jni,
-                    threadList[cThread].thread, usageInfo.owner))
+            if (jni->IsSameObject(threadList[cThread].thread, usageInfo.owner))
                 break;
         }
         if (usageInfo.waiters != NULL) {
-            NSK_CPP_STUB2(Deallocate, jvmti,
-                    (unsigned char*)usageInfo.waiters);
+            jvmti->Deallocate((unsigned char*)usageInfo.waiters);
         }
         if (usageInfo.notify_waiters != NULL) {
-            NSK_CPP_STUB2(Deallocate, jvmti,
-                    (unsigned char*)usageInfo.notify_waiters);
+            jvmti->Deallocate((unsigned char*)usageInfo.notify_waiters);
         }
         if (!NSK_VERIFY(cThread != threads_count))
             return NSK_FALSE;
@@ -113,15 +107,14 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Create threadList\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, jvmti,
-            threads_count*sizeof(threadDesc), (unsigned char**)&threadList)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->Allocate(threads_count*sizeof(threadDesc), (unsigned char**)&threadList)))
         return NSK_FALSE;
 
     for (i = 0; i < threads_count; i++) {
@@ -129,8 +122,7 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -141,8 +133,7 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* deallocate thread list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     for (i = 0; i < threads_count; i++) {
@@ -150,28 +141,24 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
             tDfn = gDfn;
             threadList[i].dfn = gDfn++;
             for (pThread = i;;pThread = cThread) {
-                if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetCurrentContendedMonitor,
-                        jvmti, threadList[pThread].thread, &monitor)))
+                if (!NSK_JVMTI_VERIFY(
+                        jvmti->GetCurrentContendedMonitor(threadList[pThread].thread, &monitor)))
                     return NSK_FALSE;
                 if (monitor == NULL)
                     break;
-                if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectMonitorUsage,
-                        jvmti, monitor, &usageInfo)))
+                if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(monitor, &usageInfo)))
                     return NSK_FALSE;
                 if (usageInfo.owner == NULL)
                     break;
                 for (cThread = 0; cThread < threads_count; cThread++) {
-                    if (NSK_CPP_STUB3(IsSameObject, jni,
-                            threadList[cThread].thread, usageInfo.owner))
+                    if (jni->IsSameObject(threadList[cThread].thread, usageInfo.owner))
                         break;
                 }
                 if (usageInfo.waiters != NULL) {
-                    NSK_CPP_STUB2(Deallocate, jvmti,
-                            (unsigned char*)usageInfo.waiters);
+                    jvmti->Deallocate((unsigned char*)usageInfo.waiters);
                 }
                 if (usageInfo.notify_waiters != NULL) {
-                    NSK_CPP_STUB2(Deallocate, jvmti,
-                            (unsigned char*)usageInfo.notify_waiters);
+                    jvmti->Deallocate((unsigned char*)usageInfo.notify_waiters);
                 }
                 if (!NSK_VERIFY(cThread != threads_count))
                     return NSK_FALSE;
@@ -194,8 +181,7 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
     /* deallocate thread names */
     for (i = 0; i < threads_count; i++) {
         if (threadList[i].name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)threadList[i].name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threadList[i].name)))
                 return NSK_FALSE;
         }
     }
@@ -261,7 +247,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(caps));
     caps.can_get_current_contended_monitor = 1;
     caps.can_get_monitor_info = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp
index 1217bf1e04a..f98c80c34c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp
@@ -57,38 +57,32 @@ static int printDeadlock(jvmtiEnv* jvmti, JNIEnv* jni, int dThread) {
     NSK_DISPLAY1("Found deadlock #%d:\n", numberOfDeadlocks);
     for (pThread = dThread;;pThread = cThread) {
         NSK_DISPLAY1(" \"%s\":\n", threadList[pThread].name);
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetCurrentContendedMonitor,
-                jvmti, threadList[pThread].thread, &monitor)))
+        if (!NSK_JVMTI_VERIFY(
+                jvmti->GetCurrentContendedMonitor(threadList[pThread].thread, &monitor)))
             return NSK_FALSE;
         if (monitor != NULL) {
-            if (!NSK_JNI_VERIFY(jni, (klass =
-                    NSK_CPP_STUB2(GetObjectClass, jni, monitor)) != NULL))
+            if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(monitor)) != NULL))
                 return NSK_FALSE;
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(
-                    GetClassSignature, jvmti, klass, &name, NULL)))
+            if (!NSK_JVMTI_VERIFY(jvmti->GetClassSignature(klass, &name, NULL)))
                 return NSK_FALSE;
             NSK_DISPLAY2("    waiting to lock %p (%s),\n", monitor, name);
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+            jvmti->Deallocate((unsigned char*)name);
         } else {
             NSK_DISPLAY0(" (JVMTI raw monitor),\n");
         }
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectMonitorUsage,
-                jvmti, monitor, &usageInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(monitor, &usageInfo)))
             return NSK_FALSE;
         if (usageInfo.owner == NULL)
             break;
         for (cThread = 0; cThread < threads_count; cThread++) {
-            if (NSK_CPP_STUB3(IsSameObject, jni,
-                    threadList[cThread].thread, usageInfo.owner))
+            if (jni->IsSameObject(threadList[cThread].thread, usageInfo.owner))
                 break;
         }
         if (usageInfo.waiters != NULL) {
-            NSK_CPP_STUB2(Deallocate, jvmti,
-                    (unsigned char*)usageInfo.waiters);
+            jvmti->Deallocate((unsigned char*)usageInfo.waiters);
         }
         if (usageInfo.notify_waiters != NULL) {
-            NSK_CPP_STUB2(Deallocate, jvmti,
-                    (unsigned char*)usageInfo.notify_waiters);
+            jvmti->Deallocate((unsigned char*)usageInfo.notify_waiters);
         }
         if (!NSK_VERIFY(cThread != threads_count))
             return NSK_FALSE;
@@ -113,15 +107,14 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Create threadList\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(Allocate, jvmti,
-            threads_count*sizeof(threadDesc), (unsigned char**)&threadList)))
+    if (!NSK_JVMTI_VERIFY(
+            jvmti->Allocate(threads_count*sizeof(threadDesc), (unsigned char**)&threadList)))
         return NSK_FALSE;
 
     for (i = 0; i < threads_count; i++) {
@@ -129,8 +122,7 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -141,8 +133,7 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* deallocate thread list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     for (i = 0; i < threads_count; i++) {
@@ -150,28 +141,24 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
             tDfn = gDfn;
             threadList[i].dfn = gDfn++;
             for (pThread = i;;pThread = cThread) {
-                if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetCurrentContendedMonitor,
-                        jvmti, threadList[pThread].thread, &monitor)))
+                if (!NSK_JVMTI_VERIFY(
+                        jvmti->GetCurrentContendedMonitor(threadList[pThread].thread, &monitor)))
                     return NSK_FALSE;
                 if (monitor == NULL)
                     break;
-                if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectMonitorUsage,
-                        jvmti, monitor, &usageInfo)))
+                if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(monitor, &usageInfo)))
                     return NSK_FALSE;
                 if (usageInfo.owner == NULL)
                     break;
                 for (cThread = 0; cThread < threads_count; cThread++) {
-                    if (NSK_CPP_STUB3(IsSameObject, jni,
-                            threadList[cThread].thread, usageInfo.owner))
+                    if (jni->IsSameObject(threadList[cThread].thread, usageInfo.owner))
                         break;
                 }
                 if (usageInfo.waiters != NULL) {
-                    NSK_CPP_STUB2(Deallocate, jvmti,
-                            (unsigned char*)usageInfo.waiters);
+                    jvmti->Deallocate((unsigned char*)usageInfo.waiters);
                 }
                 if (usageInfo.notify_waiters != NULL) {
-                    NSK_CPP_STUB2(Deallocate, jvmti,
-                            (unsigned char*)usageInfo.notify_waiters);
+                    jvmti->Deallocate((unsigned char*)usageInfo.notify_waiters);
                 }
                 if (!NSK_VERIFY(cThread != threads_count))
                     return NSK_FALSE;
@@ -194,8 +181,7 @@ static int findDeadlockThreads(jvmtiEnv* jvmti, JNIEnv* jni) {
     /* deallocate thread names */
     for (i = 0; i < threads_count; i++) {
         if (threadList[i].name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)threadList[i].name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threadList[i].name)))
                 return NSK_FALSE;
         }
     }
@@ -261,7 +247,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(caps));
     caps.can_get_current_contended_monitor = 1;
     caps.can_get_monitor_info = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp
index 1203bc36139..325f47eda1e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp
@@ -44,14 +44,14 @@ static jrawMonitorID syncLock = NULL;
 
 
 static jboolean lockSyncLock(jvmtiEnv* jvmti) {
-    jboolean status = NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock));
+    jboolean status = NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock));
     if (!status)
         nsk_jvmti_setFailStatus();
     return status;
 }
 
 static void unlockSyncLock(jvmtiEnv* jvmti) {
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 }
 
@@ -73,7 +73,7 @@ MonitorWait(jvmtiEnv *jvmti, JNIEnv* jni,
     }
 
     /* check if event is for tested object */
-    if (NSK_CPP_STUB3(IsInstanceOf, jni, obj, object_M)) {
+    if (jni->IsInstanceOf(obj, object_M)) {
         if (lockSyncLock(jvmti)) {
             waitEventsCount++;
             unlockSyncLock(jvmti);
@@ -96,7 +96,7 @@ MonitorWaited(jvmtiEnv *jvmti, JNIEnv* jni,
     }
 
     /* check if event is for tested object */
-    if (NSK_CPP_STUB3(IsInstanceOf, jni, obj, object_M)) {
+    if (jni->IsInstanceOf(obj, object_M)) {
         if (lockSyncLock(jvmti)) {
             waitedEventsCount++;
             unlockSyncLock(jvmti);
@@ -118,7 +118,7 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj) {
     }
 
     /* check if event is for tested object */
-    if (NSK_CPP_STUB3(IsSameObject, jni, object_M, obj)) {
+    if (jni->IsSameObject(object_M, obj)) {
         jvmtiMonitorUsage usageInfo;
 
         if (lockSyncLock(jvmti)) {
@@ -126,12 +126,10 @@ MonitorContendedEnter(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj) {
             unlockSyncLock(jvmti);
         }
 
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetObjectMonitorUsage,
-                jvmti, obj, &usageInfo))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetObjectMonitorUsage(obj, &usageInfo))) {
             nsk_jvmti_setFailStatus();
         } else if (usageInfo.owner != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    InterruptThread, jvmti, usageInfo.owner)))
+            if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(usageInfo.owner)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -151,7 +149,7 @@ MonitorContendedEntered(jvmtiEnv *jvmti, JNIEnv* jni, jthread thr, jobject obj)
     }
 
     /* check if event is for tested object */
-    if (NSK_CPP_STUB3(IsSameObject, jni, object_M, obj)) {
+    if (jni->IsSameObject(object_M, obj)) {
         if (lockSyncLock(jvmti)) {
             enteredEventsCount++;
             unlockSyncLock(jvmti);
@@ -166,40 +164,35 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     NSK_DISPLAY0("Obtain tested object from debugee thread class\n");
 
-    if (!NSK_JNI_VERIFY(jni, (object_M =
-            NSK_CPP_STUB2(FindClass, jni, CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M = jni->FindClass(CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (object_M = (jclass)
-            NSK_CPP_STUB2(NewGlobalRef, jni, object_M)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M = (jclass)jni->NewGlobalRef(object_M)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock)))
         return NSK_FALSE;
 
     /* enable MonitorWait event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_WAIT, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* enable MonitorWaited event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_WAITED, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* enable MonitorContendedEnter event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* enable MonitorContendedEntered event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
         nsk_jvmti_setFailStatus();
 
     return NSK_TRUE;
@@ -209,30 +202,27 @@ static int clean(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     /* disable MonitorWait event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_WAIT, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* disable MonitorWaited event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_WAITED, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* disable MonitorContendedEnter event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_DISABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* disable MonitorContendedEntered event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_DISABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
     return NSK_TRUE;
@@ -336,7 +326,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     caps.can_generate_monitor_events = 1;
     caps.can_get_monitor_info = 1;
     caps.can_signal_thread = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     memset(&callbacks, 0, sizeof(callbacks));
@@ -344,8 +334,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     callbacks.MonitorWaited = &MonitorWaited;
     callbacks.MonitorContendedEnter = &MonitorContendedEnter;
     callbacks.MonitorContendedEntered = &MonitorContendedEntered;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-            &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
index 2d4990ae87d..ff46d671ab0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
@@ -72,14 +72,12 @@ MonitorWait(jvmtiEnv *jvmti, JNIEnv* jni,
     }
 
     /* check if event is for tested thread and object */
-    if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) &&
-            NSK_CPP_STUB3(IsSameObject, jni, object_M, obj)) {
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(
-                GetThreadCpuTime, jvmti, thr, &waitThreadCpuTime))) {
+    if (jni->IsSameObject(thread, thr) &&
+            jni->IsSameObject(object_M, obj)) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTime(thr, &waitThreadCpuTime))) {
             nsk_jvmti_setFailStatus();
         }
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(GetTime, jvmti, &waitTime))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetTime(&waitTime))) {
             nsk_jvmti_setFailStatus();
         }
         waitEventsCount++;
@@ -113,14 +111,12 @@ MonitorWaited(jvmtiEnv *jvmti, JNIEnv* jni,
     }
 
     /* check if event is for tested thread and object */
-    if (NSK_CPP_STUB3(IsSameObject, jni, thread, thr) &&
-            NSK_CPP_STUB3(IsSameObject, jni, object_M, obj)) {
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(
-                GetThreadCpuTime, jvmti, thr, &waitedThreadCpuTime))) {
+    if (jni->IsSameObject(thread, thr) &&
+            jni->IsSameObject(object_M, obj)) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadCpuTime(thr, &waitedThreadCpuTime))) {
             nsk_jvmti_setFailStatus();
         }
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(GetTime, jvmti, &waitedTime))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetTime(&waitedTime))) {
             nsk_jvmti_setFailStatus();
         }
         waitedEventsCount++;
@@ -149,8 +145,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -162,8 +157,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -174,15 +168,13 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
 
         if (info.name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)info.name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)info.name)))
                 return NSK_FALSE;
         }
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     if (thread == NULL) {
@@ -191,39 +183,32 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* make thread accessable for a long time */
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'M' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "M", FIELD_SIG)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "M", FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (object_M =
-            NSK_CPP_STUB3(GetObjectField, jni, thread, field)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M = jni->GetObjectField(thread, field)) != NULL))
         return NSK_FALSE;
 
     /* make object accessable for a long time */
-    if (!NSK_JNI_VERIFY(jni, (object_M =
-            NSK_CPP_STUB2(NewGlobalRef, jni, object_M)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (object_M = jni->NewGlobalRef(object_M)) != NULL))
         return NSK_FALSE;
 
     /* enable MonitorWait event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_WAIT, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
         return NSK_FALSE;
 
     /* enable MonitorWaited event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                JVMTI_EVENT_MONITOR_WAITED, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -233,14 +218,12 @@ static int clean(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     /* disable MonitorWait event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_WAIT, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* disable MonitorWaited event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_WAITED, NULL)))
+            jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
         nsk_jvmti_setFailStatus();
 
     return NSK_TRUE;
@@ -343,14 +326,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_monitor_events = 1;
     caps.can_get_thread_cpu_time = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     memset(&callbacks, 0, sizeof(callbacks));
     callbacks.MonitorWait = &MonitorWait;
     callbacks.MonitorWaited = &MonitorWaited;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-            &callbacks, sizeof(callbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp
index 5f4ba6ca666..207d22ff17f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp
@@ -54,12 +54,12 @@ static jvmtiPhase currentPhase;
 static void
 changeCount(jvmtiEvent event) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     eventCount[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -92,9 +92,7 @@ classEventsHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
     char *generic;
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetClassSignature, jvmti_env, klass,
-                                &className, &generic))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &className, &generic))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -107,7 +105,7 @@ classEventsHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
                             className);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -125,13 +123,11 @@ classEventsHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)className))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)className))) {
         nsk_jvmti_setFailStatus();
     }
     if (generic != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)generic))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)generic))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -145,15 +141,12 @@ threadEventHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
     jvmtiPhase phase;
 
 
-    if (!NSK_JNI_VERIFY(jni_env, (classObject =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, thread)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (classObject = jni_env->GetObjectClass(thread)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetClassSignature, jvmti_env, classObject,
-                                &className, &generic))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(classObject, &className, &generic))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -166,7 +159,7 @@ threadEventHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
                             className);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -184,13 +177,11 @@ threadEventHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)className))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)className))) {
         nsk_jvmti_setFailStatus();
     }
     if (generic != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)generic))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)generic))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -200,7 +191,7 @@ cbVMStart(jvmtiEnv* jvmti_env, JNIEnv* jni_env) {
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -221,7 +212,7 @@ cbVMInit(jvmtiEnv* jvmti_env, JNIEnv* jni_env, jthread thread) {
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -242,7 +233,7 @@ cbVMDeath(jvmtiEnv* jvmti_env, JNIEnv* jni_env) {
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -257,8 +248,7 @@ cbVMDeath(jvmtiEnv* jvmti_env, JNIEnv* jni_env) {
     currentPhase = JVMTI_PHASE_DEAD;
     changeCount(JVMTI_EVENT_VM_DEATH);
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -294,9 +284,7 @@ cbThreadEnd(jvmtiEnv* jvmti_env, JNIEnv* jni_env, jthread thread) {
 static int
 enableEvent(jvmtiEventMode enable, jvmtiEvent event) {
     NSK_DISPLAY1("enabling %s\n", TranslateEvent(event));
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, enable,
-                                            event, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(enable, event, NULL))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -369,10 +357,7 @@ setCallBacks() {
     eventCallbacks.ThreadStart  = cbThreadStart;
     eventCallbacks.ThreadEnd    = cbThreadEnd;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -446,8 +431,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp
index d04231d6ece..5f2bf1b0766 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp
@@ -65,22 +65,20 @@ Java_nsk_jvmti_scenarios_events_EM01_em01t002_loadClass(JNIEnv *jni_env,
     jmethodID methodID;
     jclass loadedClass;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, loader)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(loader)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NULL;
     }
 
-    if (!NSK_JNI_VERIFY(jni_env, (methodID =
-            NSK_CPP_STUB4(GetMethodID, jni_env, klass, "loadClass",
-                        "(Ljava/lang/String;)Ljava/lang/Class;")) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env,
+            (methodID = jni_env->GetMethodID(
+                klass, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;")) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NULL;
     }
 
     if (!NSK_JNI_VERIFY(jni_env, (loadedClass = (jclass)
-            NSK_CPP_STUB4(CallObjectMethod, jni_env, loader, methodID,
-                                    className)) != NULL)) {
+            jni_env->CallObjectMethod(loader, methodID, className)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NULL;
     }
@@ -99,8 +97,7 @@ Java_nsk_jvmti_scenarios_events_EM01_em01t002_prepareClass(JNIEnv *jni_env,
     jfieldID fieldID;
 
     if (!NSK_JNI_VERIFY(jni_env, (fieldID =
-            NSK_CPP_STUB4(GetStaticFieldID, jni_env, klass,
-                        "toProvokePreparation", "I")) != NULL)) {
+            jni_env->GetStaticFieldID(klass, "toProvokePreparation", "I")) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -119,20 +116,18 @@ Java_nsk_jvmti_scenarios_events_EM01_em01t002_startThread(JNIEnv *jni_env,
     jclass klass;
     jmethodID methodID;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, thread)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(thread)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
 
     if (!NSK_JNI_VERIFY(jni_env, (methodID =
-            NSK_CPP_STUB4(GetMethodID, jni_env, klass, "start", "()V")) != NULL)) {
+            jni_env->GetMethodID(klass, "start", "()V")) != NULL)) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
 
-    if (!NSK_JNI_VERIFY_VOID(jni_env,
-            NSK_CPP_STUB3(CallVoidMethod, jni_env, thread, methodID)) ) {
+    if (!NSK_JNI_VERIFY_VOID(jni_env,jni_env->CallVoidMethod(thread, methodID)) ) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -146,12 +141,12 @@ Java_nsk_jvmti_scenarios_events_EM01_em01t002_startThread(JNIEnv *jni_env,
 static void
 changeCount(jvmtiEvent event) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     eventCount[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -184,9 +179,7 @@ classEventsHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
     char *generic;
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetClassSignature, jvmti_env, klass,
-                                &className, &generic))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &className, &generic))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -199,7 +192,7 @@ classEventsHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
                             className);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -217,13 +210,11 @@ classEventsHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)className))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)className))) {
         nsk_jvmti_setFailStatus();
     }
     if (generic != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)generic))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)generic))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -237,15 +228,12 @@ threadEventHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
     jvmtiPhase phase;
 
 
-    if (!NSK_JNI_VERIFY(jni_env, (classObject =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, thread)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (classObject = jni_env->GetObjectClass(thread)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetClassSignature, jvmti_env, classObject,
-                                &className, &generic))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(classObject, &className, &generic))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -258,7 +246,7 @@ threadEventHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
                             className);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -276,13 +264,11 @@ threadEventHandler(jvmtiEvent event, jvmtiEnv* jvmti_env, JNIEnv* jni_env,
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)className))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)className))) {
         nsk_jvmti_setFailStatus();
     }
     if (generic != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)generic))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)generic))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -292,7 +278,7 @@ cbVMStart(jvmtiEnv* jvmti_env, JNIEnv* jni_env) {
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -313,7 +299,7 @@ cbVMInit(jvmtiEnv* jvmti_env, JNIEnv* jni_env, jthread thread) {
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -334,7 +320,7 @@ cbVMDeath(jvmtiEnv* jvmti_env, JNIEnv* jni_env) {
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -349,8 +335,7 @@ cbVMDeath(jvmtiEnv* jvmti_env, JNIEnv* jni_env) {
     currentPhase = JVMTI_PHASE_DEAD;
     changeCount(JVMTI_EVENT_VM_DEATH);
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -393,9 +378,7 @@ enableEvent(jvmtiEventMode enable, jvmtiEvent event) {
     }
 
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, enable,
-                                            event, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(enable, event, NULL))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -468,10 +451,7 @@ setCallBacks() {
     eventCallbacks.ThreadStart  = cbThreadStart;
     eventCallbacks.ThreadEnd    = cbThreadEnd;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -544,8 +524,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp
index 8260374f4b4..fe6fbf6972e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp
@@ -68,8 +68,7 @@ findThread(const char *threadName) {
     int i;
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NULL;
 
     if (!NSK_VERIFY(threads != NULL))
@@ -81,8 +80,7 @@ findThread(const char *threadName) {
             break;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             break;
 
         /* find by name */
@@ -92,8 +90,7 @@ findThread(const char *threadName) {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NULL;
 
     return returnValue;
@@ -108,16 +105,14 @@ getStaticObjField(const char* className, const char* objFieldName,
     jfieldID fieldID;
     jclass klass = NULL;
 
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(FindClass, jni, className)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->FindClass(className)) != NULL))
         return NULL;
 
     if (!NSK_JNI_VERIFY(jni, (fieldID =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, klass, objFieldName,
-                                signature)) != NULL))
+            jni->GetStaticFieldID(klass, objFieldName, signature)) != NULL))
         return NULL;
 
-    return NSK_CPP_STUB3(GetStaticObjectField, jni, klass, fieldID);
+    return jni->GetStaticObjectField(klass, fieldID);
 }
 
 /* ============================================================================= */
@@ -130,8 +125,7 @@ static int prepare() {
     }
 
     /* make thread accessable for a long time */
-    if (!NSK_JNI_VERIFY(jni, (mainThread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, mainThread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (mainThread = jni->NewGlobalRef(mainThread)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_VERIFY((startObject =
@@ -140,8 +134,7 @@ static int prepare() {
         return NSK_FALSE;
 
     /*make object accessable for a long time*/
-    if (!NSK_JNI_VERIFY(jni, (startObject =
-            NSK_CPP_STUB2(NewGlobalRef, jni, startObject)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (startObject = jni->NewGlobalRef(startObject)) != NULL))
         return NSK_FALSE;
 
 
@@ -151,8 +144,7 @@ static int prepare() {
         return NSK_FALSE;
 
     /*make object accessable for a long time*/
-    if (!NSK_JNI_VERIFY(jni, (endObject =
-            NSK_CPP_STUB2(NewGlobalRef, jni, endObject)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (endObject = jni->NewGlobalRef(endObject)) != NULL))
         return NSK_FALSE;
 
 
@@ -162,8 +154,7 @@ static int prepare() {
         return NSK_FALSE;
 
     /* make thread accessable for a long time */
-    if (!NSK_JNI_VERIFY(jni, (debuggeeThread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, debuggeeThread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debuggeeThread = jni->NewGlobalRef(debuggeeThread)) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -176,15 +167,15 @@ clean() {
 
     /* disable MonitorContendedEnter event */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+            jvmti->SetEventNotificationMode(
+                JVMTI_DISABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* dispose global references */
-    NSK_CPP_STUB2(DeleteGlobalRef, jni, startObject);
-    NSK_CPP_STUB2(DeleteGlobalRef, jni, endObject);
-    NSK_CPP_STUB2(DeleteGlobalRef, jni, debuggeeThread);
-    NSK_CPP_STUB2(DeleteGlobalRef, jni, mainThread);
+    jni->DeleteGlobalRef(startObject);
+    jni->DeleteGlobalRef(endObject);
+    jni->DeleteGlobalRef(debuggeeThread);
+    jni->DeleteGlobalRef(mainThread);
 
     startObject = NULL;
     endObject = NULL;
@@ -219,8 +210,7 @@ showEventStatistics(int step /*int *currentCounts*/) {
 static void
 showThreadInfo(jthread thread) {
     jvmtiThreadInfo info;
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &info)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &info)))
         return;
 
     NSK_DISPLAY2("\tthread (%s): %p\n", info.name, thread);
@@ -231,12 +221,12 @@ showThreadInfo(jthread thread) {
 static void
 changeCount(jvmtiEvent event, int *currentCounts) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -327,8 +317,7 @@ cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -420,13 +409,13 @@ handlerMC1(jvmtiEvent event, jvmtiEnv* jvmti, JNIEnv* jni_env,
         return;
 
     /* check if event is for tested thread and for tested object */
-    if (NSK_CPP_STUB3(IsSameObject, jni_env, expectedThread, thread) &&
-            NSK_CPP_STUB3(IsSameObject, jni_env, expectedObject, object)) {
+    if (jni_env->IsSameObject(expectedThread, thread) &&
+            jni_env->IsSameObject(expectedObject, object)) {
 
         NSK_DISPLAY1("--->%-40s is received\n", TranslateEvent(event));
 
         showThreadInfo(thread);
-        if (NSK_CPP_STUB3(IsSameObject, jni_env, expectedObject, endObject))
+        if (jni_env->IsSameObject(expectedObject, endObject))
             NSK_DISPLAY0("\tobject: 'endingMonitor'\n");
         else
             NSK_DISPLAY0("\tobject: 'startingMonitor'\n");
@@ -506,13 +495,13 @@ handlerMC2(jvmtiEvent event, jvmtiEnv* jvmti, JNIEnv* jni_env,
         return;
 
     /* check if event is for tested thread and for tested object */
-    if (NSK_CPP_STUB3(IsSameObject, jni_env, expectedThread, thread) &&
-            NSK_CPP_STUB3(IsSameObject, jni_env, expectedObject, object)) {
+    if (jni_env->IsSameObject(expectedThread, thread) &&
+            jni_env->IsSameObject(expectedObject, object)) {
 
         NSK_DISPLAY1("--->%-40s is received (new callbacks)\n", TranslateEvent(event));
 
         showThreadInfo(thread);
-        if (NSK_CPP_STUB3(IsSameObject, jni_env, expectedObject, endObject))
+        if (jni_env->IsSameObject(expectedObject, endObject))
             NSK_DISPLAY0("\tobject: 'endingMonitor'\n");
         else
             NSK_DISPLAY0("\tobject: 'startingMonitor'\n");
@@ -572,16 +561,13 @@ static int enableEvent(jvmtiEvent event) {
             && (event != JVMTI_EVENT_MONITOR_WAIT)
             && (event != JVMTI_EVENT_MONITOR_WAITED)) {
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+                jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
         }
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
@@ -679,10 +665,7 @@ setCallBacks(int step) {
             break;
 
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -771,8 +754,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
@@ -782,7 +764,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_generate_monitor_events = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp
index 9e8215d7516..7b86f45cc34 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp
@@ -150,12 +150,12 @@ int checkEvents(int step) {
 static void
 changeCount(jvmtiEvent event, int *currentCounts) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -177,8 +177,7 @@ cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
     if (!checkEvents(STEP_AMOUNT))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -345,16 +344,13 @@ static int enableEvent(jvmtiEvent event) {
             && (event != JVMTI_EVENT_GARBAGE_COLLECTION_START)
             && (event != JVMTI_EVENT_GARBAGE_COLLECTION_FINISH)) {
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+                jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
         }
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
@@ -450,10 +446,7 @@ setCallBacks(int step) {
             break;
 
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -519,8 +512,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
@@ -530,7 +522,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_generate_garbage_collection_events = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
index 2de5affa16a..b541f230913 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
@@ -134,12 +134,12 @@ int checkEvents(int step) {
 static void
 changeCount(jvmtiEvent event, int *currentCounts) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -159,8 +159,7 @@ cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
     if (!checkEvents(STEP_AMOUNT))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -265,9 +264,7 @@ handlerMC1(jvmtiEvent event, jvmtiEnv* jvmti, jmethodID method) {
     char *sign;
     char *genc;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(
-                GetMethodName, jvmti, method, &name, &sign, &genc))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(method, &name, &sign, &genc))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -277,17 +274,14 @@ handlerMC1(jvmtiEvent event, jvmtiEnv* jvmti, jmethodID method) {
         changeCount(event, &eventCount[0]);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti, (unsigned char*)name))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)name))) {
         nsk_jvmti_setFailStatus();
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti, (unsigned char*)sign))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)sign))) {
         nsk_jvmti_setFailStatus();
     }
     if (genc != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti, (unsigned char*)genc))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)genc))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -338,9 +332,7 @@ handlerMC2(jvmtiEvent event, jvmtiEnv* jvmti, jmethodID method) {
     char *sign;
     char *genc;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(
-                GetMethodName, jvmti, method, &name, &sign, &genc))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(method, &name, &sign, &genc))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -348,17 +340,14 @@ handlerMC2(jvmtiEvent event, jvmtiEnv* jvmti, jmethodID method) {
     NSK_DISPLAY2("\tMethod: %s, signature: %s\n", name, sign);
     changeCount(event, &newEventCount[0]);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti, (unsigned char*)name))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)name))) {
         nsk_jvmti_setFailStatus();
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti, (unsigned char*)sign))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)sign))) {
         nsk_jvmti_setFailStatus();
     }
     if (genc != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti, (unsigned char*)genc))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)genc))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -389,16 +378,13 @@ static int enableEvent(jvmtiEvent event) {
             && (event != JVMTI_EVENT_COMPILED_METHOD_LOAD)
             && (event != JVMTI_EVENT_COMPILED_METHOD_UNLOAD)) {
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+                jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
         }
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
@@ -498,10 +484,7 @@ setCallBacks(int step) {
             break;
 
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -568,8 +551,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
@@ -579,7 +561,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_generate_compiled_method_load_events = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp
index e2fac4a7c3f..194bc6c9ef9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp
@@ -146,12 +146,12 @@ int checkEvents(int step) {
 static void
 changeCount(jvmtiEvent event, int *currentCounts) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -171,8 +171,7 @@ cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
     if (!checkEvents(STEP_AMOUNT))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -310,7 +309,7 @@ cbNativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env,jthread thread,
     char *genc;
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -318,9 +317,7 @@ cbNativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env,jthread thread,
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(
-                GetMethodName, jvmti_env, method, &name, &sign, &genc))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sign, &genc))) {
         return;
     }
 
@@ -331,17 +328,14 @@ cbNativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env,jthread thread,
         changeCount(JVMTI_EVENT_NATIVE_METHOD_BIND, &eventCount[0]);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)name))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)name))) {
         nsk_jvmti_setFailStatus();
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)sign))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)sign))) {
         nsk_jvmti_setFailStatus();
     }
     if (genc != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)genc))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)genc))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -355,7 +349,7 @@ cbNewNativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env,jthread thread,
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -363,9 +357,7 @@ cbNewNativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env,jthread thread,
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB5(
-                GetMethodName, jvmti_env, method, &name, &sign, &genc))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sign, &genc))) {
         return;
     }
 
@@ -376,17 +368,14 @@ cbNewNativeMethodBind(jvmtiEnv *jvmti_env, JNIEnv* jni_env,jthread thread,
         changeCount(JVMTI_EVENT_NATIVE_METHOD_BIND, &newEventCount[0]);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)name))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)name))) {
         nsk_jvmti_setFailStatus();
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)sign))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)sign))) {
         nsk_jvmti_setFailStatus();
     }
     if (genc != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)genc))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)genc))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -398,16 +387,13 @@ static int enableEvent(jvmtiEvent event) {
     if (nsk_jvmti_isOptionalEvent(event)
             && (event != JVMTI_EVENT_NATIVE_METHOD_BIND)) {
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+                jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
         }
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
@@ -505,10 +491,7 @@ setCallBacks(int step) {
             break;
 
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -574,8 +557,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY((jvmti = nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
@@ -585,7 +567,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_generate_native_method_bind_events = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp
index e6dd2fc70e4..ee9a28eb1cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp
@@ -133,12 +133,12 @@ int checkEvents(int step) {
 static void
 changeCount(jvmtiEvent event, int *currentCounts) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(syncLock)))
         nsk_jvmti_setFailStatus();
 
     currentCounts[event - JVMTI_MIN_EVENT_TYPE_VAL]++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -158,8 +158,7 @@ cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
     if (!checkEvents(STEP_NUMBER))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(DestroyRawMonitor, jvmti, syncLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock)))
         nsk_jvmti_setFailStatus();
 
 }
@@ -302,9 +301,7 @@ cbVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetClassSignature, jvmti_env, object_klass,
-                                &sign_ptr, &gen_ptr))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(object_klass, &sign_ptr, &gen_ptr))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -313,7 +310,7 @@ cbVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
         changeCount(JVMTI_EVENT_VM_OBJECT_ALLOC, &eventCount[0]);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -326,13 +323,11 @@ cbVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)sign_ptr))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)sign_ptr))) {
         nsk_jvmti_setFailStatus();
     }
     if (gen_ptr != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)gen_ptr))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)gen_ptr))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -346,9 +341,7 @@ cbNewVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
 
     jvmtiPhase phase;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB4(GetClassSignature, jvmti_env, object_klass,
-                                &sign_ptr, &gen_ptr))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(object_klass, &sign_ptr, &gen_ptr))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -357,7 +350,7 @@ cbNewVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
         changeCount(JVMTI_EVENT_VM_OBJECT_ALLOC, &newEventCount[0]);
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(GetPhase, jvmti_env, &phase))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -370,13 +363,11 @@ cbNewVMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
         nsk_jvmti_setFailStatus();
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-            jvmti_env, (unsigned char*)sign_ptr))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)sign_ptr))) {
         nsk_jvmti_setFailStatus();
     }
     if (gen_ptr != NULL)
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(Deallocate,
-                jvmti_env, (unsigned char*)gen_ptr))) {
+        if (!NSK_JVMTI_VERIFY(jvmti_env->Deallocate((unsigned char*)gen_ptr))) {
             nsk_jvmti_setFailStatus();
         }
 }
@@ -388,16 +379,13 @@ static int enableEvent(jvmtiEvent event) {
     if (nsk_jvmti_isOptionalEvent(event)
             && (event != JVMTI_EVENT_VM_OBJECT_ALLOC)) {
         if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_MUST_POSSESS_CAPABILITY,
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+                jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
         }
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti,
-                    JVMTI_ENABLE, event, NULL))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, event, NULL))) {
             NSK_COMPLAIN1("Unexpected error enabling %s\n",
                 TranslateEvent(event));
             return NSK_FALSE;
@@ -490,10 +478,7 @@ setCallBacks(int step) {
             break;
 
     }
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                &eventCallbacks,
-                                sizeof(eventCallbacks))))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -553,8 +538,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         return JNI_ERR;
 
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "_syncLock", &syncLock))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("_syncLock", &syncLock))) {
         nsk_jvmti_setFailStatus();
         return JNI_ERR;
     }
@@ -564,7 +548,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
 
         caps.can_generate_vm_object_alloc_events = 1;
-        if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 

From b35e7feb5a6d0d3d606aa15be69192829617a24f Mon Sep 17 00:00:00 2001
From: Christian Tornqvist 
Date: Wed, 10 Oct 2018 11:47:01 -0700
Subject: [PATCH 072/124] 8212008: Use of TREAT_EXIT_CODE_1_AS_0 hide problems
 with jtreg Java

Reviewed-by: erikj
---
 test/hotspot/jtreg/Makefile | 2 --
 test/jdk/Makefile           | 2 --
 2 files changed, 4 deletions(-)

diff --git a/test/hotspot/jtreg/Makefile b/test/hotspot/jtreg/Makefile
index 820527c8ca1..a512ddfb843 100644
--- a/test/hotspot/jtreg/Makefile
+++ b/test/hotspot/jtreg/Makefile
@@ -24,8 +24,6 @@
 
 NATIVE_TEST_PATH := hotspot/jtreg/native
 
-TREAT_EXIT_CODE_1_AS_0 := true
-
 CLEAN_BEFORE_PREP := true
 
 USE_JTREG_VERSION := 4.1
diff --git a/test/jdk/Makefile b/test/jdk/Makefile
index d02c0ed513c..5ccfd3fc9a5 100644
--- a/test/jdk/Makefile
+++ b/test/jdk/Makefile
@@ -29,8 +29,6 @@ NATIVE_TEST_PATH := jdk/jtreg/native
 
 USE_FAILURE_HANDLER := true
 
-TREAT_EXIT_CODE_1_AS_0 := true
-
 include ../TestCommon.gmk
 
 # Default make rule (runs default jdk tests)

From dde89f72dfc3b3b81aca716ba070db1515fe7c68 Mon Sep 17 00:00:00 2001
From: Sean Mullan 
Date: Wed, 10 Oct 2018 15:23:38 -0400
Subject: [PATCH 073/124] 8211878: Bad/broken links in
 docs/api/java.xml.crypto/javax/xml/crypto/dsig/Reference.html

Reviewed-by: jjg
---
 .../share/classes/javax/xml/crypto/dsig/Reference.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java
index 6f3ce617317..dfa34796fb6 100644
--- a/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java
+++ b/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,7 +144,7 @@ public interface Reference extends URIReference, XMLStructure {
 
     /**
      * Returns the dereferenced data, if
-     * reference caching
+     * reference caching
      * is enabled. This is the result of dereferencing the URI of this
      * reference during a validation or generation operation.
      *
@@ -156,7 +156,7 @@ public interface Reference extends URIReference, XMLStructure {
 
     /**
      * Returns the pre-digested input stream, if
-     * reference caching
+     * reference caching
      * is enabled. This is the input to the digest operation during a
      * validation or signing operation.
      *

From d9731f0c549f453bbc6556b29479974c679c9bef Mon Sep 17 00:00:00 2001
From: Sean Mullan 
Date: Wed, 10 Oct 2018 16:25:40 -0400
Subject: [PATCH 074/124] 8191053: Provide a mechanism to make system's
 security manager immutable

Make System.setSecurityManager optional to support and add new disallow and allow options to the java.security.manager system property

Reviewed-by: alanb, mchung, rriggs, smarks
---
 .../classes/java/lang/SecurityManager.java    | 102 ++++++++++++-
 .../share/classes/java/lang/System.java       | 138 ++++++++++++------
 .../lang/System/AllowSecurityManager.java     |  53 +++++++
 3 files changed, 239 insertions(+), 54 deletions(-)
 create mode 100644 test/jdk/java/lang/System/AllowSecurityManager.java

diff --git a/src/java.base/share/classes/java/lang/SecurityManager.java b/src/java.base/share/classes/java/lang/SecurityManager.java
index 74da4daeda5..dc1b46e2372 100644
--- a/src/java.base/share/classes/java/lang/SecurityManager.java
+++ b/src/java.base/share/classes/java/lang/SecurityManager.java
@@ -28,7 +28,6 @@ package java.lang;
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleDescriptor.Exports;
 import java.lang.module.ModuleDescriptor.Opens;
-import java.lang.module.ModuleReference;
 import java.lang.reflect.Member;
 import java.io.FileDescriptor;
 import java.io.File;
@@ -47,9 +46,7 @@ import java.util.Objects;
 import java.util.PropertyPermission;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
-import jdk.internal.module.ModuleBootstrap;
 import jdk.internal.module.ModuleLoaderMap;
 import jdk.internal.reflect.CallerSensitive;
 import sun.security.util.SecurityConstants;
@@ -81,10 +78,100 @@ import sun.security.util.SecurityConstants;
  * throws a SecurityException if the operation is not
  * permitted.
  * 
    
- * The current security manager is set by the
- * setSecurityManager method in class
- * System. The current security manager is obtained
- * by the getSecurityManager method.
+ * Environments using a security manager will typically set the security
+ * manager at startup. In the JDK implementation, this is done by setting
+ * the system property {@code java.security.manager} on the command line to
+ * the class name of the security manager. It can also be set to the empty
+ * String ("") or the special token "{@code default}" to use the
+ * default {@code java.lang.SecurityManager}. If a class name is specified,
+ * it must be {@code java.lang.SecurityManager} or a public subclass and have
+ * a public no-arg constructor. The class is loaded by the
+ * {@linkplain ClassLoader#getSystemClassLoader() built-in system class loader}
+ * if it is not {@code java.lang.SecurityManager}. If the
+ * {@code java.security.manager} system property is not set, the default value
+ * is {@code null}, which means a security manager will not be set at startup.
+ * 
    
+ * The Java run-time may also allow, but is not required to allow, the security
+ * manager to be set dynamically by invoking the
+ * {@link System#setSecurityManager(SecurityManager) setSecurityManager} method.
+ * In the JDK implementation, if the Java virtual machine is started with
+ * the {@code java.security.manager} system property set to the special token
+ * "{@code disallow}" then a security manager will not be set at startup and
+ * cannot be set dynamically (the
+ * {@link System#setSecurityManager(SecurityManager) setSecurityManager}
+ * method will throw an {@code UnsupportedOperationException}). If the
+ * {@code java.security.manager} system property is not set or is set to the
+ * special token "{@code allow}", then a security manager will not be set at
+ * startup but can be set dynamically. Finally, if the
+ * {@code java.security.manager} system property is set to the class name of
+ * the security manager, or to the empty String ("") or the special token
+ * "{@code default}", then a security manager is set at startup (as described
+ * previously) and can also be subsequently replaced (or disabled) dynamically
+ * (subject to the policy of the currently installed security manager). The
+ * following table illustrates the behavior of the JDK implementation for the
+ * different settings of the {@code java.security.manager} system property:
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ *
+ * 
+ *   
+ *   
+ *   
+ * 
+ *
+ * 
+ *   
+ *   
+ *   
+ * 
+ *
+ * 
+ *   
+ *   
+ *   
+ * 
+ *
+ * 
+ *   
+ *   
+ *   
+ * 
+ *
+ * 
+ *   
+ *   
+ *   
+ * 
+ *
+ * 
+ *   
+ *   
+ *   
+ * 
+ *
+ * 
+ * 
    property value,
+ *  the SecurityManager set at startup,
+ *  can dynamically set a SecurityManager
+ * 
    Property ValueThe SecurityManager set at startupSystem.setSecurityManager run-time behavior
    nullNoneSuccess or throws {@code SecurityException} if not permitted by
+ * the currently installed security manager
    empty String (""){@code java.lang.SecurityManager}Success or throws {@code SecurityException} if not permitted by
+ * the currently installed security manager
    "default"{@code java.lang.SecurityManager}Success or throws {@code SecurityException} if not permitted by
+ * the currently installed security manager
    "disallow"NoneAlways throws {@code UnsupportedOperationException}
    "allow"NoneSuccess or throws {@code SecurityException} if not permitted by
+ * the currently installed security manager
    a class namethe named classSuccess or throws {@code SecurityException} if not permitted by
+ * the currently installed security manager
    
+ * 
     A future release of the JDK may change the default value of the
+ * {@code java.security.manager} system property to "{@code disallow}".
+ * 
    
+ * The current security manager is returned by the
+ * {@link System#getSecurityManager() getSecurityManager} method.
  * 
    
  * The special method
  * {@link SecurityManager#checkPermission(java.security.Permission)}
@@ -221,7 +308,6 @@ import sun.security.util.SecurityConstants;
  * @see     java.net.SocketPermission
  * @see     java.util.PropertyPermission
  * @see     java.lang.RuntimePermission
- * @see     java.awt.AWTPermission
  * @see     java.security.Policy Policy
  * @see     java.security.SecurityPermission SecurityPermission
  * @see     java.security.ProtectionDomain
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 88cd2977a55..8021951c84e 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -72,6 +72,7 @@ import jdk.internal.misc.VM;
 import jdk.internal.logger.LoggerFinderLoader;
 import jdk.internal.logger.LazyLoggers;
 import jdk.internal.logger.LocalizedLoggerWrapper;
+import jdk.internal.vm.annotation.Stable;
 import sun.reflect.annotation.AnnotationType;
 import sun.nio.ch.Interruptible;
 import sun.security.util.SecurityConstants;
@@ -154,9 +155,18 @@ public final class System {
      */
     public static final PrintStream err = null;
 
-    /* The security manager for the system.
-     */
-    private static volatile SecurityManager security;
+    // indicates if a security manager is possible
+    private static final int NEVER = 1;
+    private static final int MAYBE = 2;
+    private static @Stable int allowSecurityManager;
+
+    // current security manager
+    private static volatile SecurityManager security;   // read by VM
+
+    // return true if a security manager is allowed
+    private static boolean allowSecurityManager() {
+        return (allowSecurityManager != NEVER);
+    }
 
     /**
      * Reassigns the "standard" input stream.
@@ -231,6 +241,7 @@ public final class System {
     }
 
     private static volatile Console cons;
+
     /**
      * Returns the unique {@link java.io.Console Console} object associated
      * with the current Java virtual machine, if any.
@@ -292,7 +303,7 @@ public final class System {
     private static native void setErr0(PrintStream err);
 
     /**
-     * Sets the System security.
+     * Sets the system-wide security manager.
      *
      * If there is a security manager already installed, this method first
      * calls the security manager's {@code checkPermission} method
@@ -306,27 +317,46 @@ public final class System {
      * security manager has been established, then no action is taken and
      * the method simply returns.
      *
-     * @param      s   the security manager.
-     * @throws     SecurityException  if the security manager has already
-     *             been set and its {@code checkPermission} method
-     *             doesn't allow it to be replaced.
+     * @implNote In the JDK implementation, if the Java virtual machine is
+     * started with the system property {@code java.security.manager} set to
+     * the special token "{@code disallow}" then the {@code setSecurityManager}
+     * method cannot be used to set a security manager.
+     *
+     * @param  sm the security manager or {@code null}
+     * @throws SecurityException
+     *         if the security manager has already been set and its {@code
+     *         checkPermission} method doesn't allow it to be replaced
+     * @throws UnsupportedOperationException
+     *         if {@code sm} is non-null and a security manager is not allowed
+     *         to be set dynamically
      * @see #getSecurityManager
      * @see SecurityManager#checkPermission
      * @see java.lang.RuntimePermission
      */
-    public static void setSecurityManager(final SecurityManager s) {
-        if (security == null) {
-            // ensure image reader is initialized
-            Object.class.getResource("java/lang/ANY");
-        }
-        if (s != null) {
-            try {
-                s.checkPackageAccess("java.lang");
-            } catch (Exception e) {
-                // no-op
+    public static void setSecurityManager(SecurityManager sm) {
+        if (allowSecurityManager()) {
+            if (security == null) {
+                // ensure image reader is initialized
+                Object.class.getResource("java/lang/ANY");
+            }
+            if (sm != null) {
+                try {
+                    // pre-populates the SecurityManager.packageAccess cache
+                    // to avoid recursive permission checking issues with custom
+                    // SecurityManager implementations
+                    sm.checkPackageAccess("java.lang");
+                } catch (Exception e) {
+                    // no-op
+                }
+            }
+            setSecurityManager0(sm);
+        } else {
+            // security manager not allowed
+            if (sm != null) {
+                throw new UnsupportedOperationException(
+                    "Runtime configured to disallow security manager");
             }
         }
-        setSecurityManager0(s);
     }
 
     private static synchronized
@@ -335,13 +365,12 @@ public final class System {
         if (sm != null) {
             // ask the currently installed security manager if we
             // can replace it.
-            sm.checkPermission(new RuntimePermission
-                                     ("setSecurityManager"));
+            sm.checkPermission(new RuntimePermission("setSecurityManager"));
         }
 
         if ((s != null) && (s.getClass().getClassLoader() != null)) {
             // New security manager class is not on bootstrap classpath.
-            // Cause policy to get initialized before we install the new
+            // Force policy to get initialized before we install the new
             // security manager, in order to prevent infinite loops when
             // trying to initialize the policy (which usually involves
             // accessing some security and/or system properties, which in turn
@@ -361,7 +390,7 @@ public final class System {
     }
 
     /**
-     * Gets the system security interface.
+     * Gets the system-wide security manager.
      *
      * @return  if a security manager has already been established for the
      *          current application, then that security manager is returned;
@@ -369,7 +398,11 @@ public final class System {
      * @see     #setSecurityManager
      */
     public static SecurityManager getSecurityManager() {
-        return security;
+        if (allowSecurityManager()) {
+            return security;
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -2028,35 +2061,48 @@ public final class System {
      * 3. set TCCL
      *
      * This method must be called after the module system initialization.
-     * The security manager and system class loader may be custom class from
+     * The security manager and system class loader may be a custom class from
      * the application classpath or modulepath.
      */
     private static void initPhase3() {
-        // set security manager
-        String cn = System.getProperty("java.security.manager");
-        if (cn != null) {
-            if (cn.isEmpty() || "default".equals(cn)) {
-                System.setSecurityManager(new SecurityManager());
-            } else {
-                try {
-                    Class c = Class.forName(cn, false, ClassLoader.getBuiltinAppClassLoader());
-                    Constructor ctor = c.getConstructor();
-                    // Must be a public subclass of SecurityManager with
-                    // a public no-arg constructor
-                    if (!SecurityManager.class.isAssignableFrom(c) ||
+        String smProp = System.getProperty("java.security.manager");
+        if (smProp != null) {
+            switch (smProp) {
+                case "disallow":
+                    allowSecurityManager = NEVER;
+                    break;
+                case "allow":
+                    allowSecurityManager = MAYBE;
+                    break;
+                case "":
+                case "default":
+                    setSecurityManager(new SecurityManager());
+                    allowSecurityManager = MAYBE;
+                    break;
+                default:
+                    try {
+                        ClassLoader cl = ClassLoader.getBuiltinAppClassLoader();
+                        Class c = Class.forName(smProp, false, cl);
+                        Constructor ctor = c.getConstructor();
+                        // Must be a public subclass of SecurityManager with
+                        // a public no-arg constructor
+                        if (!SecurityManager.class.isAssignableFrom(c) ||
                             !Modifier.isPublic(c.getModifiers()) ||
                             !Modifier.isPublic(ctor.getModifiers())) {
-                        throw new Error("Could not create SecurityManager: " + ctor.toString());
+                            throw new Error("Could not create SecurityManager: "
+                                             + ctor.toString());
+                        }
+                        // custom security manager may be in non-exported package
+                        ctor.setAccessible(true);
+                        SecurityManager sm = (SecurityManager) ctor.newInstance();
+                        setSecurityManager(sm);
+                    } catch (Exception e) {
+                        throw new InternalError("Could not create SecurityManager", e);
                     }
-                    // custom security manager implementation may be in unnamed module
-                    // or a named module but non-exported package
-                    ctor.setAccessible(true);
-                    SecurityManager sm = (SecurityManager) ctor.newInstance();
-                    System.setSecurityManager(sm);
-                } catch (Exception e) {
-                    throw new Error("Could not create SecurityManager", e);
-                }
+                    allowSecurityManager = MAYBE;
             }
+        } else {
+            allowSecurityManager = MAYBE;
         }
 
         // initializing the system class loader
diff --git a/test/jdk/java/lang/System/AllowSecurityManager.java b/test/jdk/java/lang/System/AllowSecurityManager.java
new file mode 100644
index 00000000000..7d46664e625
--- /dev/null
+++ b/test/jdk/java/lang/System/AllowSecurityManager.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8191053
+ * @summary Test that the allow/disallow options of the java.security.manager
+ *          system property work correctly
+ * @run main/othervm AllowSecurityManager
+ * @run main/othervm -Djava.security.manager=disallow AllowSecurityManager
+ * @run main/othervm -Djava.security.manager=allow AllowSecurityManager
+ */
+
+public class AllowSecurityManager {
+
+    public static void main(String args[]) throws Exception {
+        String prop = System.getProperty("java.security.manager");
+        boolean disallow = "disallow".equals(prop);
+        try {
+            System.setSecurityManager(new SecurityManager());
+            if (disallow) {
+                throw new Exception("System.setSecurityManager did not " +
+                                    "throw UnsupportedOperationException");
+            }
+        } catch (UnsupportedOperationException uoe) {
+            if (!disallow) {
+                throw new Exception("UnsupportedOperationException " +
+                                    "unexpectedly thrown by " +
+                                    "System.setSecurityManager");
+            }
+        }
+    }
+}

From 99ca4f349758b2a065953fa727d8e39dacc1e5af Mon Sep 17 00:00:00 2001
From: Abdul Kolarkunnu 
Date: Fri, 5 Oct 2018 05:03:15 -0700
Subject: [PATCH 075/124] 8210055: Enable different look and feel tests in
 SwingSet3 demo tests

Reviewed-by: serb
---
 .../jdk/sanity/client/SwingSet/src/DialogDemoTest.java |  8 +++++---
 .../sanity/client/SwingSet/src/SwingSet2DemoTest.java  | 10 ++++++----
 .../jdk/sanity/client/SwingSet/src/WindowDemoTest.java |  8 +++++---
 .../lib/Extensions/src/org/jemmy2ext/JemmyExt.java     |  8 ++++----
 .../jdk/sanity/client/lib/SwingSet2/src/SwingSet2.java |  5 +----
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java b/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java
index 69ee970373b..1d92414509f 100644
--- a/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +27,7 @@ import static com.sun.swingset3.demos.dialog.DialogDemo.*;
 import java.awt.Dimension;
 import java.awt.Point;
 import javax.swing.JDialog;
+import javax.swing.UIManager;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.Test;
 import static org.jemmy2ext.JemmyExt.isIconified;
@@ -61,8 +62,9 @@ public class DialogDemoTest {
 
     private final ComponentChooser jDialogClassChooser = new ByClassChooser(JDialog.class);
 
-    @Test
-    public void test() throws Exception {
+    @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+    public void test(String lookAndFeel) throws Exception {
+        UIManager.setLookAndFeel(lookAndFeel);
         new ClassReference(DialogDemo.class.getCanonicalName()).startApplication();
         JFrameOperator mainFrame = new JFrameOperator(DIALOG_DEMO_TITLE);
         JDialogOperator dialog = new JDialogOperator(DIALOG_TITLE);
diff --git a/test/jdk/sanity/client/SwingSet/src/SwingSet2DemoTest.java b/test/jdk/sanity/client/SwingSet/src/SwingSet2DemoTest.java
index 214af5b38e9..a8898a1e9e2 100644
--- a/test/jdk/sanity/client/SwingSet/src/SwingSet2DemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/SwingSet2DemoTest.java
@@ -27,6 +27,7 @@ import static org.testng.Assert.assertTrue;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.ToolTipManager;
+import javax.swing.UIManager;
 import javax.swing.plaf.metal.MetalLookAndFeel;
 
 import org.jtregext.GuiTestListener;
@@ -58,7 +59,7 @@ import org.testng.annotations.Test;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build SwingSet2
- * @run testng SwingSet2DemoTest
+ * @run testng/timeout=600 SwingSet2DemoTest
  */
 @Listeners(GuiTestListener.class)
 public class SwingSet2DemoTest {
@@ -74,8 +75,9 @@ public class SwingSet2DemoTest {
      *
      * @throws Exception
      */
-    @Test
-    public void test() throws Exception {
+    @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+    public void test(String lookAndFeel) throws Exception {
+        UIManager.setLookAndFeel(lookAndFeel);
 
         new ClassReference(SwingSet2.class.getCanonicalName()).startApplication();
         JFrameOperator frameOperator = new JFrameOperator(SwingSet2.FRAME_TITLE);
@@ -192,4 +194,4 @@ public class SwingSet2DemoTest {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java b/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java
index 014f3ca6bc2..e9fc06f2ac3 100644
--- a/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@ import com.sun.swingset3.demos.window.WindowDemo;
 import static com.sun.swingset3.demos.window.WindowDemo.*;
 import static org.jemmy2ext.JemmyExt.*;
 import static org.testng.AssertJUnit.*;
+import javax.swing.UIManager;
 import org.testng.annotations.Test;
 import org.netbeans.jemmy.ClassReference;
 import org.netbeans.jemmy.operators.JButtonOperator;
@@ -53,8 +54,9 @@ import org.testng.annotations.Listeners;
 @Listeners(GuiTestListener.class)
 public class WindowDemoTest {
 
-    @Test
-    public void test() throws Exception {
+    @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+    public void test(String lookAndFeel) throws Exception {
+        UIManager.setLookAndFeel(lookAndFeel);
 
         new ClassReference(WindowDemo.class.getCanonicalName()).startApplication();
 
diff --git a/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java b/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java
index f2d344f4c3f..2c3b23677ac 100644
--- a/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java
+++ b/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -406,7 +406,7 @@ public class JemmyExt {
                 Window[] windows = Window.getWindows();
                 int windowCount = 0;
                 for (Window w : windows) {
-                    if (w.getClass().equals(JWindow.class)) {
+                    if (w.getClass().equals(JWindow.class) && ((JWindow)w).isShowing()) {
                         windowCount++;
                     }
                 }
@@ -427,7 +427,7 @@ public class JemmyExt {
                 Window[] windows = Window.getWindows();
                 int windowIndex = 0;
                 for (Window w : windows) {
-                    if (w.getClass().equals(JWindow.class)) {
+                    if (w.getClass().equals(JWindow.class) && ((JWindow)w).isShowing()) {
                         if (windowIndex == index) {
                             return (JWindow) w;
                         }
@@ -565,7 +565,7 @@ public class JemmyExt {
 
         @Override
         public boolean checkComponent(Component comp) {
-            return comp.getClass().equals(clazz);
+            return comp.getClass().equals(clazz) && comp.isShowing();
         }
 
         @Override
diff --git a/test/jdk/sanity/client/lib/SwingSet2/src/SwingSet2.java b/test/jdk/sanity/client/lib/SwingSet2/src/SwingSet2.java
index a41f7e17f9d..862ed409439 100644
--- a/test/jdk/sanity/client/lib/SwingSet2/src/SwingSet2.java
+++ b/test/jdk/sanity/client/lib/SwingSet2/src/SwingSet2.java
@@ -323,8 +323,6 @@ public class SwingSet2 extends JPanel {
                        "FileMenu.exit_accessible_description", new ExitAction(this)
         );
 
-        // Create these menu items for the first SwingSet only.
-        if (numSSs == 0) {
         // ***** create laf switcher menu
         lafMenu = (JMenu) menuBar.add(new JMenu(getString("LafMenu.laf_label")));
         lafMenu.setMnemonic(getMnemonic("LafMenu.laf_mnemonic"));
@@ -432,7 +430,6 @@ public class SwingSet2 extends JPanel {
                 "OptionsMenu.dragEnabled_mnemonic",
                 "OptionsMenu.dragEnabled_accessible_description",
                 new DragSupportAction());
-        }
 
         // ***** create the multiscreen menu, if we have multiple screens
         GraphicsDevice[] screens = GraphicsEnvironment.
@@ -1258,4 +1255,4 @@ public class SwingSet2 extends JPanel {
             return className;
         }
     }
-}
\ No newline at end of file
+}

From 5a36050cfda56a332e3df811eff53a54fd8a48c1 Mon Sep 17 00:00:00 2001
From: Mandy Chung 
Date: Wed, 10 Oct 2018 15:19:34 -0700
Subject: [PATCH 076/124] 8211921: AssertionError in
 MethodHandles$Lookup.defineClass

Reviewed-by: alanb
---
 .../share/classes/java/lang/invoke/MethodHandles.java          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index f5c326c6302..e9b4244fd8f 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -969,9 +969,6 @@ public class MethodHandles {
             ProtectionDomain pd = (loader != null) ? lookupClassProtectionDomain() : null;
             String source = "__Lookup_defineClass__";
             Class clazz = SharedSecrets.getJavaLangAccess().defineClass(loader, cn, bytes, pd, source);
-            assert clazz.getClassLoader() == lookupClass.getClassLoader()
-                    && clazz.getPackageName().equals(lookupClass.getPackageName())
-                    && protectionDomain(clazz) == lookupClassProtectionDomain();
             return clazz;
         }
 

From 635a875123815b6f34b126d4861cd0ec09ec9813 Mon Sep 17 00:00:00 2001
From: Jesper Wilhelmsson 
Date: Thu, 11 Oct 2018 00:43:09 +0200
Subject: [PATCH 077/124] Added tag jdk-12+15 for changeset f8626bcc1698

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5f2accdd825..0fd57b33348 100644
--- a/.hgtags
+++ b/.hgtags
@@ -517,3 +517,4 @@ f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11
 8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
 8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
 6f04692c7d5137ee34a6bd94c0c8a6c9219cb127 jdk-12+14
+f8626bcc169813a4b2a15880386b952719d1d6d1 jdk-12+15

From 2d7d9b83803b9735d12d78f4d2d44fc74e8b83b3 Mon Sep 17 00:00:00 2001
From: Peter Levart 
Date: Wed, 10 Oct 2018 17:53:22 -0700
Subject: [PATCH 078/124] 8152910: Get performance improvement with Stable
 annotation

Reviewed-by: darcy
---
 src/java.base/share/classes/java/math/BigInteger.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java
index 63dae3d4003..5fd51b57ea5 100644
--- a/src/java.base/share/classes/java/math/BigInteger.java
+++ b/src/java.base/share/classes/java/math/BigInteger.java
@@ -41,6 +41,7 @@ import java.util.concurrent.ThreadLocalRandom;
 import jdk.internal.math.DoubleConsts;
 import jdk.internal.math.FloatConsts;
 import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.vm.annotation.Stable;
 
 /**
  * Immutable arbitrary-precision integers.  All operations behave as if
@@ -1219,8 +1220,10 @@ public class BigInteger extends Number implements Comparable {
      * Initialize static constant array when class is loaded.
      */
     private static final int MAX_CONSTANT = 16;
-    private static BigInteger posConst[] = new BigInteger[MAX_CONSTANT+1];
-    private static BigInteger negConst[] = new BigInteger[MAX_CONSTANT+1];
+    @Stable
+    private static final BigInteger[] posConst = new BigInteger[MAX_CONSTANT+1];
+    @Stable
+    private static final BigInteger[] negConst = new BigInteger[MAX_CONSTANT+1];
 
     /**
      * The cache of powers of each radix.  This allows us to not have to

From 47e7b141c03b338ef7bbadc3c554e50c8fb210a9 Mon Sep 17 00:00:00 2001
From: Kim Barrett 
Date: Wed, 10 Oct 2018 23:47:36 -0400
Subject: [PATCH 079/124] 8211962: Implicit narrowing in MacOSX java.desktop
 jsound

Cast value to needed type.

Reviewed-by: serb
---
 .../macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
index 12ee4f2109c..8db89debb8c 100644
--- a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
+++ b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -609,7 +609,7 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
                 // get the channel name
                 char *channelName;
                 CFStringRef cfname = NULL;
-                const AudioObjectPropertyAddress address = {kAudioObjectPropertyElementName, port->scope, ch};
+                const AudioObjectPropertyAddress address = {kAudioObjectPropertyElementName, port->scope, (unsigned)ch};
                 UInt32 size = sizeof(cfname);
                 OSStatus err = AudioObjectGetPropertyData(mixer->deviceID, &address, 0, NULL, &size, &cfname);
                 if (err == noErr) {

From e2d7983ab825b2f4544eec176cf1f4aabaf1a60b Mon Sep 17 00:00:00 2001
From: Matthias Baesken 
Date: Wed, 10 Oct 2018 16:56:18 +0200
Subject: [PATCH 080/124] 8211929: hotspot/share/opto/parse2.cpp compile error
 with gcc 7.3.1

Reviewed-by: kvn, stuefe
---
 src/hotspot/share/opto/parse2.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index ca87b8132ed..19d0bb723c5 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -1346,7 +1346,7 @@ float Parse::dynamic_branch_prediction(float &cnt, BoolTest::mask btest, Node* t
     if (prob <= PROB_MIN)  prob_str = (prob == PROB_MIN) ? "min" : "never";
     char prob_str_buf[30];
     if (prob_str == NULL) {
-      sprintf(prob_str_buf, "%g", prob);
+      jio_snprintf(prob_str_buf, sizeof(prob_str_buf), "%20.2f", prob);
       prob_str = prob_str_buf;
     }
     C->log()->elem("branch target_bci='%d' taken='%d' not_taken='%d' cnt='%f' prob='%s'",
@@ -2854,7 +2854,7 @@ void Parse::do_one_bytecode() {
   IdealGraphPrinter *printer = C->printer();
   if (printer && printer->should_print(1)) {
     char buffer[256];
-    sprintf(buffer, "Bytecode %d: %s", bci(), Bytecodes::name(bc()));
+    jio_snprintf(buffer, sizeof(buffer), "Bytecode %d: %s", bci(), Bytecodes::name(bc()));
     bool old = printer->traverse_outs();
     printer->set_traverse_outs(true);
     printer->print_method(buffer, 4);

From 2b21c73b2d605273f0b821c4d052bf71b743d9f1 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev 
Date: Thu, 11 Oct 2018 10:42:17 +0200
Subject: [PATCH 081/124] 8212005: Epsilon elastic TLAB sizing may cause
 misalignment

Reviewed-by: rkennke, tschatzl
---
 src/hotspot/share/gc/epsilon/epsilonHeap.cpp  |  6 +++
 .../jtreg/gc/epsilon/TestAlignment.java       | 44 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 test/hotspot/jtreg/gc/epsilon/TestAlignment.java

diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
index 612914b9747..42f681f3c62 100644
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.cpp
@@ -118,6 +118,8 @@ EpsilonHeap* EpsilonHeap::heap() {
 }
 
 HeapWord* EpsilonHeap::allocate_work(size_t size) {
+  assert(is_object_aligned(size), "Allocation size should be aligned: " SIZE_FORMAT, size);
+
   HeapWord* res = _space->par_allocate(size);
 
   while (res == NULL) {
@@ -168,6 +170,7 @@ HeapWord* EpsilonHeap::allocate_work(size_t size) {
     }
   }
 
+  assert(is_object_aligned(res), "Object should be aligned: " PTR_FORMAT, p2i(res));
   return res;
 }
 
@@ -211,6 +214,9 @@ HeapWord* EpsilonHeap::allocate_new_tlab(size_t min_size,
   // Always honor boundaries
   size = MAX2(min_size, MIN2(_max_tlab_size, size));
 
+  // Always honor alignment
+  size = align_up(size, MinObjAlignment);
+
   if (log_is_enabled(Trace, gc)) {
     ResourceMark rm;
     log_trace(gc)("TLAB size for \"%s\" (Requested: " SIZE_FORMAT "K, Min: " SIZE_FORMAT
diff --git a/test/hotspot/jtreg/gc/epsilon/TestAlignment.java b/test/hotspot/jtreg/gc/epsilon/TestAlignment.java
new file mode 100644
index 00000000000..330c4e48fb0
--- /dev/null
+++ b/test/hotspot/jtreg/gc/epsilon/TestAlignment.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test TestAlignment
+ * @key gc
+ * @requires vm.gc.Epsilon & !vm.graal.enabled
+ * @summary Check Epsilon runs fine with (un)usual alignments
+ * @bug 8212005
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -Xmx128m -XX:+UseEpsilonGC -XX:+UseTLAB TestAlignment
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -Xmx128m -XX:+UseEpsilonGC -XX:-UseTLAB TestAlignment
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -Xmx128m -XX:+UseEpsilonGC -XX:+UseTLAB -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=16 TestAlignment
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -Xmx128m -XX:+UseEpsilonGC -XX:-UseTLAB -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=16 TestAlignment
+ */
+
+public class TestAlignment {
+    static Object sink;
+
+    public static void main(String[] args) throws Exception {
+        for (int c = 0; c < 1000; c++) {
+            sink = new byte[c];
+        }
+    }
+}

From 17f301f734b577564fa5dbbb5d6ca0636e2896a7 Mon Sep 17 00:00:00 2001
From: Roland Westrelin 
Date: Tue, 18 Sep 2018 20:41:17 +0200
Subject: [PATCH 082/124] 8210389: C2: assert(n->outcnt() != 0 || C->top() == n
 || n->is_Proj()) failed: No dead instructions after post-alloc

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/compile.cpp            | 26 ++++++
 .../regalloc/VolatileLoadMemBarsOnlyUses.java | 80 +++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/regalloc/VolatileLoadMemBarsOnlyUses.java

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index cd3743deec1..f2a9d95a0fd 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -3379,6 +3379,32 @@ void Compile::final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc) {
       n->set_req(MemBarNode::Precedent, top());
     }
     break;
+  case Op_MemBarAcquire: {
+    if (n->as_MemBar()->trailing_load() && n->req() > MemBarNode::Precedent) {
+      // At parse time, the trailing MemBarAcquire for a volatile load
+      // is created with an edge to the load. After optimizations,
+      // that input may be a chain of Phis. If those phis have no
+      // other use, then the MemBarAcquire keeps them alive and
+      // register allocation can be confused.
+      ResourceMark rm;
+      Unique_Node_List wq;
+      wq.push(n->in(MemBarNode::Precedent));
+      n->set_req(MemBarNode::Precedent, top());
+      while (wq.size() > 0) {
+        Node* m = wq.pop();
+        if (m->outcnt() == 0) {
+          for (uint j = 0; j < m->req(); j++) {
+            Node* in = m->in(j);
+            if (in != NULL) {
+              wq.push(in);
+            }
+          }
+          m->disconnect_inputs(NULL, this);
+        }
+      }
+    }
+    break;
+  }
   case Op_RangeCheck: {
     RangeCheckNode* rc = n->as_RangeCheck();
     Node* iff = new IfNode(rc->in(0), rc->in(1), rc->_prob, rc->_fcnt);
diff --git a/test/hotspot/jtreg/compiler/regalloc/VolatileLoadMemBarsOnlyUses.java b/test/hotspot/jtreg/compiler/regalloc/VolatileLoadMemBarsOnlyUses.java
new file mode 100644
index 00000000000..e09fb048b99
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/regalloc/VolatileLoadMemBarsOnlyUses.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8210389
+ * @summary C2: assert(n->outcnt() != 0 || C->top() == n || n->is_Proj()) failed: No dead instructions after post-alloc
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=VolatileLoadMemBarsOnlyUses VolatileLoadMemBarsOnlyUses
+ *
+ */
+
+public class VolatileLoadMemBarsOnlyUses {
+
+    public static final int N = 400;
+    public static long instanceCount=-94L;
+    public static volatile byte byFld=-108;
+
+    public int mainTest(String[] strArr1) {
+
+        int i17=9, i19=1, i20=63, i21=-32916, i22=0, iArr[]=new int[N];
+        boolean b1=false;
+        double d3=76.18241;
+
+        for (int i : iArr) {
+            for (i17 = 2; i17 < 63; i17++) {
+                if (b1) break;
+                byFld += (byte)(0.131F + (i17 * i17));
+            }
+            for (i19 = 1; 63 > i19; ++i19) {
+                for (i21 = 1; i21 < 2; i21++) {
+                    d3 = i22;
+                    if (b1) continue;
+                    i20 = i21;
+                }
+                d3 -= byFld;
+                instanceCount = 46725L;
+            }
+            switch ((((i22 >>> 1) % 4) * 5) + 91) {
+            case 98:
+                break;
+            case 110:
+                break;
+            case 105:
+                break;
+            case 103:
+                break;
+            default:
+            }
+        }
+
+        return i20;
+    }
+    public static void main(String[] strArr) {
+        VolatileLoadMemBarsOnlyUses _instance = new VolatileLoadMemBarsOnlyUses();
+        for (int i = 0; i < 10; i++ ) {
+            _instance.mainTest(strArr);
+        }
+    }
+}

From 2ab522db78e5b722beffbbf06e69b304a0b16f8d Mon Sep 17 00:00:00 2001
From: Roland Westrelin 
Date: Thu, 27 Sep 2018 17:46:01 +0200
Subject: [PATCH 083/124] 8211233: MemBarNode::trailing_membar() and
 MemBarNode::leading_membar() need to handle dying subgraphs better

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/memnode.cpp | 66 +++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 560d8357bad..14cd6e3bae8 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -3174,21 +3174,43 @@ void MemBarNode::set_load_store_pair(MemBarNode* leading, MemBarNode* trailing)
 }
 
 MemBarNode* MemBarNode::trailing_membar() const {
+  ResourceMark rm;
   Node* trailing = (Node*)this;
   VectorSet seen(Thread::current()->resource_area());
-  while (!trailing->is_MemBar() || !trailing->as_MemBar()->trailing()) {
-    if (seen.test_set(trailing->_idx)) {
-      // Dying subgraph?
-      return NULL;
-    }
-    for (DUIterator_Fast jmax, j = trailing->fast_outs(jmax); j < jmax; j++) {
-      Node* next = trailing->fast_out(j);
-      if (next != trailing && next->is_CFG()) {
-        trailing = next;
+  Node_Stack multis(0);
+  do {
+    Node* c = trailing;
+    uint i = 0;
+    do {
+      trailing = NULL;
+      for (; i < c->outcnt(); i++) {
+        Node* next = c->raw_out(i);
+        if (next != c && next->is_CFG()) {
+          if (c->is_MultiBranch()) {
+            if (multis.node() == c) {
+              multis.set_index(i+1);
+            } else {
+              multis.push(c, i+1);
+            }
+          }
+          trailing = next;
+          break;
+        }
+      }
+      if (trailing != NULL && !seen.test_set(trailing->_idx)) {
         break;
       }
-    }
-  }
+      while (multis.size() > 0) {
+        c = multis.node();
+        i = multis.index();
+        if (i < c->req()) {
+          break;
+        }
+        multis.pop();
+      }
+    } while (multis.size() > 0);
+  } while (!trailing->is_MemBar() || !trailing->as_MemBar()->trailing());
+
   MemBarNode* mb = trailing->as_MemBar();
   assert((mb->_kind == TrailingStore && _kind == LeadingStore) ||
          (mb->_kind == TrailingLoadStore && _kind == LeadingLoadStore), "bad trailing membar");
@@ -3197,14 +3219,30 @@ MemBarNode* MemBarNode::trailing_membar() const {
 }
 
 MemBarNode* MemBarNode::leading_membar() const {
+  ResourceMark rm;
   VectorSet seen(Thread::current()->resource_area());
+  Node_Stack regions(0);
   Node* leading = in(0);
   while (leading != NULL && (!leading->is_MemBar() || !leading->as_MemBar()->leading())) {
-    if (seen.test_set(leading->_idx)) {
-      // Dying subgraph?
-      return NULL;
+    while (leading == NULL || leading->is_top() || seen.test_set(leading->_idx)) {
+      leading = NULL;
+      while (regions.size() > 0) {
+        Node* r = regions.node();
+        uint i = regions.index();
+        if (i < r->req()) {
+          leading = r->in(i);
+          regions.set_index(i+1);
+        } else {
+          regions.pop();
+        }
+      }
+      if (leading == NULL) {
+        assert(regions.size() == 0, "all paths should have been tried");
+        return NULL;
+      }
     }
     if (leading->is_Region()) {
+      regions.push(leading, 2);
       leading = leading->in(1);
     } else {
       leading = leading->in(0);

From 9701ffd293d510fb11e722214a2c69524566444f Mon Sep 17 00:00:00 2001
From: Chris Hegarty 
Date: Thu, 11 Oct 2018 13:40:09 +0100
Subject: [PATCH 084/124] 8211922: Remove
 test/jdk/javax/naming/module/RunBasic.java from the ProblemList

Reviewed-by: lancea
---
 test/jdk/ProblemList.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index d5bd1ef73f2..2409be84246 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -874,8 +874,6 @@ com/sun/jndi/ldap/LdapTimeoutTest.java                          8151678 linux-al
 
 javax/rmi/ssl/SSLSocketParametersTest.sh                        8162906 generic-all
 
-javax/naming/module/RunBasic.java                               8211850 generic-all
-
 ############################################################################
 
 ###########################################################################

From 01a3fec4cb19826b1afd85a9c06e723ec79a62a7 Mon Sep 17 00:00:00 2001
From: Pavel Rappo 
Date: Thu, 11 Oct 2018 14:10:13 +0100
Subject: [PATCH 085/124] 8212001: Verify exported symbols in java.base
 (libjava)

Reviewed-by: chegar
---
 src/java.base/share/native/libjava/io_util.c         | 2 +-
 src/java.base/share/native/libjava/io_util.h         | 3 +--
 src/java.base/windows/native/libjava/io_util_md.c    | 3 +--
 src/java.base/windows/native/libjava/io_util_md.h    | 3 +--
 src/jdk.hotspot.agent/share/native/libsaproc/sadis.c | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/native/libjava/io_util.c b/src/java.base/share/native/libjava/io_util.c
index 1c21cf0a2fa..812a13549b7 100644
--- a/src/java.base/share/native/libjava/io_util.c
+++ b/src/java.base/share/native/libjava/io_util.c
@@ -201,7 +201,7 @@ writeBytes(JNIEnv *env, jobject this, jbyteArray bytes,
     }
 }
 
-JNIEXPORT void JNICALL
+void
 throwFileNotFoundException(JNIEnv *env, jstring path)
 {
     char buf[256];
diff --git a/src/java.base/share/native/libjava/io_util.h b/src/java.base/share/native/libjava/io_util.h
index 1d72bf2ed02..6e960c0347f 100644
--- a/src/java.base/share/native/libjava/io_util.h
+++ b/src/java.base/share/native/libjava/io_util.h
@@ -54,8 +54,7 @@ void writeSingle(JNIEnv *env, jobject this, jint byte, jboolean append, jfieldID
 void writeBytes(JNIEnv *env, jobject this, jbyteArray bytes, jint off,
                 jint len, jboolean append, jfieldID fid);
 void fileOpen(JNIEnv *env, jobject this, jstring path, jfieldID fid, int flags);
-JNIEXPORT void JNICALL
-throwFileNotFoundException(JNIEnv *env, jstring path);
+void throwFileNotFoundException(JNIEnv *env, jstring path);
 
 /*
  * Macros for managing platform strings.  The typical usage pattern is:
diff --git a/src/java.base/windows/native/libjava/io_util_md.c b/src/java.base/windows/native/libjava/io_util_md.c
index 9927434db89..a7e04ec4dfe 100644
--- a/src/java.base/windows/native/libjava/io_util_md.c
+++ b/src/java.base/windows/native/libjava/io_util_md.c
@@ -213,8 +213,7 @@ pathToNTPath(JNIEnv *env, jstring path, jboolean throwFNFE) {
     return pathbuf;
 }
 
-JNIEXPORT FD JNICALL
-winFileHandleOpen(JNIEnv *env, jstring path, int flags)
+FD winFileHandleOpen(JNIEnv *env, jstring path, int flags)
 {
     const DWORD access =
         (flags & O_WRONLY) ?  GENERIC_WRITE :
diff --git a/src/java.base/windows/native/libjava/io_util_md.h b/src/java.base/windows/native/libjava/io_util_md.h
index 9779672f738..df8bcfd02b1 100644
--- a/src/java.base/windows/native/libjava/io_util_md.h
+++ b/src/java.base/windows/native/libjava/io_util_md.h
@@ -56,8 +56,7 @@ handleLseek(FD fd, jlong offset, jint whence);
  * Returns an opaque handle to file named by "path".  If an error occurs,
  * returns -1 and an exception is pending.
  */
-JNIEXPORT FD JNICALL
-winFileHandleOpen(JNIEnv *env, jstring path, int flags);
+FD winFileHandleOpen(JNIEnv *env, jstring path, int flags);
 
 /*
  * Macros to set/get fd from the java.io.FileDescriptor.
diff --git a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
index 2f01d94d6a9..5fa2b3fdcf7 100644
--- a/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
+++ b/src/jdk.hotspot.agent/share/native/libsaproc/sadis.c
@@ -26,7 +26,7 @@
 
 /*
  *  This file implements a binding between Java and the hsdis
- *  dissasembler.  It should compile on Linux/Solaris and Windows.
+ *  disassembler.  It should compile on Linux/Solaris and Windows.
  *  The only platform dependent pieces of the code for doing
  *  dlopen/dlsym to find the entry point in hsdis.  All the rest is
  *  standard JNI code.

From 945623c998793966598aad3c007b8bfb72cc7909 Mon Sep 17 00:00:00 2001
From: Harold Seigel 
Date: Thu, 11 Oct 2018 10:11:18 -0400
Subject: [PATCH 086/124] 8079784: Unexpected IllegalAccessError when trying
 access InnerClasses attribute

Prevent classes in the InnerClasses attribute from being loaded unless they are actually being accessed.

Reviewed-by: dholmes, lfoltan
---
 src/hotspot/share/oops/instanceKlass.cpp      |  42 -------
 src/hotspot/share/oops/instanceKlass.hpp      |   3 -
 src/hotspot/share/runtime/reflection.cpp      |  26 +++--
 .../jtreg/runtime/InnerClassesAttr/Base.java  |  28 +++++
 .../jtreg/runtime/InnerClassesAttr/Child.java |  30 +++++
 .../InnerClassesAttr/InnerClassesTest.jasm    | 110 ++++++++++++++++++
 6 files changed, 183 insertions(+), 56 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/InnerClassesAttr/Base.java
 create mode 100644 test/hotspot/jtreg/runtime/InnerClassesAttr/Child.java
 create mode 100644 test/hotspot/jtreg/runtime/InnerClassesAttr/InnerClassesTest.jasm

diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 319cfce81e6..9c5005e327f 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2738,48 +2738,6 @@ void InstanceKlass::check_prohibited_package(Symbol* class_name,
   return;
 }
 
-// tell if two classes have the same enclosing class (at package level)
-bool InstanceKlass::is_same_package_member(const Klass* class2, TRAPS) const {
-  if (class2 == this) return true;
-  if (!class2->is_instance_klass())  return false;
-
-  // must be in same package before we try anything else
-  if (!is_same_class_package(class2))
-    return false;
-
-  // As long as there is an outer_this.getEnclosingClass,
-  // shift the search outward.
-  const InstanceKlass* outer_this = this;
-  for (;;) {
-    // As we walk along, look for equalities between outer_this and class2.
-    // Eventually, the walks will terminate as outer_this stops
-    // at the top-level class around the original class.
-    bool ignore_inner_is_member;
-    const Klass* next = outer_this->compute_enclosing_class(&ignore_inner_is_member,
-                                                            CHECK_false);
-    if (next == NULL)  break;
-    if (next == class2)  return true;
-    outer_this = InstanceKlass::cast(next);
-  }
-
-  // Now do the same for class2.
-  const InstanceKlass* outer2 = InstanceKlass::cast(class2);
-  for (;;) {
-    bool ignore_inner_is_member;
-    Klass* next = outer2->compute_enclosing_class(&ignore_inner_is_member,
-                                                    CHECK_false);
-    if (next == NULL)  break;
-    // Might as well check the new outer against all available values.
-    if (next == this)  return true;
-    if (next == outer_this)  return true;
-    outer2 = InstanceKlass::cast(next);
-  }
-
-  // If by this point we have not found an equality between the
-  // two classes, we know they are in separate package members.
-  return false;
-}
-
 bool InstanceKlass::find_inner_classes_attr(int* ooff, int* noff, TRAPS) const {
   constantPoolHandle i_cp(THREAD, constants());
   for (InnerClassesIterator iter(this); !iter.done(); iter.next()) {
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index b69ec9466a2..41accd4a624 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -507,9 +507,6 @@ public:
                                        ClassLoaderData* loader_data,
                                        TRAPS);
  public:
-  // tell if two classes have the same enclosing class (at package level)
-  bool is_same_package_member(const Klass* class2, TRAPS) const;
-
   // initialization state
   bool is_loaded() const                   { return _init_state >= loaded; }
   bool is_linked() const                   { return _init_state >= linked; }
diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
index 1c1bb0ebeb1..54797b0b9b2 100644
--- a/src/hotspot/share/runtime/reflection.cpp
+++ b/src/hotspot/share/runtime/reflection.cpp
@@ -750,10 +750,12 @@ void Reflection::check_for_inner_class(const InstanceKlass* outer, const Instanc
   InnerClassesIterator iter(outer);
   constantPoolHandle cp   (THREAD, outer->constants());
   for (; !iter.done(); iter.next()) {
-     int ioff = iter.inner_class_info_index();
-     int ooff = iter.outer_class_info_index();
+    int ioff = iter.inner_class_info_index();
+    int ooff = iter.outer_class_info_index();
 
-     if (inner_is_member && ioff != 0 && ooff != 0) {
+    if (inner_is_member && ioff != 0 && ooff != 0) {
+      if (cp->klass_name_at_matches(outer, ooff) &&
+          cp->klass_name_at_matches(inner, ioff)) {
         Klass* o = cp->klass_at(ooff, CHECK);
         if (o == outer) {
           Klass* i = cp->klass_at(ioff, CHECK);
@@ -761,14 +763,16 @@ void Reflection::check_for_inner_class(const InstanceKlass* outer, const Instanc
             return;
           }
         }
-     }
-     if (!inner_is_member && ioff != 0 && ooff == 0 &&
-         cp->klass_name_at_matches(inner, ioff)) {
-        Klass* i = cp->klass_at(ioff, CHECK);
-        if (i == inner) {
-          return;
-        }
-     }
+      }
+    }
+
+    if (!inner_is_member && ioff != 0 && ooff == 0 &&
+        cp->klass_name_at_matches(inner, ioff)) {
+      Klass* i = cp->klass_at(ioff, CHECK);
+      if (i == inner) {
+        return;
+      }
+    }
   }
 
   // 'inner' not declared as an inner klass in outer
diff --git a/test/hotspot/jtreg/runtime/InnerClassesAttr/Base.java b/test/hotspot/jtreg/runtime/InnerClassesAttr/Base.java
new file mode 100644
index 00000000000..8d7e637fef2
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/InnerClassesAttr/Base.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package com.g;
+class Base {
+    static class Builder { }
+}
diff --git a/test/hotspot/jtreg/runtime/InnerClassesAttr/Child.java b/test/hotspot/jtreg/runtime/InnerClassesAttr/Child.java
new file mode 100644
index 00000000000..72863aa6102
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/InnerClassesAttr/Child.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package com.g;
+public final class Child extends Base {
+    public Builder setJobName() {
+        return null;
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/InnerClassesAttr/InnerClassesTest.jasm b/test/hotspot/jtreg/runtime/InnerClassesAttr/InnerClassesTest.jasm
new file mode 100644
index 00000000000..fd8982c75e1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/InnerClassesAttr/InnerClassesTest.jasm
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 8079784
+ * @compile InnerClassesTest.jasm Base.java Child.java
+ * @run main com.n.InnerClassesTest
+ */
+
+// Test that if a class's InnerClasses attribute contains a class that is not
+// accessible to the class with the attribute then an IllegalAccessError
+// exception should not get thrown as a result of the class accessing other
+// classes in the InnerClasses attribute.
+//
+// In this test, class InnerClassesTest has an InnerClasses attribute with two
+// entries.  One for inaccessable (non-public) class com/g/Base and class
+// con/g/Base$Builder.  And, one entry for classes com/n/InnerClassTest and
+// com/n/InnerClasses/Test$Foo.  The test accesses com/n/InnerClsses/Test$Foo
+// by calling getSimpleName().  This should not cause an IllegalAccessError
+// exception to get thrown.
+//
+//
+// This jasm code was generated from the following Java code.  The only
+// difference is that, in the jasm code, the order of the entries in the
+// InnerClasses attributes for class InnerClassesTest were switched.
+//
+// package com.n;
+// import com.g.Child;
+//
+// public final class InnerClassesTest {
+//
+//     public static final class Foo { }
+//     void unused() {
+//         new Child().setJobName();
+//     }
+//
+//     public static void main(String[] args) {
+//         Class clazz = InnerClassesTest.Foo.class;
+//         clazz.getSimpleName();
+//     }
+// }
+
+package com/n;
+
+super public final class InnerClassesTest$Foo version 53:0 {
+
+    public Method "":"()V" stack 1 locals 1 {
+        aload_0;
+        invokespecial Method java/lang/Object."":"()V";
+        return;
+    }
+
+public static final InnerClass Foo=class InnerClassesTest$Foo of class InnerClassesTest;
+
+} // end Class InnerClassesTest$Foo
+
+
+super public final class InnerClassesTest version 53:0 {
+
+
+    public Method "":"()V" stack 1 locals 1 {
+        aload_0;
+        invokespecial    Method java/lang/Object."":"()V";
+        return;
+    }
+
+    Method unused:"()V" stack 2 locals 1 {
+        new    class com/g/Child;
+        dup;
+        invokespecial    Method com/g/Child."":"()V";
+        invokevirtual    Method com/g/Child.setJobName:"()Lcom/g/Base$Builder;";
+        pop;
+        return;
+    }
+
+    public static Method main:"([Ljava/lang/String;)V" stack 1 locals 2 {
+        ldc    class InnerClassesTest$Foo;
+        astore_1;
+        aload_1;
+        invokevirtual    Method java/lang/Class.getSimpleName:"()Ljava/lang/String;";
+        pop;
+        return;
+    }
+
+static InnerClass Builder=class com/g/Base$Builder of class com/g/Base;
+public static final InnerClass Foo=class InnerClassesTest$Foo of class InnerClassesTest;
+
+} // end Class InnerClassesTest

From 2e5653c1666cd03350157330979f99c49bcced0e Mon Sep 17 00:00:00 2001
From: Harold Seigel 
Date: Thu, 11 Oct 2018 11:31:37 -0400
Subject: [PATCH 087/124] 8211821: PrintStringTableStatistics crashes JVM

During JVM exit, print the Symbol and String tables before current thread gets deleted.

Reviewed-by: iklam, dholmes
---
 src/hotspot/share/runtime/java.cpp            |  3 --
 src/hotspot/share/runtime/thread.cpp          |  8 ++--
 .../PrintStringTableStatsTest.java            | 43 +++++++++++++++++++
 3 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/PrintStringTableStats/PrintStringTableStatsTest.java

diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index b3f2683f597..a49b4ab7d16 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -575,9 +575,6 @@ void vm_direct_exit(int code) {
 }
 
 void vm_perform_shutdown_actions() {
-  // Warning: do not call 'exit_globals()' here. All threads are still running.
-  // Calling 'exit_globals()' will disable thread-local-storage and cause all
-  // kinds of assertions to trigger in debug mode.
   if (is_init_completed()) {
     Thread* thread = Thread::current_or_null();
     if (thread != NULL && thread->is_Java_thread()) {
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 1c1ee13a388..ed30d3dfbab 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -4212,10 +4212,10 @@ void JavaThread::invoke_shutdown_hooks() {
 //     <-- do not use anything that could get blocked by Safepoint -->
 //   + Disable tracing at JNI/JVM barriers
 //   + Set _vm_exited flag for threads that are still running native code
-//   + Delete this thread
 //   + Call exit_globals()
 //      > deletes tty
 //      > deletes PerfMemory resources
+//   + Delete this thread
 //   + Return to caller
 
 bool Threads::destroy_vm() {
@@ -4291,6 +4291,9 @@ bool Threads::destroy_vm() {
 
   notify_vm_shutdown();
 
+  // exit_globals() will delete tty
+  exit_globals();
+
   // We are after VM_Exit::set_vm_exited() so we can't call
   // thread->smr_delete() or we will block on the Threads_lock.
   // Deleting the shutdown thread here is safe because another
@@ -4304,9 +4307,6 @@ bool Threads::destroy_vm() {
   }
 #endif
 
-  // exit_globals() will delete tty
-  exit_globals();
-
   LogConfiguration::finalize();
 
   return true;
diff --git a/test/hotspot/jtreg/runtime/PrintStringTableStats/PrintStringTableStatsTest.java b/test/hotspot/jtreg/runtime/PrintStringTableStats/PrintStringTableStatsTest.java
new file mode 100644
index 00000000000..73941b3d866
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/PrintStringTableStats/PrintStringTableStatsTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+/*
+ * @test PrintStringTableStatsTest
+ * @bug 8211821
+ * @library /test/lib
+ * @run main PrintStringTableStatsTest
+ */
+
+public class PrintStringTableStatsTest {
+    public static void main(String... args) throws Exception {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-XX:+PrintStringTableStatistics",
+            "--version");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldContain("Number of buckets");
+        output.shouldHaveExitValue(0);
+    }
+}

From b68500521e7119efbe0f0d827186f6060c1a9b08 Mon Sep 17 00:00:00 2001
From: Jean Christophe Beyler 
Date: Thu, 11 Oct 2018 09:30:10 -0700
Subject: [PATCH 088/124] 8211432: [REDO] Handle JNIGlobalRefLocker.cpp

Adding a JNI verification wrapper for tests

Reviewed-by: amenkov, sspitsyn, phh
---
 .../gc/lock/jniref/JNIGlobalRefLocker.cpp     |  18 +--
 .../gc/lock/jniref/libJNIGlobalRefLocker.cpp  |   1 +
 .../nsk/share/jni/ExceptionCheckingJniEnv.cpp | 111 +++++++++++++++++
 .../nsk/share/jni/ExceptionCheckingJniEnv.hpp | 117 ++++++++++++++++++
 4 files changed, 234 insertions(+), 13 deletions(-)
 create mode 100644 test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
 create mode 100644 test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
index 648c72b0bdd..8e7ab509c94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
@@ -20,10 +20,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 #include 
 #include 
 #include 
 #include "jni_tools.h"
+#include "ExceptionCheckingJniEnv.hpp"
 
 extern "C" {
 
@@ -35,28 +37,18 @@ static jfieldID objFieldId = NULL;
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNIGlobalRefLocker_criticalNative
-  (JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+  (JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jobject obj;
         jobject gref;
         time_t start_time, current_time;
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return;
-                }
         }
         obj = env->GetObjectField(o, objFieldId);
-        if (obj == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return;
-        }
         env->SetObjectField(o, objFieldId, NULL);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp
index d523fba861a..2e02b2d395a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp
@@ -24,3 +24,4 @@
 #include "JNIGlobalRefLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
+#include "ExceptionCheckingJniEnv.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
new file mode 100644
index 00000000000..87a752d4f5e
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "ExceptionCheckingJniEnv.hpp"
+
+namespace {
+
+template
+class JNIVerifier {
+ public:
+  JNIVerifier(ExceptionCheckingJniEnv *env, const char* base_msg)
+      : _env(env), _base_msg(base_msg), _return_error(NULL) {
+  }
+
+  ~JNIVerifier() {
+    JNIEnv* jni_env = _env->GetJNIEnv();
+    if (jni_env->ExceptionCheck()) {
+      _env->HandleError(_base_msg);
+      return;
+    }
+
+    if (_return_error != NULL) {
+      ProcessReturnError();
+    }
+  }
+
+  void ProcessReturnError() {
+    int len = snprintf(NULL, 0, "%s : %s", _base_msg, _return_error) + 1;
+
+    if (len <= 0) {
+      _env->HandleError(_return_error);
+      return;
+    }
+
+    char* full_message = (char*) malloc(len);
+    if (full_message == NULL) {
+      _env->HandleError(_return_error);
+      return;
+    }
+
+    snprintf(full_message, len, "%s : %s", _base_msg, _return_error);
+
+    _env->HandleError(full_message);
+    free(full_message);
+  }
+
+  T ResultNotNull(T ptr) {
+    if (ptr == NULL) {
+      _return_error = "Return is NULL";
+    }
+    return ptr;
+  }
+
+ private:
+  ExceptionCheckingJniEnv* _env;
+  const char* const _base_msg;
+  const char* _return_error;
+};
+
+}
+
+jclass ExceptionCheckingJniEnv::GetObjectClass(jobject obj) {
+  JNIVerifier marker(this, "GetObjectClass");
+  return marker.ResultNotNull(_jni_env->GetObjectClass(obj));
+}
+
+jfieldID ExceptionCheckingJniEnv::GetFieldID(jclass klass, const char *name, const char* type) {
+  JNIVerifier marker(this, "GetObjectClass");
+  return marker.ResultNotNull(_jni_env->GetFieldID(klass, name, type));
+}
+
+jobject ExceptionCheckingJniEnv::GetObjectField(jobject obj, jfieldID field) {
+  JNIVerifier marker(this, "GetObjectField");
+  return marker.ResultNotNull(_jni_env->GetObjectField(obj, field));
+}
+
+void ExceptionCheckingJniEnv::SetObjectField(jobject obj, jfieldID field, jobject value) {
+  JNIVerifier<> marker(this, "SetObjectField");
+  _jni_env->SetObjectField(obj, field, value);
+}
+
+jobject ExceptionCheckingJniEnv::NewGlobalRef(jobject obj) {
+  JNIVerifier marker(this, "GetObjectField");
+  return marker.ResultNotNull(_jni_env->NewGlobalRef(obj));
+}
+
+void ExceptionCheckingJniEnv::DeleteGlobalRef(jobject obj) {
+  JNIVerifier<> marker(this, "DeleteGlobalRef");
+  _jni_env->DeleteGlobalRef(obj);
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp
new file mode 100644
index 00000000000..5345ce7d419
--- /dev/null
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+#ifndef NSK_EXCEPTIONCHECKINGJNIENV_DEFINED
+#define NSK_EXCEPTIONCHECKINGJNIENV_DEFINED
+
+#include 
+
+/**
+ * ExceptionCheckingJniEnv wraps around the JNIEnv data structure and
+ * methods to enable automatic exception checking. This allows test writers
+ * and readers to concentrate on what the test is to do and leave the
+ * error checking and throwing to this data structure and subsystem.
+ *
+ * For example:
+ *
+ * ... JNIEnv* env ...
+ *  jclass klass = env->GetObjectClass(o);
+ *  if (klass == NULL) {
+ *      printf("Error: GetObjectClass returned NULL\n");
+ *      return;
+ *  }
+ *  if (env->ExceptionCheck()) {
+ *    ...
+ *  }
+ *
+ *  Can be simplified to:
+ * ... ExceptionCheckingJniEnv* env ...
+ *  jclass klass = env->GetObjectClass(o);
+ *
+ *  Where now the JNI Exception checking and the NULL return checking are done
+ *  internally and will perform whatever action the ErrorHandler requires.
+ *
+ *  By default, the error handler describes the exception via the JNI
+ *  ExceptionDescribe method and calls FatalError.
+ *
+ *  Note: at a future date, this will also include the tracing mechanism done in
+ *  NSK_VERIFY, which will thus embed its logic into the ExceptionCheckingJniEnv
+ *  and clearing that up for the code readers and writers.
+ */
+class ExceptionCheckingJniEnv {
+ public:
+  // JNIEnv API redefinitions.
+  jfieldID GetFieldID(jclass klass, const char *name, const char* type);
+  jclass GetObjectClass(jobject obj);
+  jobject GetObjectField(jobject obj, jfieldID field);
+  void SetObjectField(jobject obj, jfieldID field, jobject value);
+
+  jobject NewGlobalRef(jobject obj);
+  void DeleteGlobalRef(jobject obj);
+
+  // ExceptionCheckingJniEnv methods.
+  JNIEnv* GetJNIEnv() {
+    return _jni_env;
+  }
+
+  void HandleError(const char* msg) {
+    if (_error_handler) {
+      _error_handler(_jni_env, msg);
+    }
+  }
+
+  typedef void (*ErrorHandler)(JNIEnv* env, const char* error_message);
+
+  static void FatalError(JNIEnv* env, const char* message) {
+    if (env->ExceptionCheck()) {
+      env->ExceptionDescribe();
+    }
+    env->FatalError(message);
+  }
+
+  ExceptionCheckingJniEnv(JNIEnv* jni_env, ErrorHandler error_handler) :
+    _jni_env(jni_env), _error_handler(error_handler) {}
+
+ private:
+  JNIEnv* _jni_env;
+  ErrorHandler _error_handler;
+};
+
+// We cannot use unique_ptr due to this being gnu98++, so use this instead:
+class ExceptionCheckingJniEnvPtr {
+ private:
+  ExceptionCheckingJniEnv _env;
+
+ public:
+  ExceptionCheckingJniEnv* operator->() {
+    return &_env;
+  }
+
+  ExceptionCheckingJniEnvPtr(
+      JNIEnv* jni_env,
+      ExceptionCheckingJniEnv::ErrorHandler error_handler = ExceptionCheckingJniEnv::FatalError) :
+          _env(jni_env, error_handler) {
+  }
+};
+
+#endif

From 3eef363b698d13aa205e891ad97ba8831975fbb7 Mon Sep 17 00:00:00 2001
From: Jean Christophe Beyler 
Date: Thu, 11 Oct 2018 12:41:47 -0700
Subject: [PATCH 089/124] 8212025: Remove collector_present variable from
 ThreadHeapSampler

Remove unused variable from ThreadHeapSampler

Reviewed-by: tschatzl, pliden
---
 src/hotspot/share/runtime/threadHeapSampler.hpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/hotspot/share/runtime/threadHeapSampler.hpp b/src/hotspot/share/runtime/threadHeapSampler.hpp
index 06bfbc8635e..2b89ffab567 100644
--- a/src/hotspot/share/runtime/threadHeapSampler.hpp
+++ b/src/hotspot/share/runtime/threadHeapSampler.hpp
@@ -39,10 +39,6 @@ class ThreadHeapSampler {
   static int _enabled;
   static int _sampling_interval;
 
-  // Used for assertion mode to determine if there is a path to a TLAB slow path
-  // without a collector present.
-  size_t _collectors_present;
-
   static void init_log_table();
 
  public:
@@ -51,8 +47,6 @@ class ThreadHeapSampler {
     if (_rnd == 0) {
       _rnd = 1;
     }
-
-    _collectors_present = 0;
   }
 
   size_t bytes_until_sample()                    { return _bytes_until_sample;   }

From 7ea2bd922bbf1acb8ee9376ca2d12f8982dbc08d Mon Sep 17 00:00:00 2001
From: Roman Kennke 
Date: Thu, 11 Oct 2018 23:48:55 +0200
Subject: [PATCH 090/124] 8212054: Boilerplate to bind oopDesc::equals_raw() to
 actual raw implementation

Reviewed-by: shade, eosterlund
---
 src/hotspot/share/oops/accessBackend.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/oops/accessBackend.hpp b/src/hotspot/share/oops/accessBackend.hpp
index 5a170ec3d9f..108d8acb1eb 100644
--- a/src/hotspot/share/oops/accessBackend.hpp
+++ b/src/hotspot/share/oops/accessBackend.hpp
@@ -998,7 +998,7 @@ namespace AccessInternal {
 
     template 
     inline static typename EnableIf<
-      HasDecorator::value, bool>::type
+      HasDecorator::value || HasDecorator::value, bool>::type
     equals(oop o1, oop o2) {
       typedef RawAccessBarrier Raw;
       return Raw::equals(o1, o2);
@@ -1006,7 +1006,7 @@ namespace AccessInternal {
 
     template 
     inline static typename EnableIf<
-      !HasDecorator::value, bool>::type
+      !HasDecorator::value && !HasDecorator::value, bool>::type
     equals(oop o1, oop o2) {
       return RuntimeDispatch::equals(o1, o2);
     }

From b3de6ff3a6d56572f153c1b0ef039b3bf9982e97 Mon Sep 17 00:00:00 2001
From: Muthusamy Chinnathambi 
Date: Thu, 11 Oct 2018 15:49:23 -0700
Subject: [PATCH 091/124] 8211714: Need to update vm_version.cpp to recognise
 VS2017 minor versions

Reviewed-by: dholmes
---
 src/hotspot/share/runtime/vm_version.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hotspot/share/runtime/vm_version.cpp b/src/hotspot/share/runtime/vm_version.cpp
index fffa5da5205..eb05460adef 100644
--- a/src/hotspot/share/runtime/vm_version.cpp
+++ b/src/hotspot/share/runtime/vm_version.cpp
@@ -218,10 +218,16 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 12.0 (VS2013)"
       #elif _MSC_VER == 1900
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 14.0 (VS2015)"
+      #elif _MSC_VER == 1911
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 15.3 (VS2017)"
       #elif _MSC_VER == 1912
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 15.5 (VS2017)"
       #elif _MSC_VER == 1913
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 15.6 (VS2017)"
+      #elif _MSC_VER == 1914
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 15.7 (VS2017)"
+      #elif _MSC_VER == 1915
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 15.8 (VS2017)"
       #else
         #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
       #endif

From 7014d0bdf8bcc66a121f576db2074d4fb0a43fa5 Mon Sep 17 00:00:00 2001
From: Hamlin Li 
Date: Fri, 12 Oct 2018 10:35:24 +0800
Subject: [PATCH 092/124] 8186610: move ModuleUtils to top-level testlibrary

Reviewed-by: alanb, iignatyev
---
 test/jdk/java/lang/ModuleLayer/BasicLayerTest.java         | 7 +++++--
 test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java    | 7 +++++--
 test/jdk/java/lang/ModuleLayer/LayerControllerTest.java    | 7 +++++--
 test/jdk/java/lang/module/AutomaticModulesTest.java        | 6 ++++--
 test/jdk/java/lang/module/ConfigurationTest.java           | 7 +++++--
 .../SystemModuleDescriptors}/ModuleTargetHelper.java       | 0
 .../plugins/SystemModuleDescriptors/SystemModulesTest.java | 1 -
 .../plugins/SystemModuleDescriptors/UserModuleTest.java    | 2 +-
 .../testlibrary => lib/jdk/test/lib/util}/ModuleUtils.java | 4 +++-
 9 files changed, 28 insertions(+), 13 deletions(-)
 rename test/jdk/{lib/testlibrary => tools/jlink/plugins/SystemModuleDescriptors}/ModuleTargetHelper.java (100%)
 rename test/{jdk/lib/testlibrary => lib/jdk/test/lib/util}/ModuleUtils.java (96%)

diff --git a/test/jdk/java/lang/ModuleLayer/BasicLayerTest.java b/test/jdk/java/lang/ModuleLayer/BasicLayerTest.java
index c3f4a1337b2..e697b285ef9 100644
--- a/test/jdk/java/lang/ModuleLayer/BasicLayerTest.java
+++ b/test/jdk/java/lang/ModuleLayer/BasicLayerTest.java
@@ -23,9 +23,10 @@
 
 /**
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
- * @build BasicLayerTest ModuleUtils
+ * @build BasicLayerTest
+ *        jdk.test.lib.util.ModuleUtils
  * @compile layertest/Test.java
  * @run testng BasicLayerTest
  * @summary Basic tests for java.lang.ModuleLayer
@@ -41,6 +42,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jdk.test.lib.util.ModuleUtils;
+
 import jdk.internal.misc.SharedSecrets;
 
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java b/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java
index 96449bda594..8b60fe13212 100644
--- a/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java
+++ b/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java
@@ -23,9 +23,11 @@
 
 /**
  * @test
- * @library /lib/testlibrary /test/lib
+ * @library /test/lib
  * @modules jdk.compiler
- * @build LayerAndLoadersTest jdk.test.lib.compiler.CompilerUtils ModuleUtils
+ * @build LayerAndLoadersTest
+ *        jdk.test.lib.compiler.CompilerUtils
+ *        jdk.test.lib.util.ModuleUtils
  * @run testng LayerAndLoadersTest
  * @summary Tests for java.lang.ModuleLayer@defineModulesWithXXX methods
  */
@@ -54,6 +56,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.util.ModuleUtils;
 
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
diff --git a/test/jdk/java/lang/ModuleLayer/LayerControllerTest.java b/test/jdk/java/lang/ModuleLayer/LayerControllerTest.java
index 68e9106226b..b15a9e9100b 100644
--- a/test/jdk/java/lang/ModuleLayer/LayerControllerTest.java
+++ b/test/jdk/java/lang/ModuleLayer/LayerControllerTest.java
@@ -23,8 +23,9 @@
 
 /**
  * @test
- * @library /lib/testlibrary
- * @build LayerControllerTest ModuleUtils
+ * @library /test/lib
+ * @build LayerControllerTest
+ *        jdk.test.lib.util.ModuleUtils
  * @run testng LayerControllerTest
  * @summary Basic tests for java.lang.ModuleLayer.Controller
  */
@@ -35,6 +36,8 @@ import java.lang.module.ModuleFinder;
 import java.util.List;
 import java.util.Set;
 
+import jdk.test.lib.util.ModuleUtils;
+
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 
diff --git a/test/jdk/java/lang/module/AutomaticModulesTest.java b/test/jdk/java/lang/module/AutomaticModulesTest.java
index 61b4be018fb..756f3ab2eab 100644
--- a/test/jdk/java/lang/module/AutomaticModulesTest.java
+++ b/test/jdk/java/lang/module/AutomaticModulesTest.java
@@ -23,9 +23,10 @@
 
 /**
  * @test
- * @library /lib/testlibrary /test/lib
- * @build AutomaticModulesTest ModuleUtils
+ * @library /test/lib
+ * @build AutomaticModulesTest
  *        jdk.test.lib.util.JarUtils
+ *        jdk.test.lib.util.ModuleUtils
  * @run testng AutomaticModulesTest
  * @summary Basic tests for automatic modules
  */
@@ -50,6 +51,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import jdk.test.lib.util.JarUtils;
+import jdk.test.lib.util.ModuleUtils;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
diff --git a/test/jdk/java/lang/module/ConfigurationTest.java b/test/jdk/java/lang/module/ConfigurationTest.java
index b06aaf03cf8..e1264acdd0a 100644
--- a/test/jdk/java/lang/module/ConfigurationTest.java
+++ b/test/jdk/java/lang/module/ConfigurationTest.java
@@ -23,10 +23,11 @@
 
 /**
  * @test
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.base/jdk.internal.module
- * @build ConfigurationTest ModuleUtils
+ * @build ConfigurationTest
+ *        jdk.test.lib.util.ModuleUtils
  * @run testng ConfigurationTest
  * @summary Basic tests for java.lang.module.Configuration
  */
@@ -47,6 +48,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
+import jdk.test.lib.util.ModuleUtils;
+
 import jdk.internal.misc.SharedSecrets;
 import jdk.internal.module.ModuleInfoWriter;
 import jdk.internal.module.ModuleTarget;
diff --git a/test/jdk/lib/testlibrary/ModuleTargetHelper.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/ModuleTargetHelper.java
similarity index 100%
rename from test/jdk/lib/testlibrary/ModuleTargetHelper.java
rename to test/jdk/tools/jlink/plugins/SystemModuleDescriptors/ModuleTargetHelper.java
diff --git a/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
index 6f83ebc89a5..0b969497303 100644
--- a/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
+++ b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
@@ -42,7 +42,6 @@ import static org.testng.Assert.*;
 /**
  * @test
  * @bug 8142968 8173381
- * @library /lib/testlibrary
  * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.module
  * @modules java.base/jdk.internal.org.objectweb.asm
diff --git a/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
index a4c25e0aff6..e3617d925a8 100644
--- a/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
+++ b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
@@ -44,7 +44,7 @@ import static org.testng.Assert.*;
 /**
  * @test
  * @bug 8142968 8173381 8174740
- * @library /lib/testlibrary /test/lib
+ * @library /test/lib
  * @modules jdk.compiler jdk.jlink
  * @modules java.base/jdk.internal.module
  * @modules java.base/jdk.internal.org.objectweb.asm
diff --git a/test/jdk/lib/testlibrary/ModuleUtils.java b/test/lib/jdk/test/lib/util/ModuleUtils.java
similarity index 96%
rename from test/jdk/lib/testlibrary/ModuleUtils.java
rename to test/lib/jdk/test/lib/util/ModuleUtils.java
index b3c9d5e49c8..d97fd953b99 100644
--- a/test/jdk/lib/testlibrary/ModuleUtils.java
+++ b/test/lib/jdk/test/lib/util/ModuleUtils.java
@@ -21,6 +21,8 @@
  * questions.
  */
 
+package jdk.test.lib.util;
+
 import java.lang.module.ModuleDescriptor;
 import java.lang.module.ModuleFinder;
 import java.lang.module.ModuleReader;
@@ -47,7 +49,7 @@ public final class ModuleUtils {
      * Returns a ModuleFinder that finds modules with the given module
      * descriptors.
      */
-    static ModuleFinder finderOf(ModuleDescriptor... descriptors) {
+    public static ModuleFinder finderOf(ModuleDescriptor... descriptors) {
 
         // Create a ModuleReference for each module
         Map namesToReference = new HashMap<>();

From 1d8a27195c5a26b355cbf3b7d62d8f928cd7ddf2 Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier 
Date: Fri, 12 Oct 2018 08:33:18 +0200
Subject: [PATCH 093/124] 8211931: [ppc][testbug]
 runtime/jni/terminatedThread/TestTerminatedThread.java fails as threads don't
 terminate immediately

Reviewed-by: dholmes, mdoerr
---
 .../TestTerminatedThread.java                 | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/jni/terminatedThread/TestTerminatedThread.java b/test/hotspot/jtreg/runtime/jni/terminatedThread/TestTerminatedThread.java
index 1cc79fa8307..df8e68eb052 100644
--- a/test/hotspot/jtreg/runtime/jni/terminatedThread/TestTerminatedThread.java
+++ b/test/hotspot/jtreg/runtime/jni/terminatedThread/TestTerminatedThread.java
@@ -85,10 +85,14 @@ public class TestTerminatedThread {
             System.out.println("Calling getThreadCpuTime ...");
             long t1 = mbean.getThreadCpuTime(t.getId());
             if (t1 != -1) {
-                throw new RuntimeException("Invalid ThreadCpuTime returned = " +
-                                           t1 + " expected = -1");
+                // At least on PPC, we know threads can still be around a short
+                // instant. In some stress scenarios we seem to grab times of
+                // new threads started with the same thread id. In these cases
+                // we get here.
+                System.out.println("Unexpected: thread still reports CPU time: " + t1);
+            } else {
+                System.out.println("Okay: getThreadCpuTime() reported -1 as expected");
             }
-            System.out.println("Okay: getThreadCpuTime() reported -1 as expected");
         } else {
             System.out.println("Skipping Thread CPU time test as it's not supported");
         }
@@ -96,10 +100,14 @@ public class TestTerminatedThread {
         System.out.println("Calling getThreadUserTime ...");
         long t1 = mbean.getThreadUserTime(t.getId());
         if (t1 != -1) {
-            throw new RuntimeException("Invalid ThreadUserTime returned = " +
-                                       t1 + " expected = -1");
+            // At least on PPC, we know threads can still be around a short
+            // instant. In some stress scenarios we seem to grab times of
+            // new threads started with the same thread id. In these cases
+            // we get here.
+            System.out.println("Unexpected: thread still reports User time: " + t1);
+        } else {
+            System.out.println("Okay: getThreadUserTime() reported -1 as expected");
         }
-        System.out.println("Okay: getThreadUserTime() reported -1 as expected");
 
         System.out.println("Calling getThreadInfo ...");
         ThreadInfo info = mbean.getThreadInfo(t.getId());

From f4df5cb4c3a6221c1394dda8c33249920e6bbaaa Mon Sep 17 00:00:00 2001
From: Vyom Tewari 
Date: Fri, 12 Oct 2018 12:37:13 +0530
Subject: [PATCH 094/124] 8189366: SocketInputStream.available() should check
 for eof

Reviewed-by: chegar
---
 .../classes/java/net/SocketInputStream.java   |  6 +-
 test/jdk/java/net/Socket/CloseAvailable.java  | 79 ++++++++++++++-----
 2 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/src/java.base/share/classes/java/net/SocketInputStream.java b/src/java.base/share/classes/java/net/SocketInputStream.java
index c4dbb5d59dd..717f37067ee 100644
--- a/src/java.base/share/classes/java/net/SocketInputStream.java
+++ b/src/java.base/share/classes/java/net/SocketInputStream.java
@@ -232,7 +232,11 @@ class SocketInputStream extends FileInputStream {
      * @return the number of immediately available bytes
      */
     public int available() throws IOException {
-        return impl.available();
+        if (eof) {
+            return 0;
+        } else {
+            return impl.available();
+        }
     }
 
     /**
diff --git a/test/jdk/java/net/Socket/CloseAvailable.java b/test/jdk/java/net/Socket/CloseAvailable.java
index c79a914fc22..2b443cc6475 100644
--- a/test/jdk/java/net/Socket/CloseAvailable.java
+++ b/test/jdk/java/net/Socket/CloseAvailable.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4091859
+ * @bug 4091859 8189366
  * @summary Test Socket.available()
  * @run main CloseAvailable
  * @run main/othervm -Djava.net.preferIPv4Stack=true CloseAvailable
@@ -33,18 +33,32 @@ import java.net.*;
 import java.io.*;
 
 
-public class CloseAvailable implements Runnable {
-    static ServerSocket ss;
-    static InetAddress addr;
-    static int port;
+public class CloseAvailable {
 
     public static void main(String[] args) throws Exception {
-        boolean error = true;
-        addr = InetAddress.getLocalHost();
-        ss = new ServerSocket(0);
-        port = ss.getLocalPort();
+        testClose();
+
+        testEOF(true);
+        testEOF(false);
+    }
+
+    static void testClose() throws IOException {
+        boolean error = true;
+        InetAddress addr = InetAddress.getLocalHost();
+        ServerSocket ss = new ServerSocket(0);
+        int port = ss.getLocalPort();
+
+        Thread t = new Thread(new Thread("Close-Available-1") {
+            public void run() {
+                try {
+                    Socket s = new Socket(addr, port);
+                    s.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
 
-        Thread t = new Thread(new CloseAvailable());
         t.start();
 
         Socket  soc = ss.accept();
@@ -63,13 +77,42 @@ public class CloseAvailable implements Runnable {
             throw new RuntimeException("Available() can be called after stream closed.");
     }
 
-    public void run() {
-        try {
-            Socket s = new Socket(addr, port);
-            s.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+    // Verifies consistency of `available` behaviour when EOF reached, both
+    // explicitly and implicitly.
+    static void testEOF(boolean readUntilEOF) throws IOException {
+        System.out.println("testEOF, readUntilEOF: " + readUntilEOF);
+        InetAddress addr = InetAddress.getLoopbackAddress();
+        ServerSocket ss = new ServerSocket();
+        ss.bind(new InetSocketAddress(addr, 0), 0);
+        int port = ss.getLocalPort();
 
+        try (Socket s = new Socket(addr, port)) {
+            s.getOutputStream().write(0x42);
+            s.shutdownOutput();
+
+            try (Socket soc = ss.accept()) {
+                ss.close();
+
+                InputStream is = soc.getInputStream();
+                int b = is.read();
+                assert b == 0x42;
+                assert !s.isClosed();
+                if (readUntilEOF) {
+                    b = is.read();
+                    assert b == -1;
+                }
+
+                int a;
+                for (int i = 0; i < 100; i++) {
+                    a = is.available();
+                    System.out.print(a + ", ");
+                    if (a != 0)
+                        throw new RuntimeException("Unexpected non-zero available: " + a);
+                }
+                assert !s.isClosed();
+                assert is.read() == -1;
+            }
+        }
+        System.out.println("\ncomplete");
+    }
 }

From 55692eb0ca9ee5bd1b23ca3c2b9eb82b14f50091 Mon Sep 17 00:00:00 2001
From: David Holmes 
Date: Fri, 12 Oct 2018 03:51:02 -0400
Subject: [PATCH 095/124] 8211046: Forced data dependencies serve no purpose on
 x86

Reviewed-by: eosterlund, rehn
---
 .../cpu/x86/jniFastGetField_x86_64.cpp        | 29 ++-----------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
index 179c1b55c95..0787f4e8720 100644
--- a/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
+++ b/src/hotspot/cpu/x86/jniFastGetField_x86_64.cpp
@@ -35,9 +35,6 @@
 
 #define BUFFER_SIZE 30*wordSize
 
-// Instead of issuing lfence for LoadLoad barrier, we create data dependency
-// between loads, which is more efficient than lfence.
-
 // Common register usage:
 // rax/xmm0: result
 // c_rarg0:    jni env
@@ -77,12 +74,6 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
   __ mov   (robj, c_rarg1);
   __ testb (rcounter, 1);
   __ jcc (Assembler::notZero, slow);
-
-  __ xorptr(robj, rcounter);
-  __ xorptr(robj, rcounter);  // obj, since
-                              // robj ^ rcounter ^ rcounter == robj
-                              // robj is data dependent on rcounter.
-
   __ mov   (roffset, c_rarg2);
   __ shrptr(roffset, 2);                         // offset
 
@@ -103,12 +94,7 @@ address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
     default:        ShouldNotReachHere();
   }
 
-  // create data dependency on rax
-  __ lea(rcounter_addr, counter);
-  __ xorptr(rcounter_addr, rax);
-  __ xorptr(rcounter_addr, rax);
-  __ cmpl (rcounter, Address(rcounter_addr, 0));
-
+  __ cmp32 (rcounter, counter);
   __ jcc (Assembler::notEqual, slow);
 
   __ ret (0);
@@ -178,11 +164,6 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
   __ testb (rcounter, 1);
   __ jcc (Assembler::notZero, slow);
 
-  __ xorptr(robj, rcounter);
-  __ xorptr(robj, rcounter);  // obj, since
-                              // robj ^ rcounter ^ rcounter == robj
-                              // robj is data dependent on rcounter.
-
   // Both robj and rtmp are clobbered by try_resolve_jobject_in_native.
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
   bs->try_resolve_jobject_in_native(masm, /* jni_env */ c_rarg0, robj, rtmp, slow);
@@ -198,13 +179,7 @@ address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
     case T_DOUBLE: __ movdbl (xmm0, Address(robj, roffset, Address::times_1)); break;
     default:        ShouldNotReachHere();
   }
-
-  __ lea(rcounter_addr, counter);
-  __ movdq (rax, xmm0);
-  // counter address is data dependent on xmm0.
-  __ xorptr(rcounter_addr, rax);
-  __ xorptr(rcounter_addr, rax);
-  __ cmpl (rcounter, Address(rcounter_addr, 0));
+  __ cmp32 (rcounter, counter);
   __ jcc (Assembler::notEqual, slow);
 
   __ ret (0);

From 96b43418b5f4aa41d51da0a45d6eff1c1bf86ce6 Mon Sep 17 00:00:00 2001
From: Michael McMahon 
Date: Fri, 12 Oct 2018 11:12:51 +0100
Subject: [PATCH 096/124] 8203850: java.net.http HTTP client should allow
 specifying Origin and Referer headers

Reviewed-by: chegar, dfuchs
---
 .../jdk/internal/net/http/common/Utils.java   |  4 +-
 .../net/httpclient/RequestBuilderTest.java    | 28 +++++++--
 .../net/httpclient/SpecialHeadersTest.java    | 60 ++++++++++++++++++-
 3 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
index 85898d59571..7632b000be2 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
@@ -133,9 +133,7 @@ public final class Utils {
         // A case insensitive TreeSet of strings.
         TreeSet treeSet = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
         treeSet.addAll(Set.of("connection", "content-length",
-                "date", "expect", "from", "host", "origin",
-                "referer", "upgrade",
-                "via", "warning"));
+                "date", "expect", "from", "host", "upgrade", "via", "warning"));
         DISALLOWED_HEADERS_SET = Collections.unmodifiableSet(treeSet);
     }
 
diff --git a/test/jdk/java/net/httpclient/RequestBuilderTest.java b/test/jdk/java/net/httpclient/RequestBuilderTest.java
index 2d90475b238..8c2526e9697 100644
--- a/test/jdk/java/net/httpclient/RequestBuilderTest.java
+++ b/test/jdk/java/net/httpclient/RequestBuilderTest.java
@@ -337,15 +337,31 @@ public class RequestBuilderTest {
         }
     }
 
+    // headers that are allowed now, but weren't before
+    private static final Set FORMERLY_RESTRICTED = Set.of("referer", "origin",
+            "OriGin", "Referer");
+
+    @Test
+    public void testFormerlyRestricted()  throws URISyntaxException {
+        URI uri = new URI("http://localhost:80/test/");
+        URI otherURI = new URI("http://www.foo.com/test/");
+        for (String header : FORMERLY_RESTRICTED) {
+            HttpRequest req = HttpRequest.newBuilder(uri)
+                .header(header, otherURI.toString())
+                .GET()
+                .build();
+        }
+    }
+
     private static final Set RESTRICTED = Set.of("connection", "content-length",
-            "date", "expect", "from", "host", "origin",
-            "referer", "upgrade", "via", "warning",
+            "date", "expect", "from", "host",
+            "upgrade", "via", "warning",
             "Connection", "Content-Length",
-            "DATE", "eXpect", "frOm", "hosT", "origIN",
-            "ReFerer", "upgradE", "vIa", "Warning",
+            "DATE", "eXpect", "frOm", "hosT",
+            "upgradE", "vIa", "Warning",
             "CONNection", "CONTENT-LENGTH",
-            "Date", "EXPECT", "From", "Host", "Origin",
-            "Referer", "Upgrade", "Via", "WARNING");
+            "Date", "EXPECT", "From", "Host",
+            "Upgrade", "Via", "WARNING");
 
     interface WithHeader {
         HttpRequest.Builder withHeader(HttpRequest.Builder builder, String name, String value);
diff --git a/test/jdk/java/net/httpclient/SpecialHeadersTest.java b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
index 4bb76e80e0c..ddf054f3aea 100644
--- a/test/jdk/java/net/httpclient/SpecialHeadersTest.java
+++ b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
@@ -57,21 +57,25 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
+import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 
 import static java.lang.System.err;
 import static java.lang.System.out;
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.US_ASCII;
+import org.testng.Assert;
 import static org.testng.Assert.assertEquals;
 
 public class SpecialHeadersTest implements HttpServerAdapters {
@@ -91,6 +95,13 @@ public class SpecialHeadersTest implements HttpServerAdapters {
             {"User-Agent: camel-cased"},
             {"user-agent: all-lower-case"},
             {"user-Agent: mixed"},
+            // headers which were restricted before and are now allowable
+            {"referer: lower"},
+            {"Referer: normal"},
+            {"REFERER: upper"},
+            {"origin: lower"},
+            {"Origin: normal"},
+            {"ORIGIN: upper"},
     };
 
     @DataProvider(name = "variants")
@@ -168,6 +179,50 @@ public class SpecialHeadersTest implements HttpServerAdapters {
         }
     }
 
+    @Test(dataProvider = "variants")
+    void testHomeMadeIllegalHeader(String uriString, String headerNameAndValue, boolean sameClient) throws Exception {
+        out.println("\n--- Starting ");
+        final URI uri = URI.create(uriString);
+
+        HttpClient client = HttpClient.newBuilder()
+                .proxy(NO_PROXY)
+                .sslContext(sslContext)
+                .build();
+
+        // Test a request which contains an illegal header created
+        HttpRequest req = new HttpRequest() {
+            @Override public Optional bodyPublisher() {
+                return Optional.of(BodyPublishers.noBody());
+            }
+            @Override public String method() {
+                return "GET";
+            }
+            @Override public Optional timeout() {
+                return Optional.empty();
+            }
+            @Override public boolean expectContinue() {
+                return false;
+            }
+            @Override public URI uri() {
+                return uri;
+            }
+            @Override public Optional version() {
+                return Optional.empty();
+            }
+            @Override public HttpHeaders headers() {
+                Map> map = Map.of("via", List.of("http://foo.com"));
+                return HttpHeaders.of(map, (x, y) -> true);
+            }
+        };
+
+        try {
+            HttpResponse response = client.send(req, BodyHandlers.ofString());
+            Assert.fail("Unexpected reply: " + response);
+        } catch (IllegalArgumentException ee) {
+            out.println("Got IAE as expected");
+        }
+    }
+
     @Test(dataProvider = "variants")
     void testAsync(String uriString, String headerNameAndValue, boolean sameClient) {
         out.println("\n--- Starting ");
@@ -259,7 +314,10 @@ public class SpecialHeadersTest implements HttpServerAdapters {
         https2TestServer.stop();
     }
 
-    /** A handler that returns, as its body, the exact received request URI. */
+    /** A handler that returns, as its body, the exact received request URI.
+     *  The header whose name is in the URI query and is set in the request is
+     *  returned in the response with its name prefixed by X-
+     */
     static class HttpUriStringHandler implements HttpTestHandler {
         @Override
         public void handle(HttpTestExchange t) throws IOException {

From f958e6642e27776192169d652a80c187dd3f1dbe Mon Sep 17 00:00:00 2001
From: Roman Kennke 
Date: Fri, 12 Oct 2018 16:25:24 +0200
Subject: [PATCH 097/124] 8212053: A few more missing object equals barriers

Reviewed-by: shade, zgu
---
 src/hotspot/share/oops/compressedOops.inline.hpp | 2 +-
 src/hotspot/share/runtime/vframe.cpp             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/oops/compressedOops.inline.hpp b/src/hotspot/share/oops/compressedOops.inline.hpp
index e3b1f8b6144..d9aacacde34 100644
--- a/src/hotspot/share/oops/compressedOops.inline.hpp
+++ b/src/hotspot/share/oops/compressedOops.inline.hpp
@@ -66,7 +66,7 @@ namespace CompressedOops {
     assert(OopEncodingHeapMax > pd, "change encoding max if new encoding");
     uint64_t result = pd >> shift;
     assert((result & CONST64(0xffffffff00000000)) == 0, "narrow oop overflow");
-    assert(decode(result) == v, "reversibility");
+    assert(oopDesc::equals_raw(decode(result), v), "reversibility");
     return (narrowOop)result;
   }
 
diff --git a/src/hotspot/share/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp
index c33c7d5b5b4..066f333ee9c 100644
--- a/src/hotspot/share/runtime/vframe.cpp
+++ b/src/hotspot/share/runtime/vframe.cpp
@@ -134,7 +134,7 @@ GrowableArray* javaVFrame::locked_monitors() {
     //
     // Skip the monitor that the thread is blocked to enter or waiting on
     //
-    if (!found_first_monitor && (obj == pending_obj || obj == waiting_obj)) {
+    if (!found_first_monitor && (oopDesc::equals(obj, pending_obj) || oopDesc::equals(obj, waiting_obj))) {
       continue;
     }
     found_first_monitor = true;

From cfb6fb66c2ac4f7a7a777c3897a8f19a9f7a8757 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf 
Date: Fri, 12 Oct 2018 10:58:06 +0200
Subject: [PATCH 098/124] 8212110: Build of saproc.dll broken on Windows 32 bit
 after JDK-8210647

Only add RTC1 compile flag for slowdebug builds.

Reviewed-by: mdoerr, erikj
---
 make/lib/Lib-jdk.hotspot.agent.gmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
index c7f838a3e2d..d9f25168505 100644
--- a/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
@@ -44,7 +44,12 @@ else ifeq ($(OPENJDK_TARGET_OS), windows)
   ifeq ($(OPENJDK_TARGET_CPU), x86_64)
     SA_CXXFLAGS := -DWIN64
   else
-    SA_CXXFLAGS := -RTC1
+    # Only add /RTC1 flag for debug builds as it's
+    # incompatible with release type builds. See
+    # https://msdn.microsoft.com/en-us/library/8wtf2dfz.aspx
+    ifeq ($(DEBUG_LEVEL),slowdebug)
+      SA_CXXFLAGS := -RTC1
+    endif
   endif
 endif
 

From cbe11130f58bfb7331ff75f4eb0dbca4e4902ca7 Mon Sep 17 00:00:00 2001
From: Muthusamy Chinnathambi 
Date: Tue, 9 Oct 2018 16:08:07 +0530
Subject: [PATCH 099/124] 8027434: "-XX:OnOutOfMemoryError" uses fork instead
 of vfork

Reviewed-by: dholmes, iklam
---
 src/hotspot/os/aix/os_aix.cpp           |  2 +-
 src/hotspot/os/bsd/os_bsd.cpp           |  2 +-
 src/hotspot/os/linux/os_linux.cpp       | 10 ++++++++--
 src/hotspot/os/solaris/os_solaris.cpp   |  2 +-
 src/hotspot/os/windows/os_windows.cpp   |  2 +-
 src/hotspot/share/runtime/os.hpp        |  2 +-
 src/hotspot/share/utilities/vmError.cpp |  2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 98bc3f655bd..0538841dceb 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -4259,7 +4259,7 @@ extern char** environ;
 // or -1 on failure (e.g. can't fork a new process).
 // Unlike system(), this function can be called from signal handler. It
 // doesn't block SIGINT et al.
-int os::fork_and_exec(char* cmd) {
+int os::fork_and_exec(char* cmd, bool use_vfork_if_available) {
   char * argv[4] = {"sh", "-c", cmd, NULL};
 
   pid_t pid = fork();
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 73dfc6f1ec6..be170883bb6 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -3785,7 +3785,7 @@ extern char** environ;
 // or -1 on failure (e.g. can't fork a new process).
 // Unlike system(), this function can be called from signal handler. It
 // doesn't block SIGINT et al.
-int os::fork_and_exec(char* cmd) {
+int os::fork_and_exec(char* cmd, bool use_vfork_if_available) {
   const char * argv[4] = {"sh", "-c", cmd, NULL};
 
   // fork() in BsdThreads/NPTL is not async-safe. It needs to run
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 40f97ad026b..51dea34407a 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -5676,10 +5676,16 @@ extern char** environ;
 // or -1 on failure (e.g. can't fork a new process).
 // Unlike system(), this function can be called from signal handler. It
 // doesn't block SIGINT et al.
-int os::fork_and_exec(char* cmd) {
+int os::fork_and_exec(char* cmd, bool use_vfork_if_available) {
   const char * argv[4] = {"sh", "-c", cmd, NULL};
 
-  pid_t pid = fork();
+  pid_t pid ;
+
+  if (use_vfork_if_available) {
+    pid = vfork();
+  } else {
+    pid = fork();
+  }
 
   if (pid < 0) {
     // fork failed
diff --git a/src/hotspot/os/solaris/os_solaris.cpp b/src/hotspot/os/solaris/os_solaris.cpp
index cfb68a1f06a..f4d13fc8d13 100644
--- a/src/hotspot/os/solaris/os_solaris.cpp
+++ b/src/hotspot/os/solaris/os_solaris.cpp
@@ -5252,7 +5252,7 @@ extern char** environ;
 // or -1 on failure (e.g. can't fork a new process).
 // Unlike system(), this function can be called from signal handler. It
 // doesn't block SIGINT et al.
-int os::fork_and_exec(char* cmd) {
+int os::fork_and_exec(char* cmd, bool use_vfork_if_available) {
   char * argv[4];
   argv[0] = (char *)"sh";
   argv[1] = (char *)"-c";
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 5cadf5ff0b9..bf8e6c0ceeb 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -5254,7 +5254,7 @@ void Parker::unpark() {
 
 // Run the specified command in a separate process. Return its exit value,
 // or -1 on failure (e.g. can't create a new process).
-int os::fork_and_exec(char* cmd) {
+int os::fork_and_exec(char* cmd, bool use_vfork_if_available) {
   STARTUPINFO si;
   PROCESS_INFORMATION pi;
   DWORD exit_code;
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 6bc92abbc0f..5a10a5745d2 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -543,7 +543,7 @@ class os: AllStatic {
   static char* do_you_want_to_debug(const char* message);
 
   // run cmd in a separate process and return its exit code; or -1 on failures
-  static int fork_and_exec(char *cmd);
+  static int fork_and_exec(char *cmd, bool use_vfork_if_available = false);
 
   // Call ::exit() on all platforms but Windows
   static void exit(int num);
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 8ff0b53f400..693a1caf20a 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -1565,7 +1565,7 @@ void VM_ReportJavaOutOfMemory::doit() {
 #endif
     tty->print_cr("\"%s\"...", cmd);
 
-    if (os::fork_and_exec(cmd) < 0) {
+    if (os::fork_and_exec(cmd, true) < 0) {
       tty->print_cr("os::fork_and_exec failed: %s (%s=%d)",
                      os::strerror(errno), os::errno_name(errno), errno);
     }

From a3a7edbd4d053c4ef936537c76c09dadc52ce115 Mon Sep 17 00:00:00 2001
From: Naoto Sato 
Date: Mon, 15 Oct 2018 09:35:05 -0700
Subject: [PATCH 100/124] 8211961: Broken link in java.util.Locale

Reviewed-by: mchung
---
 .../share/classes/java/util/Locale.java          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index f58b67b8ef8..50f92e2ec14 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -2246,22 +2246,26 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * @serialField language    String
-     *      language subtag in lower case. (See getLanguage())
+     *      language subtag in lower case.
+     *      (See getLanguage())
      * @serialField country     String
-     *      country subtag in upper case. (See getCountry())
+     *      country subtag in upper case.
+     *      (See getCountry())
      * @serialField variant     String
-     *      variant subtags separated by LOWLINE characters. (See getVariant())
+     *      variant subtags separated by LOWLINE characters.
+     *      (See getVariant())
      * @serialField hashcode    int
      *      deprecated, for forward compatibility only
      * @serialField script      String
-     *      script subtag in title case (See getScript())
+     *      script subtag in title case
+     *      (See getScript())
      * @serialField extensions  String
      *      canonical representation of extensions, that is,
      *      BCP47 extensions in alphabetical order followed by
      *      BCP47 private use subtags, all in lower case letters
      *      separated by HYPHEN-MINUS characters.
-     *      (See getExtensionKeys(),
-     *      getExtension(char))
+     *      (See getExtensionKeys(),
+     *      getExtension(char))
      */
     private static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("language", String.class),

From 7d7da8976bddcfe93ef782d59864286d9a224f79 Mon Sep 17 00:00:00 2001
From: Roman Kennke 
Date: Wed, 10 Oct 2018 23:05:15 +0200
Subject: [PATCH 101/124] 8211955: GC abstraction for LAB reserve

Reviewed-by: pliden, shade
---
 src/hotspot/share/gc/shared/collectedHeap.cpp          | 9 +++++++++
 src/hotspot/share/gc/shared/collectedHeap.hpp          | 2 ++
 src/hotspot/share/gc/shared/plab.cpp                   | 4 +---
 src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp | 6 ++++++
 src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp | 6 +-----
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index 21ae92c7d79..2bef8f9c0db 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -445,6 +445,15 @@ void CollectedHeap::fill_with_dummy_object(HeapWord* start, HeapWord* end, bool
   CollectedHeap::fill_with_object(start, end, zap);
 }
 
+size_t CollectedHeap::min_dummy_object_size() const {
+  return oopDesc::header_size();
+}
+
+size_t CollectedHeap::tlab_alloc_reserve() const {
+  size_t min_size = min_dummy_object_size();
+  return min_size > (size_t)MinObjAlignment ? align_object_size(min_size) : 0;
+}
+
 HeapWord* CollectedHeap::allocate_new_tlab(size_t min_size,
                                            size_t requested_size,
                                            size_t* actual_size) {
diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp
index 458d3b3ace7..e43bb28b22d 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp
@@ -309,6 +309,8 @@ class CollectedHeap : public CHeapObj {
   }
 
   virtual void fill_with_dummy_object(HeapWord* start, HeapWord* end, bool zap);
+  virtual size_t min_dummy_object_size() const;
+  size_t tlab_alloc_reserve() const;
 
   // Return the address "addr" aligned by "alignment_in_bytes" if such
   // an address is below "end".  Return NULL otherwise.
diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
index 29c4cc69481..c511bcfa63d 100644
--- a/src/hotspot/share/gc/shared/plab.cpp
+++ b/src/hotspot/share/gc/shared/plab.cpp
@@ -27,7 +27,6 @@
 #include "gc/shared/plab.inline.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
 #include "logging/log.hpp"
-#include "oops/arrayOop.hpp"
 #include "oops/oop.inline.hpp"
 
 size_t PLAB::min_size() {
@@ -43,8 +42,7 @@ PLAB::PLAB(size_t desired_plab_sz_) :
   _word_sz(desired_plab_sz_), _bottom(NULL), _top(NULL),
   _end(NULL), _hard_end(NULL), _allocated(0), _wasted(0), _undo_wasted(0)
 {
-  // ArrayOopDesc::header_size depends on command line initialization.
-  AlignmentReserve = oopDesc::header_size() > MinObjAlignment ? align_object_size(arrayOopDesc::header_size(T_INT)) : 0;
+  AlignmentReserve = Universe::heap()->tlab_alloc_reserve();
   assert(min_size() > AlignmentReserve,
          "Minimum PLAB size " SIZE_FORMAT " must be larger than alignment reserve " SIZE_FORMAT " "
          "to be able to contain objects", min_size(), AlignmentReserve);
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
index 018f8928d58..02598307721 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
@@ -461,3 +462,8 @@ void ThreadLocalAllocStats::publish() {
     _perf_max_slow_allocations    ->set_value(_max_slow_allocations);
   }
 }
+
+size_t ThreadLocalAllocBuffer::end_reserve() {
+  size_t reserve_size = Universe::heap()->tlab_alloc_reserve();
+  return MAX2(reserve_size, (size_t)_reserve_for_allocation_prefetch);
+}
diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
index f03ccb1d5a8..91f1bd02757 100644
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
@@ -26,7 +26,6 @@
 #define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
 
 #include "gc/shared/gcUtil.hpp"
-#include "oops/typeArrayOop.hpp"
 #include "runtime/perfData.hpp"
 #include "runtime/vm_version.hpp"
 
@@ -138,10 +137,7 @@ public:
   inline HeapWord* allocate(size_t size);
 
   // Reserve space at the end of TLAB
-  static size_t end_reserve() {
-    int reserve_size = typeArrayOopDesc::header_size(T_INT);
-    return MAX2(reserve_size, _reserve_for_allocation_prefetch);
-  }
+  static size_t end_reserve();
   static size_t alignment_reserve()              { return align_object_size(end_reserve()); }
   static size_t alignment_reserve_in_bytes()     { return alignment_reserve() * HeapWordSize; }
 

From 24fb839864c441594b1fa0f2a20366581d45a7ac Mon Sep 17 00:00:00 2001
From: Alex Menkov 
Date: Fri, 12 Oct 2018 10:08:11 -0700
Subject: [PATCH 102/124] 8195703: BasicJDWPConnectionTest.java: 'App exited
 unexpectedly with 2'

Reviewed-by: sspitsyn, jcbeyler
---
 test/jdk/ProblemList.txt                      |  2 -
 .../com/sun/jdi/BasicJDWPConnectionTest.java  | 83 ++++++++++---------
 test/jdk/com/sun/jdi/DoubleAgentTest.java     |  4 +-
 test/lib/jdk/test/lib/apps/LingeredApp.java   | 12 ++-
 4 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 2409be84246..f65e65e1488 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -835,8 +835,6 @@ tools/pack200/CommandLineTests.java                             8059906 generic-
 
 # jdk_jdi
 
-com/sun/jdi/BasicJDWPConnectionTest.java                        8195703 generic-all
-
 com/sun/jdi/RepStep.java                                        8043571 generic-all
 
 com/sun/jdi/sde/SourceDebugExtensionTest.java                   8158066 windows-all
diff --git a/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java b/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
index 7a4c9e3f4f3..8911f5bfbde 100644
--- a/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
+++ b/test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
@@ -29,17 +29,15 @@
  */
 
 import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 
 import java.net.Socket;
 import java.net.SocketException;
 
 import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.Utils;
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class BasicJDWPConnectionTest {
@@ -64,25 +62,37 @@ public class BasicJDWPConnectionTest {
         return res;
     }
 
-    public static ArrayList prepareCmd(int port, String allowOpt) {
-         String address = "*:" + String.valueOf(port);
+    public static ArrayList prepareCmd(String allowOpt) {
          ArrayList cmd = new ArrayList<>();
 
          String jdwpArgs = "-agentlib:jdwp=transport=dt_socket,server=y," +
-                           "suspend=n,address=" + address + allowOpt;
+                           "suspend=n,address=*:0" + allowOpt;
          cmd.add(jdwpArgs);
          return cmd;
     }
 
+    private static Pattern listenRegexp = Pattern.compile("Listening for transport \\b(.+)\\b at address: \\b(\\d+)\\b");
+    private static int detectPort(String s) {
+        Matcher m = listenRegexp.matcher(s);
+        if (!m.find()) {
+            throw new RuntimeException("Could not detect port from '" + s + "'");
+        }
+        // m.group(1) is transport, m.group(2) is port
+        return Integer.parseInt(m.group(2));
+    }
+
     public static void positiveTest(String testName, String allowOpt)
         throws InterruptedException, IOException {
         System.err.println("\nStarting " + testName);
-        int port = Utils.getFreePort();
-        ArrayList cmd = prepareCmd(port, allowOpt);
+        ArrayList cmd = prepareCmd(allowOpt);
 
         LingeredApp a = LingeredApp.startApp(cmd);
-        int res = handshake(port);
-        a.stopApp();
+        int res;
+        try {
+            res = handshake(detectPort(a.getProcessStdout()));
+        } finally {
+            a.stopApp();
+        }
         if (res < 0) {
             throw new RuntimeException(testName + " FAILED");
         }
@@ -92,12 +102,15 @@ public class BasicJDWPConnectionTest {
     public static void negativeTest(String testName, String allowOpt)
         throws InterruptedException, IOException {
         System.err.println("\nStarting " + testName);
-        int port = Utils.getFreePort();
-        ArrayList cmd = prepareCmd(port, allowOpt);
+        ArrayList cmd = prepareCmd(allowOpt);
 
         LingeredApp a = LingeredApp.startApp(cmd);
-        int res = handshake(port);
-        a.stopApp();
+        int res;
+        try {
+            res = handshake(detectPort(a.getProcessStdout()));
+        } finally {
+            a.stopApp();
+        }
         if (res > 0) {
             System.err.println(testName + ": res=" + res);
             throw new RuntimeException(testName + " FAILED");
@@ -109,16 +122,18 @@ public class BasicJDWPConnectionTest {
     public static void badAllowOptionTest(String testName, String allowOpt)
         throws InterruptedException, IOException {
         System.err.println("\nStarting " + testName);
-        int port = Utils.getFreePort();
-        ArrayList cmd = prepareCmd(port, allowOpt);
+        ArrayList cmd = prepareCmd(allowOpt);
 
+        LingeredApp a;
         try {
-            LingeredApp a = LingeredApp.startApp(cmd);
+            a = LingeredApp.startApp(cmd);
         } catch (IOException ex) {
             System.err.println(testName + ": caught expected IOException");
             System.err.println(testName + " PASSED");
             return;
         }
+        // LingeredApp.startApp is expected to fail, but if not, terminate the app
+        a.stopApp();
         throw new RuntimeException(testName + " FAILED");
     }
 
@@ -174,26 +189,16 @@ public class BasicJDWPConnectionTest {
         badAllowOptionTest("ExplicitMultiDefault2Test", allowOpt);
     }
 
-    public static void main(String[] args) {
-        try {
-            DefaultTest();
-            ExplicitDefaultTest();
-            AllowTest();
-            MultiAllowTest();
-            DenyTest();
-            MultiDenyTest();
-            EmptyAllowOptionTest();
-            ExplicitMultiDefault1Test();
-            ExplicitMultiDefault2Test();
-            System.err.println("\nTest PASSED");
-        } catch (InterruptedException ex) {
-            System.err.println("\nTest ERROR, getFreePort");
-            ex.printStackTrace();
-            System.exit(3);
-        } catch (IOException ex) {
-            System.err.println("\nTest ERROR");
-            ex.printStackTrace();
-            System.exit(3);
-        }
+    public static void main(String[] args) throws Exception {
+        DefaultTest();
+        ExplicitDefaultTest();
+        AllowTest();
+        MultiAllowTest();
+        DenyTest();
+        MultiDenyTest();
+        EmptyAllowOptionTest();
+        ExplicitMultiDefault1Test();
+        ExplicitMultiDefault2Test();
+        System.err.println("\nTest PASSED");
     }
 }
diff --git a/test/jdk/com/sun/jdi/DoubleAgentTest.java b/test/jdk/com/sun/jdi/DoubleAgentTest.java
index a5da2e8091f..99ec6091aaf 100644
--- a/test/jdk/com/sun/jdi/DoubleAgentTest.java
+++ b/test/jdk/com/sun/jdi/DoubleAgentTest.java
@@ -41,10 +41,8 @@ public class DoubleAgentTest {
             "test.classes", ".");
 
     public static void main(String[] args) throws Throwable {
-        int port = Utils.getFreePort();
-
         String jdwpOption = "-agentlib:jdwp=transport=dt_socket"
-                         + ",server=y" + ",suspend=n" + ",address=*:" + String.valueOf(port);
+                         + ",server=y" + ",suspend=n" + ",address=*:0";
 
         OutputAnalyzer output = ProcessTools.executeTestJvm("-classpath",
                 TEST_CLASSES,
diff --git a/test/lib/jdk/test/lib/apps/LingeredApp.java b/test/lib/jdk/test/lib/apps/LingeredApp.java
index 8ea3324b4df..3be74e56908 100644
--- a/test/lib/jdk/test/lib/apps/LingeredApp.java
+++ b/test/lib/jdk/test/lib/apps/LingeredApp.java
@@ -26,9 +26,6 @@ package jdk.test.lib.apps;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.StringReader;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -43,7 +40,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.UUID;
 import jdk.test.lib.process.OutputBuffer;
-import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.StreamPumper;
 
 /**
@@ -136,6 +132,14 @@ public class LingeredApp {
         return appProcess;
     }
 
+    /**
+     * @return the LingeredApp's output.
+     * Can be called after the app is run.
+     */
+    public String getProcessStdout() {
+        return stdoutBuffer.toString();
+    }
+
     /**
      *
      * @return OutputBuffer object for the LingeredApp's output. Can only be called

From 1226dcbcfe0d1c074d9b27c58d509bd73a138919 Mon Sep 17 00:00:00 2001
From: Lance Andersen 
Date: Fri, 12 Oct 2018 14:16:24 -0400
Subject: [PATCH 103/124] 8212045: Add back tests removed from HashesTest.java
 and AddExportsTest.java

Reviewed-by: rriggs
---
 test/jdk/tools/jmod/hashes/HashesTest.java    | 22 +++++++++++
 .../modules/addexports/AddExportsTest.java    | 38 ++++++++++++++++++-
 .../annotation/processing/Generated.java      | 30 +++++++++++++++
 .../javax/tools/ToolsHelper.java              | 27 +++++++++++++
 .../javax/tools/internal/Helper.java          | 27 +++++++++++++
 .../src/java.compiler/module-info.java        | 27 +++++++++++++
 .../addexports/src/m2/jdk/test2/Main.java     | 32 ++++++++++++++++
 .../addexports/src/m2/module-info.java        | 26 +++++++++++++
 8 files changed, 227 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/annotation/processing/Generated.java
 create mode 100644 test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/ToolsHelper.java
 create mode 100644 test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/internal/Helper.java
 create mode 100644 test/jdk/tools/launcher/modules/addexports/src/java.compiler/module-info.java
 create mode 100644 test/jdk/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java
 create mode 100644 test/jdk/tools/launcher/modules/addexports/src/m2/module-info.java

diff --git a/test/jdk/tools/jmod/hashes/HashesTest.java b/test/jdk/tools/jmod/hashes/HashesTest.java
index 34de0a765ce..31da6985336 100644
--- a/test/jdk/tools/jmod/hashes/HashesTest.java
+++ b/test/jdk/tools/jmod/hashes/HashesTest.java
@@ -237,6 +237,28 @@ public class HashesTest {
               .forEach(mn -> assertTrue(ht.hashes(mn) == null));
     }
 
+    @Test
+    public static void upgradeableModule() throws IOException {
+        Path mpath = Paths.get(System.getProperty("java.home"), "jmods");
+        if (!Files.exists(mpath)) {
+            return;
+        }
+
+        Path dest = Paths.get("test4");
+        HashesTest ht = new HashesTest(dest);
+        ht.makeModule("m1");
+        ht.makeModule("java.compiler", "m1");
+        ht.makeModule("m2", "java.compiler");
+
+        ht.makeJmod("m1");
+        ht.makeJmod("m2");
+        ht.makeJmod("java.compiler",
+                    "--module-path",
+                    ht.lib.toString() + File.pathSeparator + mpath,
+                    "--hash-modules", "java\\.(?!se)|^m.*");
+
+        ht.checkHashes("java.compiler",  "m2");
+    }
 
     @Test
     public static void testImageJmods() throws IOException {
diff --git a/test/jdk/tools/launcher/modules/addexports/AddExportsTest.java b/test/jdk/tools/launcher/modules/addexports/AddExportsTest.java
index 92a8a7b238c..610fd7e9305 100644
--- a/test/jdk/tools/launcher/modules/addexports/AddExportsTest.java
+++ b/test/jdk/tools/launcher/modules/addexports/AddExportsTest.java
@@ -24,7 +24,8 @@
 /**
  * @test
  * @library /test/lib
- * @modules jdk.compiler
+ * @modules java.compiler
+ *          jdk.compiler
  * @build AddExportsTest jdk.test.lib.compiler.CompilerUtils
  * @run testng AddExportsTest
  * @summary Basic tests for java --add-exports
@@ -51,12 +52,15 @@ public class AddExportsTest {
 
     private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
     private static final Path MODS_DIR = Paths.get("mods");
+    private static final Path UPGRADE_MODS_DIRS = Paths.get("upgrademods");
 
     // test module m1 that uses Unsafe
     private static final String TEST1_MODULE = "m1";
     private static final String TEST1_MAIN_CLASS = "jdk.test1.Main";
 
-
+    // test module m2 uses java.compiler internals
+    private static final String TEST2_MODULE = "m2";
+    private static final String TEST2_MAIN_CLASS = "jdk.test2.Main";
 
     // test module m3 uses m4 internals
     private static final String TEST3_MODULE = "m3";
@@ -74,7 +78,19 @@ public class AddExportsTest {
                 "--add-exports", "java.base/jdk.internal.misc=m1");
         assertTrue(compiled, "module " + TEST1_MODULE + " did not compile");
 
+        // javac -d upgrademods/java.compiler src/java.compiler/**
+        compiled = CompilerUtils.compile(
+                SRC_DIR.resolve("java.compiler"),
+                UPGRADE_MODS_DIRS.resolve("java.compiler"));
+        assertTrue(compiled, "module java.compiler did not compile");
 
+        // javac --upgrade-module-path upgrademods -d mods/m2 src/m2/**
+        compiled = CompilerUtils.compile(
+                SRC_DIR.resolve(TEST2_MODULE),
+                MODS_DIR.resolve(TEST2_MODULE),
+                "--upgrade-module-path", UPGRADE_MODS_DIRS.toString(),
+                "--add-exports", "java.compiler/javax.tools.internal=m2");
+        assertTrue(compiled, "module " + TEST2_MODULE + " did not compile");
 
         // javac -d mods/m3 src/m3/**
         compiled = CompilerUtils.compile(
@@ -146,7 +162,25 @@ public class AddExportsTest {
         assertTrue(exitValue == 0);
     }
 
+    /**
+     * Test --add-exports with upgraded module
+     */
+    public void testWithUpgradedModule() throws Exception {
 
+        // java --add-exports java.compiler/javax.tools.internal=m2
+        //      --upgrade-module-path upgrademods --module-path mods -m ...
+        String mid = TEST2_MODULE + "/" + TEST2_MAIN_CLASS;
+        int exitValue = executeTestJava(
+                "--add-exports", "java.compiler/javax.tools.internal=m2",
+                "--upgrade-module-path", UPGRADE_MODS_DIRS.toString(),
+                "--module-path", MODS_DIR.toString(),
+                "-m", mid)
+                .outputTo(System.out)
+                .errorTo(System.out)
+                .getExitValue();
+
+        assertTrue(exitValue == 0);
+    }
 
     /**
      * Test --add-exports with module that is added to the set of root modules
diff --git a/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/annotation/processing/Generated.java b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/annotation/processing/Generated.java
new file mode 100644
index 00000000000..2fbd20caaf5
--- /dev/null
+++ b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/annotation/processing/Generated.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package javax.annotation.processing;
+
+public interface Generated {
+
+
+}
diff --git a/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/ToolsHelper.java b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/ToolsHelper.java
new file mode 100644
index 00000000000..29a971851ea
--- /dev/null
+++ b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/ToolsHelper.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.tools;
+
+public class ToolsHelper {
+}
diff --git a/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/internal/Helper.java b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/internal/Helper.java
new file mode 100644
index 00000000000..3d0f73a9bb3
--- /dev/null
+++ b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/javax/tools/internal/Helper.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package javax.tools.internal;
+
+public class Helper {
+}
diff --git a/test/jdk/tools/launcher/modules/addexports/src/java.compiler/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/module-info.java
new file mode 100644
index 00000000000..11fe1c9db95
--- /dev/null
+++ b/test/jdk/tools/launcher/modules/addexports/src/java.compiler/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module java.compiler {
+    exports javax.tools;
+    exports javax.annotation.processing;
+}
diff --git a/test/jdk/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java b/test/jdk/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java
new file mode 100644
index 00000000000..b62603a0398
--- /dev/null
+++ b/test/jdk/tools/launcher/modules/addexports/src/m2/jdk/test2/Main.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.test2;
+
+import javax.tools.internal.Helper;
+
+public class Main {
+    public static void main(String[] args) {
+        Helper h = new Helper();
+    }
+}
diff --git a/test/jdk/tools/launcher/modules/addexports/src/m2/module-info.java b/test/jdk/tools/launcher/modules/addexports/src/m2/module-info.java
new file mode 100644
index 00000000000..a7a3ac95de8
--- /dev/null
+++ b/test/jdk/tools/launcher/modules/addexports/src/m2/module-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module m2 {
+    requires java.compiler;
+}

From 6330fc1cb662f8ddcb47094c9884032b95622b6f Mon Sep 17 00:00:00 2001
From: Kim Barrett 
Date: Fri, 12 Oct 2018 17:35:26 -0400
Subject: [PATCH 104/124] 8212023: Implicit narrowing in Solaris/sparc
 initializers

Explicitly narrow or fix destination types.

Reviewed-by: dholmes, tschatzl
---
 src/hotspot/cpu/sparc/nativeInst_sparc.cpp | 32 +++++++++++-----------
 src/hotspot/os/solaris/os_solaris.cpp      | 10 +++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/cpu/sparc/nativeInst_sparc.cpp b/src/hotspot/cpu/sparc/nativeInst_sparc.cpp
index 950619dacb4..f3a486d1178 100644
--- a/src/hotspot/cpu/sparc/nativeInst_sparc.cpp
+++ b/src/hotspot/cpu/sparc/nativeInst_sparc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -205,9 +205,9 @@ void NativeCall::test() {
   uint idx;
   int offsets[] = {
     0x0,
-    0xfffffff0,
-    0x7ffffff0,
-    0x80000000,
+    (int)0xfffffff0,
+    (int)0x7ffffff0,
+    (int)0x80000000,
     0x20,
     0x4000,
   };
@@ -361,9 +361,9 @@ void NativeMovConstReg::test() {
   uint idx;
   int offsets[] = {
     0x0,
-    0x7fffffff,
-    0x80000000,
-    0xffffffff,
+    (int)0x7fffffff,
+    (int)0x80000000,
+    (int)0xffffffff,
     0x20,
     4096,
     4097,
@@ -534,9 +534,9 @@ void NativeMovConstRegPatching::test() {
   uint idx;
   int offsets[] = {
     0x0,
-    0x7fffffff,
-    0x80000000,
-    0xffffffff,
+    (int)0x7fffffff,
+    (int)0x80000000,
+    (int)0xffffffff,
     0x20,
     4096,
     4097,
@@ -630,9 +630,9 @@ void NativeMovRegMem::test() {
   uint idx1;
   int offsets[] = {
     0x0,
-    0xffffffff,
-    0x7fffffff,
-    0x80000000,
+    (int)0xffffffff,
+    (int)0x7fffffff,
+    (int)0x80000000,
     4096,
     4097,
     0x20,
@@ -751,9 +751,9 @@ void NativeJump::test() {
   uint idx;
   int offsets[] = {
     0x0,
-    0xffffffff,
-    0x7fffffff,
-    0x80000000,
+    (int)0xffffffff,
+    (int)0x7fffffff,
+    (int)0x80000000,
     4096,
     4097,
     0x20,
diff --git a/src/hotspot/os/solaris/os_solaris.cpp b/src/hotspot/os/solaris/os_solaris.cpp
index f4d13fc8d13..785f6bf4f31 100644
--- a/src/hotspot/os/solaris/os_solaris.cpp
+++ b/src/hotspot/os/solaris/os_solaris.cpp
@@ -1567,11 +1567,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
   }
 
   typedef struct {
-    Elf32_Half  code;         // Actual value as defined in elf.h
-    Elf32_Half  compat_class; // Compatibility of archs at VM's sense
-    char        elf_class;    // 32 or 64 bit
-    char        endianess;    // MSB or LSB
-    char*       name;         // String representation
+    Elf32_Half    code;         // Actual value as defined in elf.h
+    Elf32_Half    compat_class; // Compatibility of archs at VM's sense
+    unsigned char elf_class;    // 32 or 64 bit
+    unsigned char endianess;    // MSB or LSB
+    char*         name;         // String representation
   } arch_t;
 
   static const arch_t arch_array[]={

From 285fca70b4b9ffd904c55004816e88312df0247d Mon Sep 17 00:00:00 2001
From: Chris Yin 
Date: Mon, 15 Oct 2018 09:34:18 +0800
Subject: [PATCH 105/124] 8187522: test/sun/net/ftp/FtpURLConnectionLeak.java
 timed out

Reviewed-by: chegar, vtewari
---
 .../jdk/sun/net/ftp/FtpURLConnectionLeak.java | 40 +++++++++----------
 .../net/www/ftptest/FtpCommandHandler.java    | 10 ++++-
 test/jdk/sun/net/www/ftptest/FtpServer.java   | 13 +++++-
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/test/jdk/sun/net/ftp/FtpURLConnectionLeak.java b/test/jdk/sun/net/ftp/FtpURLConnectionLeak.java
index eea7a61e5ec..4306f6a5f69 100644
--- a/test/jdk/sun/net/ftp/FtpURLConnectionLeak.java
+++ b/test/jdk/sun/net/ftp/FtpURLConnectionLeak.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@
  * @run main FtpURLConnectionLeak
  */
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
@@ -44,27 +43,26 @@ public class FtpURLConnectionLeak {
         int port = server.getLocalPort();
         server.start();
         URL url = new URL("ftp://localhost:" + port + "/filedoesNotExist.txt");
-        for (int i = 0; i < 3; i++) {
-            try {
-                InputStream stream = url.openStream();
-            } catch (FileNotFoundException expectedFirstTimeAround) {
-                // should always reach this point since the path does not exist
-            } catch (IOException expected) {
-                System.out.println("caught expected " + expected);
-                int times = 1;
-                do {
-                    // give some time to close the connection...
-                    System.out.println("sleeping... " + times);
-                    Thread.sleep(times * 1000);
-                } while (server.activeClientsCount() > 0 && times++ < 5);
+        try (server) {
+            for (int i = 0; i < 3; i++) {
+                try {
+                    InputStream stream = url.openStream();
+                } catch (FileNotFoundException expected) {
+                    // should always reach this point since the path does not exist
+                    System.out.println("caught expected " + expected);
+                    int times = 1;
+                    do {
+                        // give some time to close the connection...
+                        System.out.println("sleeping... " + times);
+                        Thread.sleep(times * 1000);
+                    } while (server.activeClientsCount() > 0 && times++ < 5);
 
-                if (server.activeClientsCount() > 0) {
-                    server.killClients();
-                    throw new RuntimeException("URLConnection didn't close the" +
-                            " FTP connection on FileNotFoundException");
+                    if (server.activeClientsCount() > 0) {
+                        server.killClients();
+                        throw new RuntimeException("URLConnection didn't close the" +
+                                " FTP connection on FileNotFoundException");
+                    }
                 }
-            } finally {
-                server.terminate();
             }
         }
     }
diff --git a/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java b/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java
index 24193362320..d1959b63b7a 100644
--- a/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java
+++ b/test/jdk/sun/net/www/ftptest/FtpCommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -442,8 +442,14 @@ public class FtpCommandHandler extends Thread {
             // cmd.setSoTimeout(2000);
             in = new BufferedReader(new InputStreamReader(cmd.getInputStream()));
             out = new PrintStream(cmd.getOutputStream(), true, "ISO8859_1");
+            // Below corrupted message style was intentional to test 8151586, please
+            // make sure each message line not broken ftp communication (such as for
+            // message line lenght >=4, the 4th char required '-' to allow
+            // implementation thinks that it has seen multi-line reply '###-'
+            // sequence), otherwise it will affect normal ftp tests which depends
+            // on this.
             out.println("---------------------------------\n220 Java FTP test server"
-                    + " (j2se 6.0) ready.\n \n                Please send commands\n"
+                    + " (j2se 6.0) ready.\n \n   -            Please send commands\n"
                     + "-----------------------------\n\n\n");
             out.flush();
             if (auth.authType() == 0) // No auth needed
diff --git a/test/jdk/sun/net/www/ftptest/FtpServer.java b/test/jdk/sun/net/www/ftptest/FtpServer.java
index cc31985a865..8ea5705fb52 100644
--- a/test/jdk/sun/net/www/ftptest/FtpServer.java
+++ b/test/jdk/sun/net/www/ftptest/FtpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ import java.util.ArrayList;
  *
  */
 
-public class FtpServer extends Thread {
+public class FtpServer extends Thread implements AutoCloseable {
     private ServerSocket listener = null;
     private FtpFileSystemHandler fsh = null;
     private FtpAuthHandler auth = null;
@@ -134,4 +134,13 @@ public class FtpServer extends Thread {
 
         }
     }
+
+    @Override
+    public void close() throws Exception {
+        terminate();
+        listener.close();
+        if (activeClientsCount() > 0) {
+            killClients();
+        }
+    }
 }

From e431f6a418d0533fb527e8741da29937661a01c7 Mon Sep 17 00:00:00 2001
From: Jean Christophe Beyler 
Date: Sun, 14 Oct 2018 19:07:34 -0700
Subject: [PATCH 106/124] 8212082: Remove the NSK_CPP_STUB macros for remaining
 vmTestbase/jvmti/[sS]*

Remove NSK_CPP_STUB macros from the tests

Reviewed-by: amenkov, phh
---
 .../setenvstor001/setenvstor001.cpp           | 10 +-
 .../setenvstor002/setenvstor002.cpp           | 10 +-
 .../setenvstor003/setenvstor003.cpp           | 10 +-
 .../setevntcallb001/setevntcallb001.cpp       |  8 +-
 .../setevntcallb002/setevntcallb002.cpp       |  7 +-
 .../setevntcallb003/setevntcallb003.cpp       |  8 +-
 .../setextevent001/setextevent001.cpp         | 14 +--
 .../SetNativeMethodPrefix001.cpp              | 93 ++-----------------
 .../SetNativeMethodPrefix002.cpp              | 24 +----
 .../setsysprop002/setsysprop002.cpp           | 12 +--
 .../setsysprop003/setsysprop003.cpp           |  3 +-
 .../nsk/jvmti/SetTag/settag001/settag001.cpp  | 25 ++---
 .../setthrdstor001/setthrdstor001.cpp         |  9 +-
 .../setthrdstor002/setthrdstor002.cpp         |  8 +-
 .../setthrdstor003/setthrdstor003.cpp         | 16 +---
 .../multienv/MA08/ma08t001/ma08t001.cpp       | 26 ++----
 .../multienv/MA08/ma08t001/ma08t001a.cpp      | 39 +++-----
 .../multienv/MA10/ma10t001/ma10t001.cpp       | 30 +++---
 .../multienv/MA10/ma10t001/ma10t001a.cpp      | 18 ++--
 .../multienv/MA10/ma10t002/ma10t002.cpp       | 26 ++----
 .../multienv/MA10/ma10t002/ma10t002a.cpp      |  9 +-
 .../multienv/MA10/ma10t003/ma10t003.cpp       | 26 ++----
 .../multienv/MA10/ma10t003/ma10t003a.cpp      |  9 +-
 .../multienv/MA10/ma10t004/ma10t004.cpp       | 29 +++---
 .../multienv/MA10/ma10t004/ma10t004a.cpp      | 12 +--
 .../multienv/MA10/ma10t005/ma10t005.cpp       | 10 +-
 .../multienv/MA10/ma10t005/ma10t005a.cpp      |  7 +-
 .../multienv/MA10/ma10t006/ma10t006.cpp       | 19 ++--
 .../multienv/MA10/ma10t006/ma10t006a.cpp      | 13 ++-
 .../multienv/MA10/ma10t007/ma10t007.cpp       |  8 +-
 .../multienv/MA10/ma10t007/ma10t007a.cpp      |  2 +-
 .../multienv/MA10/ma10t008/ma10t008.cpp       | 26 ++----
 .../multienv/MA10/ma10t008/ma10t008a.cpp      | 14 +--
 .../sampling/SP01/sp01t001/sp01t001.cpp       | 19 ++--
 .../sampling/SP01/sp01t002/sp01t002.cpp       | 26 ++----
 .../sampling/SP01/sp01t003/sp01t003.cpp       | 28 ++----
 .../sampling/SP02/sp02t001/sp02t001.cpp       | 29 ++----
 .../sampling/SP02/sp02t002/sp02t002.cpp       | 38 +++-----
 .../sampling/SP02/sp02t003/sp02t003.cpp       | 41 +++-----
 .../sampling/SP03/sp03t001/sp03t001.cpp       | 47 ++++------
 .../sampling/SP03/sp03t002/sp03t002.cpp       | 47 ++++------
 .../sampling/SP04/sp04t001/sp04t001.cpp       | 47 ++++------
 .../sampling/SP04/sp04t002/sp04t002.cpp       | 47 ++++------
 .../sampling/SP05/sp05t002/sp05t002.cpp       | 34 +++----
 .../sampling/SP05/sp05t003/sp05t003.cpp       | 54 ++++-------
 .../sampling/SP06/sp06t001/sp06t001.cpp       | 45 ++++-----
 .../sampling/SP06/sp06t002/sp06t002.cpp       | 45 ++++-----
 .../sampling/SP06/sp06t003/sp06t003.cpp       | 48 ++++------
 .../sampling/SP07/sp07t001/sp07t001.cpp       | 83 +++++++----------
 .../sampling/SP07/sp07t002/sp07t002.cpp       | 71 ++++++--------
 50 files changed, 451 insertions(+), 878 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp
index 3b2eb1ca9ed..98400d75bf7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp
@@ -73,8 +73,7 @@ static void fillEnvStorage(StorageStructure* storage) {
 static int setEnvStorage(jvmtiEnv* jvmti, StorageStructure* storage, const char where[]) {
 
     NSK_DISPLAY1("Set local storage for current JVMTI env: 0x%p\n", (void*)storage);
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(SetEnvironmentLocalStorage, jvmti, storage))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEnvironmentLocalStorage(storage))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY0("  ... ok\n");
@@ -89,8 +88,7 @@ static int checkEnvStorage(jvmtiEnv* jvmti, StorageStructure* initialStorage, co
     StorageStructure* storage = NULL;
 
     NSK_DISPLAY0("Get local storage for current JVMTI env\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetEnvironmentLocalStorage, jvmti, (void**)&storage))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetEnvironmentLocalStorage((void**)&storage))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY1("  ... got storage: 0x%p\n", (void*)storage);
@@ -216,9 +214,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.VMInit = callbackVMInit;
         eventCallbacks.VMDeath = callbackVMDeath;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             return JNI_ERR;
         }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp
index ce44ed9c444..9d53a2ad37a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp
@@ -73,8 +73,7 @@ static void fillEnvStorage(StorageStructure* storage) {
 static int setEnvStorage(jvmtiEnv* jvmti, StorageStructure* storage, const char where[]) {
 
     NSK_DISPLAY1("Set local storage for current JVMTI env: 0x%p\n", (void*)storage);
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(SetEnvironmentLocalStorage, jvmti, storage))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEnvironmentLocalStorage(storage))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY0("  ... ok\n");
@@ -89,8 +88,7 @@ static int checkEnvStorage(jvmtiEnv* jvmti, StorageStructure* initialStorage, co
     StorageStructure* storage = NULL;
 
     NSK_DISPLAY0("Get local storage for current JVMTI env\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetEnvironmentLocalStorage, jvmti, (void**)&storage))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetEnvironmentLocalStorage((void**)&storage))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY1("  ... got storage: 0x%p\n", (void*)storage);
@@ -221,9 +219,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.VMInit = callbackVMInit;
         eventCallbacks.VMDeath = callbackVMDeath;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             return JNI_ERR;
         }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp
index ecae8fe964d..6c3ec2145a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp
@@ -73,8 +73,7 @@ static void fillEnvStorage(StorageStructure* storage) {
 static int setEnvStorage(jvmtiEnv* jvmti, StorageStructure* storage, const char where[]) {
 
     NSK_DISPLAY1("Set local storage for current JVMTI env: 0x%p\n", (void*)storage);
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(SetEnvironmentLocalStorage, jvmti, storage))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEnvironmentLocalStorage(storage))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY0("  ... ok\n");
@@ -89,8 +88,7 @@ static int checkEnvStorage(jvmtiEnv* jvmti, StorageStructure* initialStorage, co
     StorageStructure* storage = NULL;
 
     NSK_DISPLAY0("Get local storage for current JVMTI env\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GetEnvironmentLocalStorage, jvmti, (void**)&storage))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetEnvironmentLocalStorage((void**)&storage))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY1("  ... got storage: 0x%p\n", (void*)storage);
@@ -224,9 +222,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.VMInit = callbackVMInit;
         eventCallbacks.VMDeath = callbackVMDeath;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             return JNI_ERR;
         }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp
index c1a38a90ec1..9b15148fe19 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp
@@ -143,9 +143,7 @@ callbackVMInit(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.ThreadStart = callbackThreadStart;
         eventCallbacks.ThreadEnd = callbackThreadEnd;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             nsk_jvmti_setFailStatus();
         } else {
             nsk_jvmti_enableEvents(JVMTI_ENABLE, EVENTS_COUNT - 1, eventsList + 1, NULL);
@@ -190,9 +188,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.VMInit = callbackVMInit;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             nsk_jvmti_setFailStatus();
         } else {
             nsk_jvmti_enableEvents(JVMTI_ENABLE, 1, eventsList, NULL);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp
index b420ead74cf..65f8a2fd3f4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp
@@ -145,8 +145,7 @@ callbackVMInit(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
     NSK_DISPLAY0(">>> Testcase #2: Set NULL for events callbacks\n");
     {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti, NULL, 0))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(NULL, 0))) {
             nsk_jvmti_setFailStatus();
         }
 
@@ -193,9 +192,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         eventCallbacks.VMInit = callbackVMInit;
         eventCallbacks.ThreadStart = callbackThreadStart;
         eventCallbacks.ThreadEnd = callbackThreadEnd;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             nsk_jvmti_setFailStatus();
         } else {
             nsk_jvmti_enableEvents(JVMTI_ENABLE, 1, eventsList, NULL);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp
index 98751465b1e..72511c6776d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp
@@ -151,9 +151,7 @@ callbackVMInit(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.ThreadStart = callbackThreadStart;
         eventCallbacks.ThreadEnd = callbackThreadEnd;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, size))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, size))) {
             nsk_jvmti_setFailStatus();
         }
 
@@ -198,9 +196,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.VMInit = callbackVMInit;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks)))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
             nsk_jvmti_setFailStatus();
         } else {
             nsk_jvmti_enableEvents(JVMTI_ENABLE, 1, eventsList, NULL);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp
index 831579cea51..722e529ac72 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp
@@ -48,8 +48,7 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) {
     int i;
 
     NSK_DISPLAY0("Get extension events list\n");
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetExtensionEvents, jvmti, &extCount, &extList))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetExtensionEvents(&extCount, &extList))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY1("  ... got count: %d\n", (int)extCount);
@@ -72,18 +71,14 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) {
 
             NSK_DISPLAY1("    ... setting callback: 0x%p\n", (void*)callbackExtensionEvent);
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(SetExtensionEventCallback, jvmti,
-                                        extList[i].extension_event_index,
-                                        callbackExtensionEvent))) {
+                    jvmti->SetExtensionEventCallback(extList[i].extension_event_index, callbackExtensionEvent))) {
                 success = NSK_FALSE;
             }
             NSK_DISPLAY0("    ... done\n");
 
             NSK_DISPLAY1("    ... clearing callback: 0x%p\n", (void*)NULL);
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(SetExtensionEventCallback, jvmti,
-                                        extList[i].extension_event_index,
-                                        NULL))) {
+                    jvmti->SetExtensionEventCallback(extList[i].extension_event_index, NULL))) {
                 success = NSK_FALSE;
             }
             NSK_DISPLAY0("    ... done\n");
@@ -91,8 +86,7 @@ static int checkExtensions(jvmtiEnv* jvmti, const char phase[]) {
     }
 
     NSK_DISPLAY1("Deallocate extension events list: 0x%p\n", (void*)extList);
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)extList))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)extList))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY0("  ... deallocated\n");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp
index ab627f48409..d9631096901 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp
@@ -123,27 +123,11 @@ Java_nsk_jvmti_SetNativeMethodPrefix_Binder_setMethodPrefix (
     char *str = NULL;
 
     if (prefix != NULL) {
-        if (!NSK_VERIFY(
-                (str = (char *) NSK_CPP_STUB3(
-                              GetStringUTFChars
-                              , jni
-                              , prefix
-                              , 0
-                         )
-                    ) != NULL
-                )
-           )
+        if (!NSK_VERIFY((str = (char *) jni->GetStringUTFChars(prefix, 0)) != NULL))
         { result = JNI_FALSE; goto finally; }
     }
 
-    if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(
-                    SetNativeMethodPrefix
-                    , jvmti
-                    , str
-                    )
-                )
-       )
+    if (!NSK_JVMTI_VERIFY(jvmti->SetNativeMethodPrefix(str)))
     { result = JNI_FALSE; goto finally; }
 
     if (str != NULL) {
@@ -175,27 +159,10 @@ Java_nsk_jvmti_SetNativeMethodPrefix_Binder_setMultiplePrefixes (
     char *str = NULL;
 
     if (prefix != NULL) {
-        if (!NSK_VERIFY(
-                (str = (char *) NSK_CPP_STUB3(
-                              GetStringUTFChars
-                              , jni
-                              , prefix
-                              , 0
-                         )
-                    ) != NULL
-                )
-           )
+        if (!NSK_VERIFY((str = (char *) jni->GetStringUTFChars(prefix, 0)) != NULL))
         { result = JNI_FALSE; goto finally; }
 
-        if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(
-                        SetNativeMethodPrefixes
-                        , jvmti
-                        , 1
-                        , (char **) &str
-                        )
-                    )
-           )
+        if (!NSK_JVMTI_VERIFY(jvmti->SetNativeMethodPrefixes(1, (char **) &str)))
         { result = JNI_FALSE; goto finally; }
 
         NSK_DISPLAY1("MultiplePrefixes: New PREFIX is set: %s\n"
@@ -205,15 +172,7 @@ Java_nsk_jvmti_SetNativeMethodPrefix_Binder_setMultiplePrefixes (
         char* prefixes[1];
         prefixes[0] = NULL;
 
-        if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(
-                        SetNativeMethodPrefixes
-                        , jvmti
-                        , 0
-                        , (char **)&prefixes
-                        )
-                    )
-           )
+        if (!NSK_JVMTI_VERIFY(jvmti->SetNativeMethodPrefixes(0, (char **)&prefixes)))
         { result = JNI_FALSE; goto finally; }
 
         NSK_DISPLAY0("Old PREFIX is reset\n");
@@ -250,33 +209,11 @@ Java_nsk_jvmti_SetNativeMethodPrefix_Binder_registerMethod (
         return JNI_FALSE;
     }
 
-    if (!NSK_VERIFY(
-            (method.name =
-                (char *) NSK_CPP_STUB3(
-                     GetStringUTFChars
-                     , jni
-                     , method_name_obj
-                     , 0
-                    )
-            ) != NULL
-            )
-       )
-    {
+    if (!NSK_VERIFY((method.name = (char *) jni->GetStringUTFChars(method_name_obj, 0)) != NULL)) {
         goto finally;
     }
 
-    if (!NSK_VERIFY(
-            (method.signature =
-                    (char *) NSK_CPP_STUB3(
-                         GetStringUTFChars
-                         , jni
-                         , method_sig_obj
-                         , 0
-                    )
-            ) != NULL
-            )
-       )
-    {
+    if (!NSK_VERIFY((method.signature = (char *) jni->GetStringUTFChars(method_sig_obj, 0)) != NULL)) {
         goto finally;
     }
 
@@ -341,25 +278,13 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved)
        )
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(
-                    GetCapabilities
-                    , jvmti
-                    , &caps)
-                )
-       )
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     // Register all necessary JVM capabilities
     caps.can_set_native_method_prefix = 1;
 
-    if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(
-                    AddCapabilities
-                    , jvmti
-                    , &caps)
-                )
-       )
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp
index d9ac7b86222..7addf0cf052 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp
@@ -60,13 +60,7 @@ Java_nsk_jvmti_SetNativeMethodPrefix_SetNativeMethodPrefix002_foo (
 
 static jboolean setMethodPrefix (char *prefix)
 {
-    if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(
-                    SetNativeMethodPrefix
-                    , jvmti
-                    , prefix)
-                )
-       )
+    if (!NSK_JVMTI_VERIFY(jvmti->SetNativeMethodPrefix(prefix)))
         return JNI_FALSE;
 
     return JNI_TRUE;
@@ -114,25 +108,13 @@ jint Agent_Initialize(JavaVM *vm, char *options, void *reserved)
        )
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(
-                    GetCapabilities
-                    , jvmti
-                    , &caps)
-                )
-       )
+    if (!NSK_JVMTI_VERIFY(jvmti->GetCapabilities(&caps)))
         return JNI_ERR;
 
     // Register all necessary JVM capabilities
     caps.can_set_native_method_prefix = 1;
 
-    if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(
-                    AddCapabilities
-                    , jvmti
-                    , &caps)
-                )
-       )
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp
index af8591b886e..f35489f2583 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp
@@ -76,8 +76,7 @@ static int checkPropertyValue(jvmtiEnv* jvmti, const char phase[],
     char* value = NULL;
 
     NSK_DISPLAY1("  property: %s\n", name);
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetSystemProperty, jvmti, name, &value))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetSystemProperty(name, &value))) {
         return NSK_FALSE;
     }
     NSK_DISPLAY1("     value: \"%s\"\n", nsk_null_string(value));
@@ -93,8 +92,7 @@ static int checkPropertyValue(jvmtiEnv* jvmti, const char phase[],
         success = NSK_FALSE;
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)value))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)value))) {
         success = NSK_FALSE;
     }
 
@@ -120,14 +118,12 @@ static int checkProperties(jvmtiEnv* jvmti, const char phase[], int step) {
         NSK_DISPLAY1("     value: \"%s\"\n", propDescList[i].values[step]);
         if (step > 1) {
             if (!NSK_JVMTI_VERIFY_CODE(JVMTI_ERROR_WRONG_PHASE,
-                   NSK_CPP_STUB3(SetSystemProperty, jvmti,
-                     propDescList[i].name, propDescList[i].values[step]))) {
+                   jvmti->SetSystemProperty(propDescList[i].name, propDescList[i].values[step]))) {
                 success = NSK_FALSE;
             }
         } else {
             if (!NSK_JVMTI_VERIFY(
-                   NSK_CPP_STUB3(SetSystemProperty, jvmti,
-                     propDescList[i].name, propDescList[i].values[step]))) {
+                   jvmti->SetSystemProperty(propDescList[i].name, propDescList[i].values[step]))) {
                 success = NSK_FALSE;
             }
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp
index 840f3fc2b0a..300df3403e9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp
@@ -56,8 +56,7 @@ static int setProperties(jvmtiEnv* jvmti) {
         NSK_DISPLAY1("  property: %s\n", propDescList[i].name);
         NSK_DISPLAY1("     value: \"%s\"\n", propDescList[i].value);
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetSystemProperty, jvmti,
-                                propDescList[i].name, propDescList[i].value))) {
+                jvmti->SetSystemProperty(propDescList[i].name, propDescList[i].value))) {
             success = NSK_FALSE;
         }
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp
index 3cf014b04b0..3c19fb28ee9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp
@@ -61,7 +61,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
             NSK_DISPLAY1("Find debugee class: %s\n", DEBUGEE_CLASS_NAME);
             if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-                    NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL)) {
+                    jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL)) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -69,8 +69,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
             NSK_DISPLAY1("Find static field: %s\n", OBJECT_FIELD_NAME);
             if (!NSK_JNI_VERIFY(jni, (objectField =
-                    NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                                    OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) {
+                    jni->GetStaticFieldID(debugeeClass, OBJECT_FIELD_NAME, OBJECT_CLASS_SIG)) != NULL)) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -78,16 +77,14 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
             NSK_DISPLAY1("Get object from static field: %s\n", OBJECT_FIELD_NAME);
             if (!NSK_JNI_VERIFY(jni, (testedObject =
-                    NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass,
-                                                            objectField)) != NULL)) {
+                    jni->GetStaticObjectField(debugeeClass, objectField)) != NULL)) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
             NSK_DISPLAY1("  ... got object: 0x%p\n", (void*)testedObject);
 
             NSK_DISPLAY1("Create global reference for object: 0x%p\n", (void*)testedObject);
-            if (!NSK_JNI_VERIFY(jni, (testedObject =
-                    NSK_CPP_STUB2(NewGlobalRef, jni, testedObject)) != NULL)) {
+            if (!NSK_JNI_VERIFY(jni, (testedObject = jni->NewGlobalRef(testedObject)) != NULL)) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -97,8 +94,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         NSK_DISPLAY0(">>> Testcase #1: set tag for the tested object\n");
         {
             NSK_DISPLAY1("Set tag for object: 0x%p\n", (void*)testedObject);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(SetTag, jvmti, testedObject, objectTag))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->SetTag(testedObject, objectTag))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -110,8 +106,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
             jlong tag = 222;
 
             NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -140,8 +135,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
                 return;
 
             NSK_DISPLAY1("Get tag for object: 0x%p\n", (void*)testedObject);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetTag, jvmti, testedObject, &tag))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetTag(testedObject, &tag))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -162,7 +156,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         NSK_DISPLAY0(">>> Clean used data\n");
         {
             NSK_DISPLAY1("Delete object reference: 0x%p\n", (void*)testedObject);
-            NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedObject));
+            NSK_TRACE(jni->DeleteGlobalRef(testedObject));
         }
     }
 
@@ -205,8 +199,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
         memset(&caps, 0, sizeof(caps));
         caps.can_tag_objects = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
             return JNI_ERR;
         }
     }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp
index 5ff04ad464a..c04094a47c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp
@@ -73,9 +73,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
         NSK_DISPLAY1("SetThreadLocalStorage() for tested thread with pointer: %p\n",
                                                     (void*)initialStorage);
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetThreadLocalStorage, jvmti,
-                                        testedThread, (void*)initialStorage))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetThreadLocalStorage(testedThread, (void*)initialStorage))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -90,8 +88,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
         NSK_DISPLAY0("GetThreadLocalStorage() for tested thread\n");
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadLocalStorage, jvmti,
-                                        testedThread, (void**)&obtainedStorage))) {
+                jvmti->GetThreadLocalStorage(testedThread, (void**)&obtainedStorage))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -128,7 +125,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         }
 
         NSK_DISPLAY0("Delete thread reference\n");
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, testedThread));
+        NSK_TRACE(jni->DeleteGlobalRef(testedThread));
     }
 
     NSK_DISPLAY0("Let debugee to finish\n");
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp
index 114666aca4b..9528052c9ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp
@@ -66,9 +66,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
 
         NSK_DISPLAY1("SetThreadLocalStorage() for current agent thread with pointer: %p\n",
                                                     (void*)initialStorage);
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetThreadLocalStorage, jvmti,
-                                        NULL, (void*)initialStorage))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetThreadLocalStorage(NULL, (void*)initialStorage))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -82,9 +80,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
             return;
 
         NSK_DISPLAY0("GetThreadLocalStorage() for current agent thread\n");
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadLocalStorage, jvmti,
-                                        NULL, (void**)&obtainedStorage))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadLocalStorage(NULL, (void**)&obtainedStorage))) {
             nsk_jvmti_setFailStatus();
             return;
         }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp
index 81dc18d2bf3..ff49c9d060a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp
@@ -120,8 +120,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
     if (thread != NULL) {
         jvmtiThreadInfo info;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &info))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &info))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -133,9 +132,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
             NSK_DISPLAY1("SetThreadLocalStorage() for current thread with pointer: %p\n",
                                                                 (void*)initialStorage);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(SetThreadLocalStorage, jvmti,
-                                        NULL, (void*)initialStorage))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->SetThreadLocalStorage(NULL, (void*)initialStorage))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -151,8 +148,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
     if (thread != NULL) {
         jvmtiThreadInfo info;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, thread, &info))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(thread, &info))) {
             nsk_jvmti_setFailStatus();
             return;
         }
@@ -168,8 +164,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
                 NSK_DISPLAY0("GetThreadLocalStorage() for current thread\n");
                 if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB3(GetThreadLocalStorage, jvmti,
-                                            NULL, (void**)&obtainedStorage))) {
+                        jvmti->GetThreadLocalStorage(NULL, (void**)&obtainedStorage))) {
                     nsk_jvmti_setFailStatus();
                     return;
                 }
@@ -243,8 +238,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&callbacks, 0, sizeof(callbacks));
         callbacks.ThreadStart = callbackThreadStart;
         callbacks.ThreadEnd = callbackThreadEnd;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti, &callbacks, sizeof(callbacks))))
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks))))
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp
index 0fbdd11c8d5..fd6d56029d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp
@@ -60,8 +60,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -73,8 +72,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -90,8 +88,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     if (threadForStop == NULL) {
@@ -106,17 +103,14 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
 
     NSK_DISPLAY0("Prepare: create new instance of ThreadDeath exception\n");
 
-    if (!NSK_JNI_VERIFY(jni, (cls =
-            NSK_CPP_STUB2(FindClass, jni, THREAD_DEATH_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (cls = jni->FindClass(THREAD_DEATH_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     if (!NSK_JNI_VERIFY(jni, (ctor =
-            NSK_CPP_STUB4(GetMethodID, jni, cls,
-                THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
+            jni->GetMethodID(cls, THREAD_DEATH_CTOR_NAME, THREAD_DEATH_CTOR_SIGNATURE)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (threadDeath =
-            NSK_CPP_STUB3(NewObject, jni, cls, ctor)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (threadDeath = jni->NewObject(cls, ctor)) != NULL))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -140,8 +134,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!NSK_VERIFY(threadForStop != NULL)) {
         nsk_jvmti_setFailStatus();
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(StopThread, jvmti, threadForStop, threadDeath)))
+        if (!NSK_JVMTI_VERIFY(jvmti->StopThread(threadForStop, threadDeath)))
             nsk_jvmti_setFailStatus();
     }
 
@@ -149,8 +142,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!NSK_VERIFY(threadForInterrupt != NULL)) {
         nsk_jvmti_setFailStatus();
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(InterruptThread, jvmti, threadForInterrupt)))
+        if (!NSK_JVMTI_VERIFY(jvmti->InterruptThread(threadForInterrupt)))
             nsk_jvmti_setFailStatus();
     }
 
@@ -199,7 +191,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_signal_thread = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp
index 3c5499d5fab..2253e5a088d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp
@@ -56,14 +56,12 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
     jclass klass = NULL;
     char *signature = NULL;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -75,7 +73,7 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     NSK_DISPLAY1("Exception event: %s\n", signature);
 
-    if (NSK_CPP_STUB3(IsSameObject, jni_env, threadForInterrupt, thread)) {
+    if (jni_env->IsSameObject(threadForInterrupt, thread)) {
         if (strcmp(signature, INTERRUPTED_EXCEPTION_CLASS_SIG) == 0) {
             InterruptedExceptionFlag++;
         } else {
@@ -83,7 +81,7 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
                 signature);
             nsk_jvmti_setFailStatus();
         }
-    } else if (NSK_CPP_STUB3(IsSameObject, jni_env, threadForStop, thread)) {
+    } else if (jni_env->IsSameObject(threadForStop, thread)) {
         if (strcmp(signature, THREAD_DEATH_CLASS_SIG) == 0) {
             ThreadDeathFlag++;
         } else {
@@ -93,7 +91,7 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
         }
     }
 
-    NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+    jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -109,8 +107,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -122,8 +119,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -139,8 +135,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     if (threadForStop == NULL) {
@@ -153,17 +148,14 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         return NSK_FALSE;
     }
 
-    if (!NSK_JNI_VERIFY(jni, (threadForStop =
-            NSK_CPP_STUB2(NewGlobalRef, jni, threadForStop)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (threadForStop = jni->NewGlobalRef(threadForStop)) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (threadForInterrupt =
-            NSK_CPP_STUB2(NewGlobalRef, jni, threadForInterrupt)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (threadForInterrupt = jni->NewGlobalRef(threadForInterrupt)) != NULL))
         return NSK_FALSE;
 
     /* enable event */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -199,12 +191,11 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         nsk_jvmti_setFailStatus();
 
     /* disable event */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_DISABLE, JVMTI_EVENT_EXCEPTION, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_EXCEPTION, NULL)))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadForStop));
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadForInterrupt));
+    NSK_TRACE(jni->DeleteGlobalRef(threadForStop));
+    NSK_TRACE(jni->DeleteGlobalRef(threadForInterrupt));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -245,7 +236,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_exception_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp
index 4c2223898b8..1b2b5663913 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp
@@ -58,19 +58,17 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     ExceptionEventsCount++;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY1("Exception event: %s\n", signature);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 void JNICALL
@@ -85,19 +83,17 @@ ExceptionCatch(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     ExceptionCatchEventsCount++;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY1("ExceptionCatch event: %s\n", signature);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -109,11 +105,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!nsk_jvmti_waitForSync(timeout))
         return;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION, NULL)))
         nsk_jvmti_setFailStatus();
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
         nsk_jvmti_setFailStatus();
 
     /* resume debugee and wait for sync */
@@ -122,11 +116,9 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!nsk_jvmti_waitForSync(timeout))
         return;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_DISABLE, JVMTI_EVENT_EXCEPTION, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_EXCEPTION, NULL)))
         nsk_jvmti_setFailStatus();
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_DISABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_EXCEPTION_CATCH, NULL)))
         nsk_jvmti_setFailStatus();
 
     NSK_DISPLAY1("Exception events received: %d\n",
@@ -178,7 +170,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_exception_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp
index 9e9a620f13e..29863b2c2c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp
@@ -54,19 +54,17 @@ Exception(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     ExceptionEventsCount++;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY1("Exception event: %s\n", signature);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 void JNICALL
@@ -77,19 +75,17 @@ ExceptionCatch(jvmtiEnv *jvmti_env, JNIEnv *jni_env, jthread thread,
 
     ExceptionCatchEventsCount++;
 
-    if (!NSK_JNI_VERIFY(jni_env, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni_env, exception)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni_env, (klass = jni_env->GetObjectClass(exception)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return;
     }
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY1("ExceptionCatch event: %s\n", signature);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -156,7 +152,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_exception_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp
index dd75ac08542..c9b34e0eb49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp
@@ -54,16 +54,15 @@ MethodEntry(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     MethodEntryEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("MethodEntry event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -78,8 +77,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -91,8 +89,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -103,13 +100,11 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
     }
 
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -129,8 +124,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_ENTRY, thread)))
         nsk_jvmti_setFailStatus();
 
     /* resume debugee and wait for sync */
@@ -144,7 +138,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!NSK_VERIFY(MethodEntryEventsCount != 0))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, thread));
+    NSK_TRACE(jni->DeleteGlobalRef(thread));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -185,7 +179,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_method_entry_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp
index 71aa890c57e..e8256ff6dc1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp
@@ -51,16 +51,15 @@ MethodEntry(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     MethodEntryEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("MethodEntry event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -122,7 +121,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_method_entry_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp
index 9a7c547a0bb..2b75f45a6ae 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp
@@ -55,16 +55,15 @@ MethodExit(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     MethodExitEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("MethodExit event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -79,8 +78,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -92,8 +90,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -104,13 +101,11 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
     }
 
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -130,8 +125,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_METHOD_EXIT, thread)))
         nsk_jvmti_setFailStatus();
 
     /* resume debugee and wait for sync */
@@ -145,7 +139,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!NSK_VERIFY(MethodExitEventsCount != 0))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, thread));
+    NSK_TRACE(jni->DeleteGlobalRef(thread));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -186,7 +180,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_method_exit_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp
index bef66a40276..98a8f8287fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp
@@ -52,16 +52,15 @@ MethodExit(jvmtiEnv *jvmti_env, JNIEnv *jni_env,
     char *signature = NULL;
 
     MethodExitEventsCount++;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("MethodExit event: %s%s\n", name, signature);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -123,7 +122,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_method_exit_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp
index 110349d17f4..329da7c919c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp
@@ -56,20 +56,18 @@ SingleStep(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
 
     SingleStepEventsCount++;
 
-    NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-        jvmti_env, JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL));
+    NSK_JVMTI_VERIFY(jvmti_env->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL));
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY3("SingleStep event: %s%s, location=%s\n", name, signature,
         jlong_to_string(location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -84,8 +82,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -97,8 +94,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -109,13 +105,11 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
     }
 
-    if (!NSK_JNI_VERIFY(jni, (thread =
-            NSK_CPP_STUB2(NewGlobalRef, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (thread = jni->NewGlobalRef(thread)) != NULL))
         return NSK_FALSE;
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -135,8 +129,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
         return;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_SINGLE_STEP, thread)))
         nsk_jvmti_setFailStatus();
 
     /* resume debugee and wait for sync */
@@ -150,7 +143,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* jni, void* arg) {
     if (!NSK_VERIFY(SingleStepEventsCount != 0))
         nsk_jvmti_setFailStatus();
 
-    NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, thread));
+    NSK_TRACE(jni->DeleteGlobalRef(thread));
 
     if (!nsk_jvmti_resumeSync())
         return;
@@ -191,7 +184,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_single_step_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp
index 67d1b8bdce0..4f97e7c7926 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp
@@ -53,20 +53,18 @@ SingleStep(jvmtiEnv *jvmti_env, JNIEnv* jni_env, jthread thread,
 
     SingleStepEventsCount++;
 
-    NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-        jvmti_env, JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL));
+    NSK_JVMTI_VERIFY(jvmti_env->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_SINGLE_STEP, NULL));
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY3("SingleStep event: %s%s, location=%s\n", name, signature,
         jlong_to_string(location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -128,7 +126,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_single_step_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp
index 7e3fa0f5025..2f49fe219f4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp
@@ -52,14 +52,13 @@ VMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
 
     VMObjectAllocEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            object_klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(object_klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("VMObjectAlloc: \"%s\", size=%d\n", signature, size);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -115,7 +114,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_vm_object_alloc_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
@@ -124,8 +123,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY(nsk_jvmti_init_MA(&callbacks)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_OBJECT_ALLOC, NULL)))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp
index fae61e00db7..418f082f280 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp
@@ -52,14 +52,13 @@ VMObjectAlloc(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
 
     VMObjectAllocEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(GetClassSignature, jvmti_env,
-            object_klass, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetClassSignature(object_klass, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY2("VMObjectAlloc: \"%s\", size=%d\n", signature, size);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 /* ========================================================================== */
@@ -115,7 +114,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_vm_object_alloc_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
index c9bed7b4682..ac2d54a16ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
@@ -54,17 +54,16 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
 
     CompiledMethodLoadEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY3("CompiledMethodLoad event: %s%s (0x%p)\n",
         name, signature, code_addr);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -81,8 +80,8 @@ CompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method,
     if (err == JVMTI_ERROR_NONE) {
         NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n",
           name, sig, code_addr);
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig);
+        jvmti_env->Deallocate((unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)sig);
     }
 }
 
@@ -148,7 +147,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_compiled_method_load_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
@@ -158,11 +157,9 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY(nsk_jvmti_init_MA(&callbacks)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_LOAD, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_COMPILED_METHOD_UNLOAD, NULL)))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp
index 5c255b381d8..2ddf7ec6d9c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp
@@ -54,17 +54,16 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
 
     CompiledMethodLoadEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName,
-            jvmti_env, method, &name, &signature, NULL))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, NULL))) {
         nsk_jvmti_setFailStatus();
         return;
     }
     NSK_DISPLAY3("CompiledMethodLoad event: %s%s (0x%p)\n",
         name, signature, code_addr);
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)signature);
+        jvmti_env->Deallocate((unsigned char*)signature);
 }
 
 static void JNICALL
@@ -82,8 +81,8 @@ CompiledMethodUnload(jvmtiEnv *jvmti_env, jmethodID method,
     if (err == JVMTI_ERROR_NONE) {
         NSK_DISPLAY3("for: \tmethod: name=\"%s\" signature=\"%s\"\n\tnative address=0x%p\n",
           name, sig, code_addr);
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)name);
-        NSK_CPP_STUB2(Deallocate, jvmti_env, (unsigned char*)sig);
+        jvmti_env->Deallocate((unsigned char*)name);
+        jvmti_env->Deallocate((unsigned char*)sig);
     }
 }
 
@@ -145,7 +144,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_compiled_method_load_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp
index 5ea5564c864..cee84708ed6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp
@@ -115,7 +115,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_garbage_collection_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
@@ -125,11 +125,9 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     if (!NSK_VERIFY(nsk_jvmti_init_MA(&callbacks)))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_START, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_GARBAGE_COLLECTION_FINISH, NULL)))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp
index 05f6e1976c3..e86e00fbc23 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp
@@ -115,7 +115,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_garbage_collection_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp
index a1deb47179e..449f94e64b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp
@@ -55,8 +55,7 @@ MonitorContendedEnter(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorContendedEnterEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -72,8 +71,7 @@ MonitorContendedEntered(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorContendedEnteredEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -89,8 +87,7 @@ MonitorWait(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorWaitEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -106,8 +103,7 @@ MonitorWaited(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorWaitedEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -189,7 +185,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_monitor_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
@@ -202,17 +198,13 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         return JNI_ERR;
 
     /* enable events */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTER, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_CONTENDED_ENTERED, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAIT, NULL)))
         return JNI_ERR;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB4(SetEventNotificationMode,
-            jvmti, JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_MONITOR_WAITED, NULL)))
         return JNI_ERR;
 
     return JNI_OK;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp
index 3f059c8f590..9d4c0d81c07 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp
@@ -55,8 +55,7 @@ MonitorContendedEnter(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorContendedEnterEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -72,8 +71,7 @@ MonitorContendedEntered(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorContendedEnteredEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -89,8 +87,7 @@ MonitorWait(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorWaitEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -106,8 +103,7 @@ MonitorWaited(jvmtiEnv *jvmti_env, JNIEnv* jni_env,
     MonitorWaitedEventsCount++;
 
     /* get thread information */
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB3(GetThreadInfo, jvmti_env,
-            thread, &info))) {
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetThreadInfo(thread, &info))) {
         nsk_jvmti_setFailStatus();
         return;
     }
@@ -189,7 +185,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_generate_monitor_events = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps))) {
         return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp
index d0983ccd288..f0f3bc4a0a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp
@@ -121,37 +121,35 @@ static int prepare() {
     jsize i;
 
     /* find debugee class */
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     /* find static field with threads array */
     if (!NSK_JNI_VERIFY(jni, (threadsFieldID =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                                    THREADS_FIELD_NAME, THREADS_FIELD_SIG)) != NULL))
+            jni->GetStaticFieldID(debugeeClass, THREADS_FIELD_NAME, THREADS_FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
     /* get threads array from static field */
     if (!NSK_JNI_VERIFY(jni, (threadsArray = (jobjectArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, threadsFieldID)) != NULL))
+            jni->GetStaticObjectField(debugeeClass, threadsFieldID)) != NULL))
         return NSK_FALSE;
 
     /* check array length */
     if (!NSK_JNI_VERIFY(jni, (threadsArrayLength =
-            NSK_CPP_STUB2(GetArrayLength, jni, threadsArray)) == THREADS_COUNT))
+            jni->GetArrayLength(threadsArray)) == THREADS_COUNT))
         return NSK_FALSE;
 
     /* get each thread from array */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsList[i] = (jthread)
-                NSK_CPP_STUB3(GetObjectArrayElement, jni, threadsArray, i)) != NULL))
+                jni->GetObjectArrayElement(threadsArray, i)) != NULL))
             return NSK_FALSE;
     }
 
     /* make global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsList[i] = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i])) != NULL))
+                jni->NewGlobalRef(threadsList[i])) != NULL))
             return NSK_FALSE;
     }
 
@@ -174,8 +172,7 @@ static int checkThreads(const char* kind) {
         NSK_DISPLAY2("    thread #%d (%s):\n", i, threadsName[i]);
 
         /* get thread state */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i], &state))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i], &state))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -233,7 +230,7 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i]));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsList[i]));
     }
 
     return NSK_TRUE;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp
index 66bbbd5c55d..99b3dcc7a38 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp
@@ -155,8 +155,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -170,8 +169,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -189,8 +187,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -208,8 +205,7 @@ static int prepare() {
 
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (!NSK_JNI_VERIFY(jni, (threadsList[i] =
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i])) != NULL))
+        if (!NSK_JNI_VERIFY(jni, (threadsList[i] = jni->NewGlobalRef(threadsList[i])) != NULL))
             return NSK_FALSE;
     }
 
@@ -225,13 +221,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsName[i]);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsList[i])))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsList[i])))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsName[i]);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsList[i])))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsList[i])))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -260,8 +254,7 @@ static int checkThreads(int suspended, const char* kind, jlong timeout) {
         /* wait for WAITTIME for thread to reach expected state */
         do {
             /* get thread state */
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i], &state))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i], &state))) {
                 nsk_jvmti_setFailStatus();
                 return NSK_TRUE;
             }
@@ -371,7 +364,7 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i]));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsList[i]));
     }
 
     return NSK_TRUE;
@@ -449,8 +442,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp
index 585bb08861c..814b4bf3a1e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp
@@ -155,8 +155,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -170,8 +169,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -189,8 +187,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -208,8 +205,7 @@ static int prepare() {
 
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (!NSK_JNI_VERIFY(jni, (threadsList[i] =
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i])) != NULL))
+        if (!NSK_JNI_VERIFY(jni, (threadsList[i] = jni->NewGlobalRef(threadsList[i])) != NULL))
             return NSK_FALSE;
     }
 
@@ -226,14 +222,10 @@ static int suspendThreadsList(int suspend) {
 
     /* suspend or resume threads list */
     if (suspend) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SuspendThreadList, jvmti, THREADS_COUNT,
-                                                    threadsList, results)))
+        if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(THREADS_COUNT, threadsList, results)))
             nsk_jvmti_setFailStatus();
     } else {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(ResumeThreadList, jvmti, THREADS_COUNT,
-                                                    threadsList, results)))
+        if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(THREADS_COUNT, threadsList, results)))
             nsk_jvmti_setFailStatus();
     }
 
@@ -273,8 +265,7 @@ static int checkThreads(int suspended, const char* kind, jlong timeout) {
         /* wait for WAITTIME for thread to reach expected state */
         do {
             /* get thread status */
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i], &state))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i], &state))) {
                 nsk_jvmti_setFailStatus();
                 return NSK_TRUE;
             }
@@ -384,7 +375,7 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i]));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsList[i]));
     }
 
     return NSK_TRUE;
@@ -462,8 +453,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp
index b2e1572fc17..9c926d38cea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp
@@ -136,8 +136,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -151,8 +150,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -170,8 +168,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -190,7 +187,7 @@ static int prepare() {
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].thread = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].thread)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
     }
 
@@ -206,13 +203,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -241,9 +236,7 @@ static int checkSuspendedThreads() {
         NSK_DISPLAY2("  thread #%d (%s):\n", i, threadsDesc[i].threadName);
 
         /* get frame count */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetFrameCount, jvmti,
-                                    threadsDesc[i].thread, &frameCount))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(threadsDesc[i].thread, &frameCount))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -252,8 +245,7 @@ static int checkSuspendedThreads() {
 
         /* get stack trace */
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB6(GetStackTrace, jvmti, threadsDesc[i].thread,
-                                    0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
+                jvmti->GetStackTrace(threadsDesc[i].thread, 0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -294,7 +286,7 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].thread));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].thread));
     }
 
     return NSK_TRUE;
@@ -372,8 +364,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp
index bab083b29c1..f296d9c5908 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp
@@ -158,8 +158,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -173,8 +172,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -192,8 +190,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -214,12 +211,11 @@ static int prepare() {
     for (i = 0; i < THREADS_COUNT; i++) {
         /* get thread class */
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls =
-                NSK_CPP_STUB2(GetObjectClass, jni, threadsDesc[i].thread)) != NULL))
+                jni->GetObjectClass(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         /* get frame method */
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].method =
-                NSK_CPP_STUB4(GetMethodID, jni, threadsDesc[i].cls,
-                            threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
+                jni->GetMethodID(threadsDesc[i].cls, threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
             return NSK_FALSE;
 
         NSK_DISPLAY4("    thread #%d (%s): %p (%s)\n",
@@ -231,10 +227,10 @@ static int prepare() {
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].thread = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].thread)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls = (jclass)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].cls)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].cls)) != NULL))
             return NSK_FALSE;
     }
 
@@ -250,13 +246,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -285,9 +279,7 @@ static int checkThreads(int suspended, const char* kind) {
         NSK_DISPLAY2("  thread #%d (%s):\n", i, threadsDesc[i].threadName);
 
         /* get frame count */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetFrameCount, jvmti,
-                                    threadsDesc[i].thread, &frameCount))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(threadsDesc[i].thread, &frameCount))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -296,8 +288,7 @@ static int checkThreads(int suspended, const char* kind) {
 
         /* get stack trace */
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB6(GetStackTrace, jvmti, threadsDesc[i].thread,
-                                    0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
+                jvmti->GetStackTrace(threadsDesc[i].thread, 0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -357,8 +348,8 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].thread));
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].cls));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].thread));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].cls));
     }
 
     return NSK_TRUE;
@@ -436,8 +427,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp
index 34a62a6df41..363594d72a5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp
@@ -159,8 +159,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -174,8 +173,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -193,8 +191,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -215,12 +212,11 @@ static int prepare() {
     for (i = 0; i < THREADS_COUNT; i++) {
         /* get thread class */
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls =
-                NSK_CPP_STUB2(GetObjectClass, jni, threadsDesc[i].thread)) != NULL))
+                jni->GetObjectClass(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         /* get frame method */
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].method =
-                NSK_CPP_STUB4(GetMethodID, jni, threadsDesc[i].cls,
-                            threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
+                jni->GetMethodID(threadsDesc[i].cls, threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
             return NSK_FALSE;
 
         NSK_DISPLAY4("    thread #%d (%s): %p (%s)\n",
@@ -232,10 +228,10 @@ static int prepare() {
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].thread = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].thread)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls = (jclass)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].cls)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].cls)) != NULL))
             return NSK_FALSE;
     }
 
@@ -251,13 +247,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -288,9 +282,7 @@ static int checkThreads(int suspended, const char* kind) {
         NSK_DISPLAY2("  thread #%d (%s):\n", i, threadsDesc[i].threadName);
 
         /* get frame count */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetFrameCount, jvmti,
-                                    threadsDesc[i].thread, &frameCount))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(threadsDesc[i].thread, &frameCount))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -298,8 +290,7 @@ static int checkThreads(int suspended, const char* kind) {
 
         /* get stack trace */
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB6(GetStackTrace, jvmti, threadsDesc[i].thread,
-                                    0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
+                jvmti->GetStackTrace(threadsDesc[i].thread, 0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -319,8 +310,7 @@ static int checkThreads(int suspended, const char* kind) {
                                         (long)frameStack[j].location);
             /* query frame location */
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB5(GetFrameLocation, jvmti, threadsDesc[i].thread,
-                                                        j, &qMethod, &qLocation))) {
+                    jvmti->GetFrameLocation(threadsDesc[i].thread, j, &qMethod, &qLocation))) {
                 nsk_jvmti_setFailStatus();
                 continue;
             }
@@ -375,8 +365,8 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].thread));
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].cls));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].thread));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].cls));
     }
 
     return NSK_TRUE;
@@ -453,8 +443,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp
index b46d106433d..b0560a13a1f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp
@@ -158,9 +158,8 @@ static int prepare() {
         threadsCounts[i] = 0;
         threadsList[i] = NULL;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jthread)),
-                                                    (unsigned char**)&threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Allocate(threadsCount * sizeof(jthread),
+                                              (unsigned char**)&threadsList[i])))
             return NSK_FALSE;
 
         for (j = 0; j < threadsCount; j++) {
@@ -169,8 +168,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -184,8 +182,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -202,8 +199,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -226,7 +222,7 @@ static int prepare() {
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
             if (!NSK_JNI_VERIFY(jni, (threadsList[i][j] =
-                    NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i][j])) != NULL))
+                    jni->NewGlobalRef(threadsList[i][j])) != NULL))
                 return NSK_FALSE;
         }
     }
@@ -244,8 +240,7 @@ static int suspendThreadsList(int suspend) {
     int i, j;
 
     /* allocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(Allocate, jvmti, resultsSize, (unsigned char**)&results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(resultsSize, (unsigned char**)&results))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -253,14 +248,10 @@ static int suspendThreadsList(int suspend) {
     for (i = 0; i < THREADS_KINDS; i++) {
         /* suspend or resume threads list */
         if (suspend) {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SuspendThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         } else {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(ResumeThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         }
 
@@ -277,8 +268,7 @@ static int suspendThreadsList(int suspend) {
     }
 
     /* deallocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)results))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -295,13 +285,11 @@ static int suspendThreadsIndividually(int suspend) {
         for (j = 0; j < threadsCount; j++) {
             if (suspend) {
                 NSK_DISPLAY2("    suspend thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(SuspendThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             } else {
                 NSK_DISPLAY2("    resume thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(ResumeThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             }
         }
@@ -329,8 +317,7 @@ static int checkThreads(int suspended, const char* kind, jlong timeout) {
             NSK_DISPLAY2("    thread #%d (%s):\n", j, threadsName[i]);
 
             /* get thread state */
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i][j], &state))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i][j], &state))) {
                 nsk_jvmti_setFailStatus();
                 return NSK_FALSE;
             }
@@ -373,14 +360,13 @@ static int clean() {
     /* dispose global references to threads */
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
-            NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i][j]));
+            NSK_TRACE(jni->DeleteGlobalRef(threadsList[i][j]));
         }
     }
 
     /* deallocate memory */
     for (i = 0; i < THREADS_KINDS; i++) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threadsList[i])))
             return NSK_FALSE;
         threadsList[i] = NULL;
     }
@@ -465,8 +451,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp
index 9262797640f..986d1113fc6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp
@@ -161,9 +161,8 @@ static int prepare() {
         threadsCounts[i] = 0;
         threadsList[i] = NULL;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jthread)),
-                                                    (unsigned char**)&threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Allocate(threadsCount * sizeof(jthread),
+                                              (unsigned char**)&threadsList[i])))
             return NSK_FALSE;
 
         for (j = 0; j < threadsCount; j++) {
@@ -172,8 +171,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -187,8 +185,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -205,8 +202,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -229,7 +225,7 @@ static int prepare() {
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
             if (!NSK_JNI_VERIFY(jni, (threadsList[i][j] =
-                    NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i][j])) != NULL))
+                    jni->NewGlobalRef(threadsList[i][j])) != NULL))
                 return NSK_FALSE;
         }
     }
@@ -247,8 +243,7 @@ static int suspendThreadsList(int suspend) {
     int i, j;
 
     /* allocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(Allocate, jvmti, resultsSize, (unsigned char**)&results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(resultsSize, (unsigned char**)&results))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -256,14 +251,10 @@ static int suspendThreadsList(int suspend) {
     for (i = 0; i < THREADS_KINDS; i++) {
         /* suspend or resume threads list */
         if (suspend) {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SuspendThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         } else {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(ResumeThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         }
 
@@ -280,8 +271,7 @@ static int suspendThreadsList(int suspend) {
     }
 
     /* deallocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)results))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -298,13 +288,11 @@ static int suspendThreadsIndividually(int suspend) {
         for (j = 0; j < threadsCount; j++) {
             if (suspend) {
                 NSK_DISPLAY2("    suspend thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(SuspendThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             } else {
                 NSK_DISPLAY2("    resume thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(ResumeThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             }
         }
@@ -332,8 +320,7 @@ static int checkThreads(int suspended, const char* kind, jlong timeout) {
             NSK_DISPLAY2("    thread #%d (%s):\n", j, threadsName[i]);
 
             /* get thread state */
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i][j], &state))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i][j], &state))) {
                 nsk_jvmti_setFailStatus();
                 return NSK_FALSE;
             }
@@ -376,14 +363,13 @@ static int clean() {
     /* dispose global references to threads */
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
-            NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i][j]));
+            NSK_TRACE(jni->DeleteGlobalRef(threadsList[i][j]));
         }
     }
 
     /* deallocate memory */
     for (i = 0; i < THREADS_KINDS; i++) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threadsList[i])))
             return NSK_FALSE;
         threadsList[i] = NULL;
     }
@@ -468,8 +454,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp
index fe0d389f459..45657600f9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp
@@ -158,9 +158,8 @@ static int prepare() {
         threadsCounts[i] = 0;
         threadsList[i] = NULL;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jthread)),
-                                                    (unsigned char**)&threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Allocate(threadsCount * sizeof(jthread),
+                                              (unsigned char**)&threadsList[i])))
             return NSK_FALSE;
 
         for (j = 0; j < threadsCount; j++) {
@@ -169,8 +168,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -184,8 +182,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -202,8 +199,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -226,7 +222,7 @@ static int prepare() {
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
             if (!NSK_JNI_VERIFY(jni, (threadsList[i][j] =
-                    NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i][j])) != NULL))
+                    jni->NewGlobalRef(threadsList[i][j])) != NULL))
                 return NSK_FALSE;
         }
     }
@@ -244,8 +240,7 @@ static int suspendThreadsList(int suspend) {
     int i, j;
 
     /* allocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(Allocate, jvmti, resultsSize, (unsigned char**)&results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(resultsSize, (unsigned char**)&results))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -253,14 +248,10 @@ static int suspendThreadsList(int suspend) {
     for (i = 0; i < THREADS_KINDS; i++) {
         /* suspend or resume threads list */
         if (suspend) {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SuspendThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         } else {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(ResumeThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         }
 
@@ -277,8 +268,7 @@ static int suspendThreadsList(int suspend) {
     }
 
     /* deallocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)results))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -295,13 +285,11 @@ static int suspendThreadsIndividually(int suspend) {
         for (j = 0; j < threadsCount; j++) {
             if (suspend) {
                 NSK_DISPLAY2("    suspend thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(SuspendThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             } else {
                 NSK_DISPLAY2("    resume thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(ResumeThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             }
         }
@@ -329,8 +317,7 @@ static int checkThreads(int suspended, const char* kind, jlong timeout) {
             NSK_DISPLAY2("    thread #%d (%s):\n", j, threadsName[i]);
 
             /* get thread state */
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i][j], &state))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i][j], &state))) {
                 nsk_jvmti_setFailStatus();
                 return NSK_FALSE;
             }
@@ -373,14 +360,13 @@ static int clean() {
     /* dispose global references to threads */
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
-            NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i][j]));
+            NSK_TRACE(jni->DeleteGlobalRef(threadsList[i][j]));
         }
     }
 
     /* deallocate memory */
     for (i = 0; i < THREADS_KINDS; i++) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threadsList[i])))
             return NSK_FALSE;
         threadsList[i] = NULL;
     }
@@ -465,8 +451,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp
index 8fda6746c76..5122bd4fe55 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp
@@ -158,9 +158,8 @@ static int prepare() {
         threadsCounts[i] = 0;
         threadsList[i] = NULL;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(Allocate, jvmti, (threadsCount * sizeof(jthread)),
-                                                    (unsigned char**)&threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Allocate(threadsCount * sizeof(jthread),
+                                              (unsigned char**)&threadsList[i])))
             return NSK_FALSE;
 
         for (j = 0; j < threadsCount; j++) {
@@ -169,8 +168,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -184,8 +182,7 @@ static int prepare() {
             return NSK_FALSE;
 
         /* get thread name (info) */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         /* find by name */
@@ -202,8 +199,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -226,7 +222,7 @@ static int prepare() {
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
             if (!NSK_JNI_VERIFY(jni, (threadsList[i][j] =
-                    NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i][j])) != NULL))
+                    jni->NewGlobalRef(threadsList[i][j])) != NULL))
                 return NSK_FALSE;
         }
     }
@@ -244,8 +240,7 @@ static int suspendThreadsList(int suspend) {
     int i, j;
 
     /* allocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(Allocate, jvmti, resultsSize, (unsigned char**)&results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Allocate(resultsSize, (unsigned char**)&results))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -253,14 +248,10 @@ static int suspendThreadsList(int suspend) {
     for (i = 0; i < THREADS_KINDS; i++) {
         /* suspend or resume threads list */
         if (suspend) {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SuspendThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         } else {
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(ResumeThreadList, jvmti, threadsCount,
-                                                        threadsList[i], results)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThreadList(threadsCount, threadsList[i], results)))
                 nsk_jvmti_setFailStatus();
         }
 
@@ -277,8 +268,7 @@ static int suspendThreadsList(int suspend) {
     }
 
     /* deallocate results array */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)results))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)results))) {
         nsk_jvmti_setFailStatus();
     }
 
@@ -295,13 +285,11 @@ static int suspendThreadsIndividually(int suspend) {
         for (j = 0; j < threadsCount; j++) {
             if (suspend)  {
                 NSK_DISPLAY2("    suspend thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(SuspendThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             } else {
                 NSK_DISPLAY2("    resume thread #%d (%s)\n", j, threadsName[i]);
-                if (!NSK_JVMTI_VERIFY(
-                        NSK_CPP_STUB2(ResumeThread, jvmti, threadsList[i][j])))
+                if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsList[i][j])))
                     nsk_jvmti_setFailStatus();
             }
         }
@@ -329,8 +317,7 @@ static int checkThreads(int suspended, const char* kind, jlong timeout) {
             NSK_DISPLAY2("    thread #%d (%s):\n", j, threadsName[i]);
 
             /* get thread state */
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB3(GetThreadState, jvmti, threadsList[i][j], &state))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->GetThreadState(threadsList[i][j], &state))) {
                 nsk_jvmti_setFailStatus();
                 return NSK_FALSE;
             }
@@ -373,14 +360,13 @@ static int clean() {
     /* dispose global references to threads */
     for (i = 0; i < THREADS_KINDS; i++) {
         for (j = 0; j < threadsCount; j++) {
-            NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i][j]));
+            NSK_TRACE(jni->DeleteGlobalRef(threadsList[i][j]));
         }
     }
 
     /* deallocate memory */
     for (i = 0; i < THREADS_KINDS; i++) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threadsList[i])))
+        if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threadsList[i])))
             return NSK_FALSE;
         threadsList[i] = NULL;
     }
@@ -465,8 +451,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp
index 1dcfe907c30..04a3b498e3f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp
@@ -143,9 +143,7 @@ static int enableEvents(jvmtiEventMode enable) {
     int i;
 
     for (i = 0; i < EVENTS_COUNT; i++) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB4(SetEventNotificationMode, jvmti, enable,
-                                                eventsList[i], NULL))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventNotificationMode(enable, eventsList[i], NULL))) {
             nsk_jvmti_setFailStatus();
             return NSK_FALSE;
         }
@@ -168,37 +166,35 @@ static int prepare() {
     jsize i;
 
     /* find debugee class */
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     /* find static field with threads array */
     if (!NSK_JNI_VERIFY(jni, (threadsFieldID =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                                    THREADS_FIELD_NAME, THREADS_FIELD_SIG)) != NULL))
+            jni->GetStaticFieldID(debugeeClass, THREADS_FIELD_NAME, THREADS_FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
     /* get threads array from static field */
     if (!NSK_JNI_VERIFY(jni, (threadsArray = (jobjectArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, threadsFieldID)) != NULL))
+            jni->GetStaticObjectField(debugeeClass, threadsFieldID)) != NULL))
         return NSK_FALSE;
 
     /* check array length */
     if (!NSK_JNI_VERIFY(jni, (threadsArrayLength =
-            NSK_CPP_STUB2(GetArrayLength, jni, threadsArray)) == THREADS_COUNT))
+            jni->GetArrayLength(threadsArray)) == THREADS_COUNT))
         return NSK_FALSE;
 
     /* get each thread from array */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsList[i] = (jthread)
-                NSK_CPP_STUB3(GetObjectArrayElement, jni, threadsArray, i)) != NULL))
+                jni->GetObjectArrayElement(threadsArray, i)) != NULL))
             return NSK_FALSE;
     }
 
     /* make global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsList[i] = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i])) != NULL))
+                jni->NewGlobalRef(threadsList[i])) != NULL))
             return NSK_FALSE;
     }
 
@@ -218,8 +214,7 @@ static int checkThread(jthread thread, int i, const char* kind) {
     NSK_DISPLAY3("  thread #%d (%s): %p\n", i, threadsName[i], (void*)thread);
 
     /* get frames count */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetFrameCount, jvmti, thread, &framesCount))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(thread, &framesCount))) {
         nsk_jvmti_setFailStatus();
         return NSK_TRUE;
     }
@@ -227,8 +222,7 @@ static int checkThread(jthread thread, int i, const char* kind) {
 
     /* get stack frames */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB6(GetStackTrace, jvmti, thread, 0, MAX_STACK_DEPTH,
-                                                    stackFrames, &stackDepth))) {
+            jvmti->GetStackTrace(thread, 0, MAX_STACK_DEPTH, stackFrames, &stackDepth))) {
         nsk_jvmti_setFailStatus();
         return NSK_TRUE;
     }
@@ -269,7 +263,7 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i]));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsList[i]));
     }
 
     return NSK_TRUE;
@@ -293,7 +287,7 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
     /* check if event is for tested thread */
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (NSK_CPP_STUB3(IsSameObject, jni, threadsList[i], thread)) {
+        if (jni->IsSameObject(threadsList[i], thread)) {
                 NSK_DISPLAY0("SUCCESS: expected THREAD_START event\n");
             eventsStart++;
 
@@ -320,7 +314,7 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
     /* check if event is for tested thread */
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (NSK_CPP_STUB3(IsSameObject, jni, threadsList[i], thread)) {
+        if (jni->IsSameObject(threadsList[i], thread)) {
                 NSK_DISPLAY0("SUCCESS: expected THREAD_START event\n");
             eventsEnd++;
 
@@ -403,9 +397,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.ThreadStart = callbackThreadStart;
         eventCallbacks.ThreadEnd = callbackThreadEnd;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks))))
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
index a796d53b9f7..ca166b6f85d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
@@ -100,8 +100,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
         {
             eventsStart = 0;
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                                            JVMTI_EVENT_THREAD_START, NULL))) {
+                    jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_THREAD_START, NULL))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -122,8 +121,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
             }
 
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                                            JVMTI_EVENT_THREAD_START, NULL))) {
+                    jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_THREAD_START, NULL))) {
                 nsk_jvmti_setFailStatus();
             }
 
@@ -152,8 +150,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
         {
             eventsEnd = 0;
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_ENABLE,
-                                            JVMTI_EVENT_THREAD_END, NULL))) {
+                    jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_THREAD_END, NULL))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -174,8 +171,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
             }
 
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB4(SetEventNotificationMode, jvmti, JVMTI_DISABLE,
-                                            JVMTI_EVENT_THREAD_END, NULL))) {
+                    jvmti->SetEventNotificationMode(JVMTI_DISABLE, JVMTI_EVENT_THREAD_END, NULL))) {
                 nsk_jvmti_setFailStatus();
             }
 
@@ -221,8 +217,7 @@ static int resumeThreads(const char* kind) {
     int i;
 
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(ResumeThread, jvmti, threadsList[i]))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsList[i]))) {
             nsk_jvmti_setFailStatus();
         }
     }
@@ -243,37 +238,35 @@ static int prepare() {
     jsize i;
 
     /* find debugee class */
-    if (!NSK_JNI_VERIFY(jni, (debugeeClass =
-            NSK_CPP_STUB2(FindClass, jni, DEBUGEE_CLASS_NAME)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (debugeeClass = jni->FindClass(DEBUGEE_CLASS_NAME)) != NULL))
         return NSK_FALSE;
 
     /* find static field with threads array */
     if (!NSK_JNI_VERIFY(jni, (threadsFieldID =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, debugeeClass,
-                                    THREADS_FIELD_NAME, THREADS_FIELD_SIG)) != NULL))
+            jni->GetStaticFieldID(debugeeClass, THREADS_FIELD_NAME, THREADS_FIELD_SIG)) != NULL))
         return NSK_FALSE;
 
     /* get threads array from static field */
     if (!NSK_JNI_VERIFY(jni, (threadsArray = (jobjectArray)
-            NSK_CPP_STUB3(GetStaticObjectField, jni, debugeeClass, threadsFieldID)) != NULL))
+            jni->GetStaticObjectField(debugeeClass, threadsFieldID)) != NULL))
         return NSK_FALSE;
 
     /* check array length */
     if (!NSK_JNI_VERIFY(jni, (threadsArrayLength =
-            NSK_CPP_STUB2(GetArrayLength, jni, threadsArray)) == THREADS_COUNT))
+            jni->GetArrayLength(threadsArray)) == THREADS_COUNT))
         return NSK_FALSE;
 
     /* get each thread from array */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsList[i] = (jthread)
-                NSK_CPP_STUB3(GetObjectArrayElement, jni, threadsArray, i)) != NULL))
+                jni->GetObjectArrayElement(threadsArray, i)) != NULL))
             return NSK_FALSE;
     }
 
     /* make global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsList[i] = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsList[i])) != NULL))
+                jni->NewGlobalRef(threadsList[i])) != NULL))
             return NSK_FALSE;
     }
 
@@ -293,8 +286,7 @@ static int checkThread(jthread thread, int i, const char* kind) {
     NSK_DISPLAY3("  thread #%d (%s): %p\n", i, threadsName[i], (void*)thread);
 
     /* get frames count */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetFrameCount, jvmti, thread, &framesCount))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(thread, &framesCount))) {
         nsk_jvmti_setFailStatus();
         return NSK_TRUE;
     }
@@ -302,8 +294,7 @@ static int checkThread(jthread thread, int i, const char* kind) {
 
     /* get stack frames */
     if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB6(GetStackTrace, jvmti, thread, 0, MAX_STACK_DEPTH,
-                                                    stackFrames, &stackDepth))) {
+            jvmti->GetStackTrace(thread, 0, MAX_STACK_DEPTH, stackFrames, &stackDepth))) {
         nsk_jvmti_setFailStatus();
         return NSK_TRUE;
     }
@@ -355,7 +346,7 @@ static int clean() {
 
     /* dispose global references to threads */
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsList[i]));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsList[i]));
     }
 
     return NSK_TRUE;
@@ -379,15 +370,14 @@ callbackThreadStart(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
     /* check if event is for tested thread */
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (NSK_CPP_STUB3(IsSameObject, jni, threadsList[i], thread)) {
+        if (jni->IsSameObject(threadsList[i], thread)) {
                 NSK_DISPLAY0("SUCCESS: expected THREAD_START event\n");
 
             /* suspend thread */
             NSK_DISPLAY3("  suspend starting thread #%d (%s): %p\n",
                                 i, threadsName[i], (void*)thread);
 
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, thread))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -414,15 +404,14 @@ callbackThreadEnd(jvmtiEnv* jvmti, JNIEnv* jni, jthread thread) {
 
     /* check if event is for tested thread */
     for (i = 0; i < THREADS_COUNT; i++) {
-        if (NSK_CPP_STUB3(IsSameObject, jni, threadsList[i], thread)) {
+        if (jni->IsSameObject(threadsList[i], thread)) {
                 NSK_DISPLAY0("SUCCESS: expected THREAD_END event\n");
 
             /* suspend thread */
             NSK_DISPLAY3("  suspend finishing thread #%d (%s): %p\n",
                                 i, threadsName[i], (void*)thread);
 
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, thread))) {
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread))) {
                 nsk_jvmti_setFailStatus();
                 return;
             }
@@ -504,8 +493,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         jvmtiCapabilities suspendCaps;
         memset(&suspendCaps, 0, sizeof(suspendCaps));
         suspendCaps.can_suspend = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &suspendCaps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&suspendCaps)))
             return JNI_ERR;
     }
 
@@ -515,9 +503,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.ThreadStart = callbackThreadStart;
         eventCallbacks.ThreadEnd = callbackThreadEnd;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks))))
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp
index 21f8757ed52..f7a5ed7b8fe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp
@@ -135,8 +135,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
  * Generate missed events (COMPILED_METHOD_LOAD only).
  */
 static int generateEvents() {
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -168,8 +167,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -182,8 +180,7 @@ static int prepare() {
         if (!NSK_VERIFY(allThreadsList[i] != NULL))
             return NSK_FALSE;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         if (threadInfo.name != NULL) {
@@ -200,8 +197,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -222,12 +218,11 @@ static int prepare() {
     for (i = 0; i < THREADS_COUNT; i++) {
 
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls =
-                NSK_CPP_STUB2(GetObjectClass, jni, threadsDesc[i].thread)) != NULL))
+                jni->GetObjectClass(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
 
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].method =
-                NSK_CPP_STUB4(GetMethodID, jni, threadsDesc[i].cls,
-                            threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
+                jni->GetMethodID(threadsDesc[i].cls, threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
             return NSK_FALSE;
 
         NSK_DISPLAY4("    thread #%d (%s): 0x%p (%s)\n",
@@ -239,10 +234,10 @@ static int prepare() {
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].thread = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].thread)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls = (jclass)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].cls)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].cls)) != NULL))
             return NSK_FALSE;
     }
 
@@ -262,13 +257,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -300,9 +293,7 @@ static int checkSuspendedThreads() {
         NSK_DISPLAY2("  thread #%d (%s):\n", i, threadsDesc[i].threadName);
 
         /* get frame count */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetFrameCount, jvmti,
-                                    threadsDesc[i].thread, &frameCount))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(threadsDesc[i].thread, &frameCount))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -311,8 +302,7 @@ static int checkSuspendedThreads() {
 
         /* get stack trace */
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB6(GetStackTrace, jvmti, threadsDesc[i].thread,
-                                    0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
+                jvmti->GetStackTrace(threadsDesc[i].thread, 0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -358,8 +348,8 @@ static int clean() {
 
     NSK_DISPLAY0("Dispose global references to threads\n");
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].thread));
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].cls));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].thread));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].cls));
     }
 
     return NSK_TRUE;
@@ -492,8 +482,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
         caps.can_suspend = 1;
         caps.can_generate_compiled_method_load_events = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
@@ -502,9 +491,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.CompiledMethodLoad = callbackCompiledMethodLoad;
         eventCallbacks.CompiledMethodUnload = callbackCompiledMethodUnload;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks))))
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp
index 68ca0efed6b..23b3b0b7489 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp
@@ -143,8 +143,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
  * Generate missed events (COMPILED_METHOD_LOAD only).
  */
 static int generateEvents() {
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -177,8 +176,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -191,8 +189,7 @@ static int prepare() {
         if (!NSK_VERIFY(allThreadsList[i] != NULL))
             return NSK_FALSE;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         if (threadInfo.name != NULL) {
@@ -209,8 +206,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -231,12 +227,11 @@ static int prepare() {
     for (i = 0; i < THREADS_COUNT; i++) {
 
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls =
-                NSK_CPP_STUB2(GetObjectClass, jni, threadsDesc[i].thread)) != NULL))
+                jni->GetObjectClass(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
 
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].method =
-                NSK_CPP_STUB4(GetMethodID, jni, threadsDesc[i].cls,
-                            threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
+                jni->GetMethodID(threadsDesc[i].cls, threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
             return NSK_FALSE;
 
         NSK_DISPLAY4("    thread #%d (%s): 0x%p (%s)\n",
@@ -248,10 +243,10 @@ static int prepare() {
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].thread = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].thread)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls = (jclass)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].cls)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].cls)) != NULL))
             return NSK_FALSE;
     }
 
@@ -271,13 +266,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -310,9 +303,7 @@ static int checkThreads(int suspended, const char* kind0) {
         NSK_DISPLAY2("  thread #%d (%s):\n", i, threadsDesc[i].threadName);
 
         /* get frame count */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetFrameCount, jvmti,
-                                    threadsDesc[i].thread, &frameCount))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(threadsDesc[i].thread, &frameCount))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -321,8 +312,7 @@ static int checkThreads(int suspended, const char* kind0) {
 
         /* get stack trace */
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB6(GetStackTrace, jvmti, threadsDesc[i].thread,
-                                    0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
+                jvmti->GetStackTrace(threadsDesc[i].thread, 0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -387,8 +377,8 @@ static int clean() {
 
     NSK_DISPLAY0("Dispose global references to threads\n");
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].thread));
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].cls));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].thread));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].cls));
     }
 
     return NSK_TRUE;
@@ -521,8 +511,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
         caps.can_suspend = 1;
         caps.can_generate_compiled_method_load_events = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
@@ -531,9 +520,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.CompiledMethodLoad = callbackCompiledMethodLoad;
         eventCallbacks.CompiledMethodUnload = callbackCompiledMethodUnload;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks))))
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp
index 1ce63c38bfc..94350229313 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp
@@ -143,8 +143,7 @@ agentProc(jvmtiEnv* jvmti, JNIEnv* agentJNI, void* arg) {
  * Generate missed events (COMPILED_METHOD_LOAD only).
  */
 static int generateEvents() {
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(GenerateEvents, jvmti, JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD))) {
         nsk_jvmti_setFailStatus();
         return NSK_FALSE;
     }
@@ -177,8 +176,7 @@ static int prepare() {
     }
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(GetAllThreads, jvmti, &allThreadsCount, &allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&allThreadsCount, &allThreadsList)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(allThreadsCount > 0 && allThreadsList != NULL))
@@ -191,8 +189,7 @@ static int prepare() {
         if (!NSK_VERIFY(allThreadsList[i] != NULL))
             return NSK_FALSE;
 
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, allThreadsList[i], &threadInfo)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(allThreadsList[i], &threadInfo)))
             return NSK_FALSE;
 
         if (threadInfo.name != NULL) {
@@ -209,8 +206,7 @@ static int prepare() {
     }
 
     /* deallocate all threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)allThreadsList)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)allThreadsList)))
         return NSK_FALSE;
 
     /* check if all tested threads found */
@@ -231,12 +227,11 @@ static int prepare() {
     for (i = 0; i < THREADS_COUNT; i++) {
 
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls =
-                NSK_CPP_STUB2(GetObjectClass, jni, threadsDesc[i].thread)) != NULL))
+                jni->GetObjectClass(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
 
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].method =
-                NSK_CPP_STUB4(GetMethodID, jni, threadsDesc[i].cls,
-                            threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
+                jni->GetMethodID(threadsDesc[i].cls, threadsDesc[i].methodName, threadsDesc[i].methodSig)) != NULL))
             return NSK_FALSE;
 
         NSK_DISPLAY4("    thread #%d (%s): 0x%p (%s)\n",
@@ -248,10 +243,10 @@ static int prepare() {
     /* make global refs */
     for (i = 0; i < THREADS_COUNT; i++) {
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].thread = (jthread)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].thread)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].thread)) != NULL))
             return NSK_FALSE;
         if (!NSK_JNI_VERIFY(jni, (threadsDesc[i].cls = (jclass)
-                NSK_CPP_STUB2(NewGlobalRef, jni, threadsDesc[i].cls)) != NULL))
+                jni->NewGlobalRef(threadsDesc[i].cls)) != NULL))
             return NSK_FALSE;
     }
 
@@ -271,13 +266,11 @@ static int suspendThreadsIndividually(int suspend) {
     for (i = 0; i < THREADS_COUNT; i++) {
         if (suspend) {
             NSK_DISPLAY2("    suspend thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(SuspendThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         } else {
             NSK_DISPLAY2("    resume thread #%d (%s)\n", i, threadsDesc[i].threadName);
-            if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB2(ResumeThread, jvmti, threadsDesc[i].thread)))
+            if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(threadsDesc[i].thread)))
                 nsk_jvmti_setFailStatus();
         }
     }
@@ -312,9 +305,7 @@ static int checkThreads(int suspended, const char* kind0) {
         NSK_DISPLAY2("  thread #%d (%s):\n", i, threadsDesc[i].threadName);
 
         /* get frame count */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetFrameCount, jvmti,
-                                    threadsDesc[i].thread, &frameCount))) {
+        if (!NSK_JVMTI_VERIFY(jvmti->GetFrameCount(threadsDesc[i].thread, &frameCount))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -322,8 +313,7 @@ static int checkThreads(int suspended, const char* kind0) {
 
         /* get stack trace */
         if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB6(GetStackTrace, jvmti, threadsDesc[i].thread,
-                                    0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
+                jvmti->GetStackTrace(threadsDesc[i].thread, 0, MAX_STACK_SIZE, frameStack, &frameStackSize))) {
             nsk_jvmti_setFailStatus();
             return NSK_TRUE;
         }
@@ -343,8 +333,7 @@ static int checkThreads(int suspended, const char* kind0) {
                                         (long)frameStack[j].location);
             /* query frame location */
             if (!NSK_JVMTI_VERIFY(
-                    NSK_CPP_STUB5(GetFrameLocation, jvmti, threadsDesc[i].thread,
-                                        j, &qMethod, &qLocation))) {
+                    jvmti->GetFrameLocation(threadsDesc[i].thread, j, &qMethod, &qLocation))) {
                 nsk_jvmti_setFailStatus();
                 continue;
             }
@@ -404,8 +393,8 @@ static int clean() {
 
     NSK_DISPLAY0("Dispose global references to threads\n");
     for (i = 0; i < THREADS_COUNT; i++) {
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].thread));
-        NSK_TRACE(NSK_CPP_STUB2(DeleteGlobalRef, jni, threadsDesc[i].cls));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].thread));
+        NSK_TRACE(jni->DeleteGlobalRef(threadsDesc[i].cls));
     }
 
     return NSK_TRUE;
@@ -538,8 +527,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&caps, 0, sizeof(caps));
         caps.can_suspend = 1;
         caps.can_generate_compiled_method_load_events = 1;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+        if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
             return JNI_ERR;
     }
 
@@ -548,9 +536,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
         memset(&eventCallbacks, 0, sizeof(eventCallbacks));
         eventCallbacks.CompiledMethodLoad = callbackCompiledMethodLoad;
         eventCallbacks.CompiledMethodUnload = callbackCompiledMethodUnload;
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(SetEventCallbacks, jvmti,
-                                    &eventCallbacks, sizeof(eventCallbacks))))
+        if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks))))
             return JNI_ERR;
     }
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp
index 1e825069eac..0a9125332e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp
@@ -62,8 +62,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -75,8 +74,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -87,15 +85,13 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
 
         if (info.name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)info.name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)info.name)))
                 return NSK_FALSE;
         }
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     if (thread == NULL) {
@@ -103,8 +99,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         return NSK_FALSE;
     }
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "waitLock", &waitLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("waitLock", &waitLock)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -114,14 +109,13 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
 
 static int wait_for(jvmtiEnv* jvmti, jlong millis) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, waitLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(waitLock)))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(RawMonitorWait, jvmti, waitLock, millis)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(waitLock, millis)))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, waitLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(waitLock)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -132,27 +126,25 @@ static int displayFrameInfo(jvmtiEnv* jvmti, jint i) {
     char *name = NULL;
     char *signature = NULL;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_DISPLAY4("    got[%d] method: %s%s, location: %s\n", i, name,
         signature, jlong_to_string(frameBuffer[frameCount-1-i].location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+        jvmti->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            sampleStack[i].method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(sampleStack[i].method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_DISPLAY4("    exp[%d] method: %s%s, location: %s\n", i, name,
         signature, jlong_to_string(sampleStack[i].location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+        jvmti->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
     return NSK_TRUE;
 }
@@ -162,27 +154,25 @@ static int complainFrameInfo(jvmtiEnv* jvmti, jint i) {
     char *name = NULL;
     char *signature = NULL;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_COMPLAIN3("    got: method=%s%s, location=%s\n", name, signature,
         jlong_to_string(frameBuffer[frameCount-1-i].location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+        jvmti->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            sampleStack[i].method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(sampleStack[i].method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_COMPLAIN3("    expected: method=%s%s, location=%s\n", name, signature,
         jlong_to_string(sampleStack[i].location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+        jvmti->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
     return NSK_TRUE;
 }
@@ -193,13 +183,11 @@ static int checkStackTrace(jvmtiEnv* jvmti, JNIEnv* jni) {
     int displayFlag =
         (nsk_getVerboseMode() && (sampleCount % DISPLAYING_FREQUENCY) == 0);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(frameLock)))
         return NSK_FALSE;
 
     /* get stack trace */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB6(GetStackTrace, jvmti, thread,
-                0, MAX_DEPTH, frameBuffer, &frameCount))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetStackTrace(thread, 0, MAX_DEPTH, frameBuffer, &frameCount))) {
         res = NSK_FALSE;
     } else {
         if (displayFlag) {
@@ -228,7 +216,7 @@ static int checkStackTrace(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(frameLock)))
         return NSK_FALSE;
 
     return res;
@@ -278,49 +266,45 @@ Java_nsk_jvmti_scenarios_sampling_SP07_sp07t001Thread_wrapper(JNIEnv* jni,
         return 0;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(frameLock)))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetFrameLocation, jvmti, NULL, 1,
-            &sampleStack[depth].method, &sampleStack[depth].location))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetFrameLocation(NULL, 1, &sampleStack[depth].method, &sampleStack[depth].location))) {
         nsk_jvmti_setFailStatus();
         return 0;
     }
 
     depth++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetFrameLocation, jvmti, NULL, 0,
-            &sampleStack[depth].method, &sampleStack[depth].location))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetFrameLocation(NULL, 0, &sampleStack[depth].method, &sampleStack[depth].location))) {
         nsk_jvmti_setFailStatus();
         return 0;
     }
 
     depth++;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(frameLock)))
         return NSK_FALSE;
 
-    if (!NSK_JNI_VERIFY(jni, (klass = NSK_CPP_STUB2(GetObjectClass,
-            jni, obj)) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(obj)) != NULL)) {
         nsk_jvmti_setFailStatus();
         return 0;
     }
 
-    if (!NSK_JNI_VERIFY(jni, (method = NSK_CPP_STUB4(GetMethodID,
-            jni, klass, "fibonacci", "(I)I")) != NULL)) {
+    if (!NSK_JNI_VERIFY(jni, (method = jni->GetMethodID(klass, "fibonacci", "(I)I")) != NULL)) {
         nsk_jvmti_setFailStatus();
         return 0;
     }
 
-    result = NSK_CPP_STUB4(CallIntMethod, jni, obj, method, i);
+    result = jni->CallIntMethod(obj, method, i);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(frameLock)))
         return NSK_FALSE;
 
     depth--;
     depth--;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(frameLock)))
         return NSK_FALSE;
 
     return result;
@@ -355,8 +339,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
             nsk_jvmti_createJVMTIEnv(jvm, reserved)) != NULL))
         return JNI_ERR;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "frameLock", &frameLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("frameLock", &frameLock)))
         return NSK_FALSE;
 
     /* register agent proc and arg */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp
index d723ef5656e..a83af49dc47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp
@@ -66,8 +66,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     NSK_DISPLAY0("Prepare: find tested thread\n");
 
     /* get all live threads */
-    if (!NSK_JVMTI_VERIFY(
-           NSK_CPP_STUB3(GetAllThreads, jvmti, &threads_count, &threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetAllThreads(&threads_count, &threads)))
         return NSK_FALSE;
 
     if (!NSK_VERIFY(threads_count > 0 && threads != NULL))
@@ -79,8 +78,7 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
             return NSK_FALSE;
 
         /* get thread information */
-        if (!NSK_JVMTI_VERIFY(
-                NSK_CPP_STUB3(GetThreadInfo, jvmti, threads[i], &info)))
+        if (!NSK_JVMTI_VERIFY(jvmti->GetThreadInfo(threads[i], &info)))
             return NSK_FALSE;
 
         NSK_DISPLAY3("    thread #%d (%s): %p\n", i, info.name, threads[i]);
@@ -91,15 +89,13 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
         }
 
         if (info.name != NULL) {
-            if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(
-                    Deallocate, jvmti, (unsigned char*)info.name)))
+            if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)info.name)))
                 return NSK_FALSE;
         }
     }
 
     /* deallocate threads list */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)threads)))
+    if (!NSK_JVMTI_VERIFY(jvmti->Deallocate((unsigned char*)threads)))
         return NSK_FALSE;
 
     if (thread == NULL) {
@@ -108,41 +104,34 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
     }
 
     /* get tested thread class */
-    if (!NSK_JNI_VERIFY(jni, (klass =
-            NSK_CPP_STUB2(GetObjectClass, jni, thread)) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (klass = jni->GetObjectClass(thread)) != NULL))
         return NSK_FALSE;
 
     /* get tested thread field 'MAX_LADDER' */
-    if (!NSK_JNI_VERIFY(jni, (fid =
-            NSK_CPP_STUB4(GetStaticFieldID, jni, klass,
-                "MAX_LADDER", "I")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (fid = jni->GetStaticFieldID(klass, "MAX_LADDER", "I")) != NULL))
         return NSK_FALSE;
 
-    MAX_LADDER = NSK_CPP_STUB3(GetStaticIntField, jni, klass, fid);
+    MAX_LADDER = jni->GetStaticIntField(klass, fid);
     NSK_DISPLAY1("MAX_LADDER: %d\n", MAX_LADDER);
 
     /* get tested thread field 'depth' */
-    if (!NSK_JNI_VERIFY(jni, (field =
-            NSK_CPP_STUB4(GetFieldID, jni, klass, "depth", "I")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (field = jni->GetFieldID(klass, "depth", "I")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'run' */
-    if (!NSK_JNI_VERIFY(jni, (methodRun =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "run", "()V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (methodRun = jni->GetMethodID(klass, "run", "()V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'catcher' */
     if (!NSK_JNI_VERIFY(jni, (methodCatcher =
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "catcher", "(II)V")) != NULL))
+            jni->GetMethodID(klass, "catcher", "(II)V")) != NULL))
         return NSK_FALSE;
 
     /* get tested thread method 'thrower' */
-    if (!NSK_JNI_VERIFY(jni, (methodThrower=
-            NSK_CPP_STUB4(GetMethodID, jni, klass, "thrower", "(I)V")) != NULL))
+    if (!NSK_JNI_VERIFY(jni, (methodThrower= jni->GetMethodID(klass, "thrower", "(I)V")) != NULL))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(CreateRawMonitor, jvmti, "waitLock", &waitLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->CreateRawMonitor("waitLock", &waitLock)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -152,14 +141,13 @@ static int prepare(jvmtiEnv* jvmti, JNIEnv* jni) {
 
 static int wait_for(jvmtiEnv* jvmti, jlong millis) {
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorEnter, jvmti, waitLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorEnter(waitLock)))
         return NSK_FALSE;
 
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB3(RawMonitorWait, jvmti, waitLock, millis)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorWait(waitLock, millis)))
         nsk_jvmti_setFailStatus();
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(RawMonitorExit, jvmti, waitLock)))
+    if (!NSK_JVMTI_VERIFY(jvmti->RawMonitorExit(waitLock)))
         return NSK_FALSE;
 
     return NSK_TRUE;
@@ -170,16 +158,15 @@ static int displayFrameInfo(jvmtiEnv* jvmti, jint i) {
     char *name = NULL;
     char *signature = NULL;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_DISPLAY4("    [%d] method: %s%s, location: %s\n", i, name,
         signature, jlong_to_string(frameBuffer[frameCount-1-i].location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+        jvmti->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
     return NSK_TRUE;
 }
@@ -189,19 +176,17 @@ static int complainFrameInfo(jvmtiEnv* jvmti, jint i, jmethodID method) {
     char *name = NULL;
     char *signature = NULL;
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(frameBuffer[frameCount-1-i].method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_COMPLAIN3("    got method: %s%s, location: %s\n", name, signature,
         jlong_to_string(frameBuffer[frameCount-1-i].location, buffer));
     if (name != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)name);
+        jvmti->Deallocate((unsigned char*)name);
     if (signature != NULL)
-        NSK_CPP_STUB2(Deallocate, jvmti, (unsigned char*)signature);
+        jvmti->Deallocate((unsigned char*)signature);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB5(GetMethodName, jvmti,
-            method, &name, &signature, NULL)))
+    if (!NSK_JVMTI_VERIFY(jvmti->GetMethodName(method, &name, &signature, NULL)))
         return NSK_FALSE;
 
     NSK_COMPLAIN2("    expected method: %s%s\n", name, signature);
@@ -217,19 +202,17 @@ static int checkStackTrace(jvmtiEnv* jvmti, JNIEnv* jni) {
     int displayFlag =
         (nsk_getVerboseMode() && (sampleCount % DISPLAYING_FREQUENCY) == 0);
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(SuspendThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->SuspendThread(thread)))
         return NSK_FALSE;
 
-    depth = NSK_CPP_STUB3(GetIntField, jni, thread, field);
+    depth = jni->GetIntField(thread, field);
 
     /* get stack trace */
-    if (!NSK_JVMTI_VERIFY(
-            NSK_CPP_STUB6(GetStackTrace, jvmti, thread,
-                0, MAX_DEPTH, frameBuffer, &frameCount))) {
+    if (!NSK_JVMTI_VERIFY(jvmti->GetStackTrace(thread, 0, MAX_DEPTH, frameBuffer, &frameCount))) {
         res = NSK_FALSE;
     }
 
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(ResumeThread, jvmti, thread)))
+    if (!NSK_JVMTI_VERIFY(jvmti->ResumeThread(thread)))
         res = NSK_FALSE;
 
     if (res) {
@@ -322,7 +305,7 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
 
     memset(&caps, 0, sizeof(caps));
     caps.can_suspend = 1;
-    if (!NSK_JVMTI_VERIFY(NSK_CPP_STUB2(AddCapabilities, jvmti, &caps)))
+    if (!NSK_JVMTI_VERIFY(jvmti->AddCapabilities(&caps)))
         return JNI_ERR;
 
     /* register agent proc and arg */

From e790d1166646eb8a5a378c9512377202d7197785 Mon Sep 17 00:00:00 2001
From: Martin Doerr 
Date: Mon, 15 Oct 2018 08:08:02 +0200
Subject: [PATCH 107/124] 8211852: inspect stack during error reporting

Reviewed-by: dholmes, goetz
---
 src/hotspot/share/runtime/os.cpp        |  6 +++++-
 src/hotspot/share/utilities/vmError.cpp | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index d703c7297e1..b60c0c87413 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1153,7 +1153,11 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
   }
 
   if (accessible) {
-    st->print_cr(INTPTR_FORMAT " points into unknown readable memory", p2i(addr));
+    st->print(INTPTR_FORMAT " points into unknown readable memory:", p2i(addr));
+    for (address p = addr; p < align_up(addr + 1, sizeof(intptr_t)); ++p) {
+      st->print(" %02x", *(u1*)p);
+    }
+    st->cr();
     return;
   }
 
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 693a1caf20a..aee76fd228f 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -756,6 +756,24 @@ void VMError::report(outputStream* st, bool _verbose) {
        st->cr();
      }
 
+  STEP("inspecting top of stack")
+
+     // decode stack contents if possible
+     if (_verbose && _context && Universe::is_fully_initialized()) {
+       frame fr = os::fetch_frame_from_context(_context);
+       const int slots = 8;
+       const intptr_t *start = fr.sp();
+       const intptr_t *end = start + slots;
+       if (is_aligned(start, sizeof(intptr_t)) && os::is_readable_range(start, end)) {
+         st->print_cr("Stack slot to memory mapping:");
+         for (int i = 0; i < slots; ++i) {
+           st->print("stack at sp + %d slots: ", i);
+           os::print_location(st, *(start + i));
+         }
+       }
+       st->cr();
+     }
+
   STEP("printing code blob if possible")
 
      if (_verbose && _context) {

From ce05c7751d863f21bfc26380f1eaf575577114b9 Mon Sep 17 00:00:00 2001
From: Priya Lakshmi Muthuswamy 
Date: Mon, 15 Oct 2018 17:52:42 +0530
Subject: [PATCH 108/124] 8211957: Broken links to stylesheet in
 java.base/doc-files

Reviewed-by: alanb
---
 src/java.base/share/classes/java/lang/doc-files/ValueBased.html | 2 +-
 .../classes/java/lang/doc-files/threadPrimitiveDeprecation.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/doc-files/ValueBased.html b/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
index 4c2c8158708..d5f31be7098 100644
--- a/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
+++ b/src/java.base/share/classes/java/lang/doc-files/ValueBased.html
@@ -2,7 +2,7 @@
 
 
   Value-based Classes
-  
+  
 
 
 
    Value-based Classes
    
diff --git a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
index df87e8e9be6..37123b3cade 100644
--- a/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
+++ b/src/java.base/share/classes/java/lang/doc-files/threadPrimitiveDeprecation.html
@@ -26,7 +26,7 @@
 
 
   Java Thread Primitive Deprecation
-  
+  
 
 
 
    Java Thread Primitive Deprecation
    

From 4bc903d17a1aa08e25d8a4f911645220a9fd80f9 Mon Sep 17 00:00:00 2001
From: Leo Korinth 
Date: Fri, 12 Oct 2018 12:10:34 +0200
Subject: [PATCH 109/124] 8201436: Replace oop_ps_push_contents with
 oop_iterate and closure

Reviewed-by: sjohanss, tschatzl
---
 src/hotspot/share/gc/parallel/psCardTable.cpp |   2 +-
 .../share/gc/parallel/psClosure.inline.hpp    | 121 ++++++++++++++++++
 .../share/gc/parallel/psPromotionManager.cpp  | 102 ---------------
 .../gc/parallel/psPromotionManager.inline.hpp |  45 ++++++-
 src/hotspot/share/gc/parallel/psScavenge.cpp  |   2 +
 .../share/gc/parallel/psScavenge.inline.hpp   |  90 -------------
 src/hotspot/share/gc/parallel/psTasks.cpp     |   1 +
 .../share/oops/instanceClassLoaderKlass.hpp   |   4 +-
 src/hotspot/share/oops/instanceKlass.hpp      |   2 -
 .../share/oops/instanceMirrorKlass.hpp        |   2 -
 src/hotspot/share/oops/instanceRefKlass.hpp   |   4 +-
 src/hotspot/share/oops/klass.hpp              |   2 -
 src/hotspot/share/oops/objArrayKlass.hpp      |   2 -
 src/hotspot/share/oops/oop.hpp                |   2 -
 src/hotspot/share/oops/oop.inline.hpp         |   9 --
 src/hotspot/share/oops/typeArrayKlass.hpp     |   3 +-
 16 files changed, 171 insertions(+), 222 deletions(-)
 create mode 100644 src/hotspot/share/gc/parallel/psClosure.inline.hpp

diff --git a/src/hotspot/share/gc/parallel/psCardTable.cpp b/src/hotspot/share/gc/parallel/psCardTable.cpp
index 908e2ee89e8..e949408df56 100644
--- a/src/hotspot/share/gc/parallel/psCardTable.cpp
+++ b/src/hotspot/share/gc/parallel/psCardTable.cpp
@@ -28,7 +28,7 @@
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"
 #include "gc/parallel/psCardTable.hpp"
 #include "gc/parallel/psPromotionManager.inline.hpp"
-#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psScavenge.inline.hpp"
 #include "gc/parallel/psTasks.hpp"
 #include "gc/parallel/psYoungGen.hpp"
 #include "memory/iterator.inline.hpp"
diff --git a/src/hotspot/share/gc/parallel/psClosure.inline.hpp b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
new file mode 100644
index 00000000000..67708779c4a
--- /dev/null
+++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP
+#define SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP
+
+#include "gc/parallel/psPromotionManager.inline.hpp"
+#include "gc/parallel/psScavenge.inline.hpp"
+#include "memory/iterator.hpp"
+#include "oops/access.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+template 
+class PSRootsClosure: public OopClosure {
+private:
+  PSPromotionManager* _promotion_manager;
+
+  template  void do_oop_work(T *p) {
+    if (PSScavenge::should_scavenge(p)) {
+      // We never card mark roots, maybe call a func without test?
+      _promotion_manager->copy_and_push_safe_barrier(p);
+    }
+  }
+public:
+  PSRootsClosure(PSPromotionManager* pm) : _promotion_manager(pm) { }
+  void do_oop(oop* p)       { PSRootsClosure::do_oop_work(p); }
+  void do_oop(narrowOop* p) { PSRootsClosure::do_oop_work(p); }
+};
+
+typedef PSRootsClosure PSScavengeRootsClosure;
+typedef PSRootsClosure PSPromoteRootsClosure;
+
+// Scavenges a single oop in a ClassLoaderData.
+class PSScavengeFromCLDClosure: public OopClosure {
+private:
+  PSPromotionManager* _pm;
+  // Used to redirty a scanned cld if it has oops
+  // pointing to the young generation after being scanned.
+  ClassLoaderData*    _scanned_cld;
+public:
+  PSScavengeFromCLDClosure(PSPromotionManager* pm) : _pm(pm), _scanned_cld(NULL) { }
+  void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+  void do_oop(oop* p)       {
+    ParallelScavengeHeap* psh = ParallelScavengeHeap::heap();
+    assert(!psh->is_in_reserved(p), "GC barrier needed");
+    if (PSScavenge::should_scavenge(p)) {
+      assert(PSScavenge::should_scavenge(p, true), "revisiting object?");
+
+      oop o = *p;
+      oop new_obj;
+      if (o->is_forwarded()) {
+        new_obj = o->forwardee();
+      } else {
+        new_obj = _pm->copy_to_survivor_space(o);
+      }
+      RawAccess::oop_store(p, new_obj);
+
+      if (PSScavenge::is_obj_in_young(new_obj)) {
+        do_cld_barrier();
+      }
+    }
+  }
+
+  void set_scanned_cld(ClassLoaderData* cld) {
+    assert(_scanned_cld == NULL || cld == NULL, "Should always only handling one cld at a time");
+    _scanned_cld = cld;
+  }
+
+private:
+  void do_cld_barrier() {
+    assert(_scanned_cld != NULL, "Should not be called without having a scanned cld");
+    _scanned_cld->record_modified_oops();
+  }
+};
+
+// Scavenges the oop in a ClassLoaderData.
+class PSScavengeCLDClosure: public CLDClosure {
+private:
+  PSScavengeFromCLDClosure _oop_closure;
+public:
+  PSScavengeCLDClosure(PSPromotionManager* pm) : _oop_closure(pm) { }
+  void do_cld(ClassLoaderData* cld) {
+    // If the cld has not been dirtied we know that there's
+    // no references into  the young gen and we can skip it.
+
+    if (cld->has_modified_oops()) {
+      // Setup the promotion manager to redirty this cld
+      // if references are left in the young gen.
+      _oop_closure.set_scanned_cld(cld);
+
+      // Clean the cld since we're going to scavenge all the metadata.
+      cld->oops_do(&_oop_closure, false, /*clear_modified_oops*/true);
+
+      _oop_closure.set_scanned_cld(NULL);
+    }
+  }
+};
+
+#endif
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
index 58337c068c3..70d0a7f918a 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp
@@ -41,14 +41,7 @@
 #include "memory/padded.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/access.inline.hpp"
-#include "oops/arrayOop.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
-#include "oops/instanceClassLoaderKlass.inline.hpp"
-#include "oops/instanceKlass.inline.hpp"
-#include "oops/instanceMirrorKlass.inline.hpp"
-#include "oops/objArrayKlass.inline.hpp"
-#include "oops/objArrayOop.inline.hpp"
-#include "oops/oop.inline.hpp"
 
 PaddedEnd* PSPromotionManager::_manager_array = NULL;
 OopStarTaskQueueSet*           PSPromotionManager::_stack_array_depth = NULL;
@@ -397,101 +390,6 @@ void PSPromotionManager::process_array_chunk(oop old) {
   }
 }
 
-class PushContentsClosure : public BasicOopIterateClosure {
-  PSPromotionManager* _pm;
- public:
-  PushContentsClosure(PSPromotionManager* pm) : _pm(pm) {}
-
-  template  void do_oop_work(T* p) {
-    if (PSScavenge::should_scavenge(p)) {
-      _pm->claim_or_forward_depth(p);
-    }
-  }
-
-  virtual void do_oop(oop* p)       { do_oop_work(p); }
-  virtual void do_oop(narrowOop* p) { do_oop_work(p); }
-
-  // Don't use the oop verification code in the oop_oop_iterate framework.
-  debug_only(virtual bool should_verify_oops() { return false; })
-};
-
-void InstanceKlass::oop_ps_push_contents(oop obj, PSPromotionManager* pm) {
-  PushContentsClosure cl(pm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_oop_maps_reverse(obj, &cl);
-  } else {
-    oop_oop_iterate_oop_maps_reverse(obj, &cl);
-  }
-}
-
-void InstanceMirrorKlass::oop_ps_push_contents(oop obj, PSPromotionManager* pm) {
-    // Note that we don't have to follow the mirror -> klass pointer, since all
-    // klasses that are dirty will be scavenged when we iterate over the
-    // ClassLoaderData objects.
-
-  InstanceKlass::oop_ps_push_contents(obj, pm);
-
-  PushContentsClosure cl(pm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_statics(obj, &cl);
-  } else {
-    oop_oop_iterate_statics(obj, &cl);
-  }
-}
-
-void InstanceClassLoaderKlass::oop_ps_push_contents(oop obj, PSPromotionManager* pm) {
-  InstanceKlass::oop_ps_push_contents(obj, pm);
-
-  // This is called by the young collector. It will already have taken care of
-  // all class loader data. So, we don't have to follow the class loader ->
-  // class loader data link.
-}
-
-template 
-static void oop_ps_push_contents_specialized(oop obj, InstanceRefKlass *klass, PSPromotionManager* pm) {
-  T* referent_addr = (T*)java_lang_ref_Reference::referent_addr_raw(obj);
-  if (PSScavenge::should_scavenge(referent_addr)) {
-    ReferenceProcessor* rp = PSScavenge::reference_processor();
-    if (rp->discover_reference(obj, klass->reference_type())) {
-      // reference discovered, referent will be traversed later.
-      klass->InstanceKlass::oop_ps_push_contents(obj, pm);
-      return;
-    } else {
-      // treat referent as normal oop
-      pm->claim_or_forward_depth(referent_addr);
-    }
-  }
-  // Treat discovered as normal oop
-  T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr_raw(obj);
-  if (PSScavenge::should_scavenge(discovered_addr)) {
-    pm->claim_or_forward_depth(discovered_addr);
-  }
-  klass->InstanceKlass::oop_ps_push_contents(obj, pm);
-}
-
-void InstanceRefKlass::oop_ps_push_contents(oop obj, PSPromotionManager* pm) {
-  if (UseCompressedOops) {
-    oop_ps_push_contents_specialized(obj, this, pm);
-  } else {
-    oop_ps_push_contents_specialized(obj, this, pm);
-  }
-}
-
-void ObjArrayKlass::oop_ps_push_contents(oop obj, PSPromotionManager* pm) {
-  assert(obj->is_objArray(), "obj must be obj array");
-  PushContentsClosure cl(pm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_elements(objArrayOop(obj), &cl);
-  } else {
-    oop_oop_iterate_elements(objArrayOop(obj), &cl);
-  }
-}
-
-void TypeArrayKlass::oop_ps_push_contents(oop obj, PSPromotionManager* pm) {
-  assert(obj->is_typeArray(),"must be a type array");
-  ShouldNotReachHere();
-}
-
 oop PSPromotionManager::oop_promotion_failed(oop obj, markOop obj_mark) {
   assert(_old_gen_is_full || PromotionFailureALot, "Sanity");
 
diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
index 8c590e080ad..91abae6de27 100644
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
@@ -30,9 +30,10 @@
 #include "gc/parallel/psOldGen.hpp"
 #include "gc/parallel/psPromotionLAB.inline.hpp"
 #include "gc/parallel/psPromotionManager.hpp"
-#include "gc/parallel/psScavenge.hpp"
+#include "gc/parallel/psScavenge.inline.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
 #include "logging/log.hpp"
+#include "memory/iterator.inline.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 
@@ -99,8 +100,48 @@ inline void PSPromotionManager::promotion_trace_event(oop new_obj, oop old_obj,
   }
 }
 
+class PSPushContentsClosure: public BasicOopIterateClosure {
+  PSPromotionManager* _pm;
+ public:
+  PSPushContentsClosure(PSPromotionManager* pm) : BasicOopIterateClosure(PSScavenge::reference_processor()), _pm(pm) {}
+
+  template  void do_oop_nv(T* p) {
+    if (PSScavenge::should_scavenge(p)) {
+      _pm->claim_or_forward_depth(p);
+    }
+  }
+
+  virtual void do_oop(oop* p)       { do_oop_nv(p); }
+  virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+
+  // Don't use the oop verification code in the oop_oop_iterate framework.
+  debug_only(virtual bool should_verify_oops() { return false; })
+};
+
+//
+// This closure specialization will override the one that is defined in
+// instanceRefKlass.inline.cpp. It swaps the order of oop_oop_iterate and
+// oop_oop_iterate_ref_processing. Unfortunately G1 and Parallel behaves
+// significantly better (especially in the Derby benchmark) using opposite
+// order of these function calls.
+//
+template <>
+inline void InstanceRefKlass::oop_oop_iterate_reverse(oop obj, PSPushContentsClosure* closure) {
+  oop_oop_iterate_ref_processing(obj, closure);
+  InstanceKlass::oop_oop_iterate_reverse(obj, closure);
+}
+
+template <>
+inline void InstanceRefKlass::oop_oop_iterate_reverse(oop obj, PSPushContentsClosure* closure) {
+  oop_oop_iterate_ref_processing(obj, closure);
+  InstanceKlass::oop_oop_iterate_reverse(obj, closure);
+}
+
 inline void PSPromotionManager::push_contents(oop obj) {
-  obj->ps_push_contents(this);
+  if (!obj->klass()->is_typeArray_klass()) {
+    PSPushContentsClosure pcc(this);
+    obj->oop_iterate_backwards(&pcc);
+  }
 }
 //
 // This method is pretty bulky. It would be nice to split it up
diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp
index e19da59c8e4..3d982bc4c59 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.cpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.cpp
@@ -28,8 +28,10 @@
 #include "gc/parallel/gcTaskManager.hpp"
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/parallel/psAdaptiveSizePolicy.hpp"
+#include "gc/parallel/psClosure.inline.hpp"
 #include "gc/parallel/psMarkSweepProxy.hpp"
 #include "gc/parallel/psParallelCompact.inline.hpp"
+#include "gc/parallel/psPromotionManager.inline.hpp"
 #include "gc/parallel/psScavenge.inline.hpp"
 #include "gc/parallel/psTasks.hpp"
 #include "gc/shared/collectorPolicy.hpp"
diff --git a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp
index 0c58fd4b3f7..40d51f6a770 100644
--- a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp
@@ -26,7 +26,6 @@
 #define SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
-#include "gc/parallel/psPromotionManager.inline.hpp"
 #include "gc/parallel/psScavenge.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
@@ -65,93 +64,4 @@ inline bool PSScavenge::should_scavenge(T* p, bool check_to_space) {
   return should_scavenge(p);
 }
 
-template
-class PSRootsClosure: public OopClosure {
- private:
-  PSPromotionManager* _promotion_manager;
-
- protected:
-  template  void do_oop_work(T *p) {
-    if (PSScavenge::should_scavenge(p)) {
-      // We never card mark roots, maybe call a func without test?
-      _promotion_manager->copy_and_push_safe_barrier(p);
-    }
-  }
- public:
-  PSRootsClosure(PSPromotionManager* pm) : _promotion_manager(pm) { }
-  void do_oop(oop* p)       { PSRootsClosure::do_oop_work(p); }
-  void do_oop(narrowOop* p) { PSRootsClosure::do_oop_work(p); }
-};
-
-typedef PSRootsClosure PSScavengeRootsClosure;
-typedef PSRootsClosure PSPromoteRootsClosure;
-
-// Scavenges a single oop in a ClassLoaderData.
-class PSScavengeFromCLDClosure: public OopClosure {
- private:
-  PSPromotionManager* _pm;
-  // Used to redirty a scanned cld if it has oops
-  // pointing to the young generation after being scanned.
-  ClassLoaderData*    _scanned_cld;
- public:
-  PSScavengeFromCLDClosure(PSPromotionManager* pm) : _pm(pm), _scanned_cld(NULL) { }
-  void do_oop(narrowOop* p) { ShouldNotReachHere(); }
-  void do_oop(oop* p)       {
-    ParallelScavengeHeap* psh = ParallelScavengeHeap::heap();
-    assert(!psh->is_in_reserved(p), "GC barrier needed");
-    if (PSScavenge::should_scavenge(p)) {
-      assert(PSScavenge::should_scavenge(p, true), "revisiting object?");
-
-      oop o = *p;
-      oop new_obj;
-      if (o->is_forwarded()) {
-        new_obj = o->forwardee();
-      } else {
-        new_obj = _pm->copy_to_survivor_space(o);
-      }
-      RawAccess::oop_store(p, new_obj);
-
-      if (PSScavenge::is_obj_in_young(new_obj)) {
-        do_cld_barrier();
-      }
-    }
-  }
-
-  void set_scanned_cld(ClassLoaderData* cld) {
-    assert(_scanned_cld == NULL || cld == NULL, "Should always only handling one cld at a time");
-    _scanned_cld = cld;
-  }
-
- private:
-  void do_cld_barrier() {
-    assert(_scanned_cld != NULL, "Should not be called without having a scanned cld");
-    _scanned_cld->record_modified_oops();
-  }
-};
-
-// Scavenges the oop in a ClassLoaderData.
-class PSScavengeCLDClosure: public CLDClosure {
- private:
-  PSScavengeFromCLDClosure _oop_closure;
- protected:
- public:
-  PSScavengeCLDClosure(PSPromotionManager* pm) : _oop_closure(pm) { }
-  void do_cld(ClassLoaderData* cld) {
-    // If the cld has not been dirtied we know that there's
-    // no references into  the young gen and we can skip it.
-
-    if (cld->has_modified_oops()) {
-      // Setup the promotion manager to redirty this cld
-      // if references are left in the young gen.
-      _oop_closure.set_scanned_cld(cld);
-
-      // Clean the cld since we're going to scavenge all the metadata.
-      cld->oops_do(&_oop_closure, false, /*clear_modified_oops*/true);
-
-      _oop_closure.set_scanned_cld(NULL);
-    }
-  }
-};
-
-
 #endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psTasks.cpp b/src/hotspot/share/gc/parallel/psTasks.cpp
index fbf52308b2b..fd3ffb77bda 100644
--- a/src/hotspot/share/gc/parallel/psTasks.cpp
+++ b/src/hotspot/share/gc/parallel/psTasks.cpp
@@ -29,6 +29,7 @@
 #include "code/codeCache.hpp"
 #include "gc/parallel/gcTaskManager.hpp"
 #include "gc/parallel/psCardTable.hpp"
+#include "gc/parallel/psClosure.inline.hpp"
 #include "gc/parallel/psPromotionManager.hpp"
 #include "gc/parallel/psPromotionManager.inline.hpp"
 #include "gc/parallel/psScavenge.inline.hpp"
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index 00a116ee793..365c36a0344 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,6 @@ public:
   // GC specific object visitors
   //
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  void oop_ps_push_contents(  oop obj, PSPromotionManager* pm);
   // Parallel Compact
   void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 41accd4a624..acc9a6b1e7f 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -1186,8 +1186,6 @@ public:
   // GC specific object visitors
   //
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  void oop_ps_push_contents(  oop obj, PSPromotionManager* pm);
   // Parallel Compact
   void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index 31916cf1650..ccfb7f6dfac 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -92,8 +92,6 @@ class InstanceMirrorKlass: public InstanceKlass {
   // GC specific object visitors
   //
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  void oop_ps_push_contents(  oop obj, PSPromotionManager* pm);
   // Parallel Compact
   void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index 8c331139b60..725d53c7e84 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,8 +61,6 @@ class InstanceRefKlass: public InstanceKlass {
   // GC specific object visitors
   //
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  void oop_ps_push_contents(  oop obj, PSPromotionManager* pm);
   // Parallel Compact
   void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index aabde977082..4838b5cb84a 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -676,8 +676,6 @@ protected:
   // GC specific object visitors
   //
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  virtual void oop_ps_push_contents(  oop obj, PSPromotionManager* pm)   = 0;
   // Parallel Compact
   virtual void oop_pc_follow_contents(oop obj, ParCompactionManager* cm) = 0;
   virtual void oop_pc_update_pointers(oop obj, ParCompactionManager* cm) = 0;
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index ca02f29d961..25633341346 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -123,8 +123,6 @@ class ObjArrayKlass : public ArrayKlass {
   // GC specific object visitors
   //
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  void oop_ps_push_contents(  oop obj, PSPromotionManager* pm);
   // Parallel Compact
   void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index fb3cd7ae63f..ff1f0b09500 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -291,8 +291,6 @@ class oopDesc {
   // Parallel Compact
   inline void pc_follow_contents(ParCompactionManager* cm);
   inline void pc_update_contents(ParCompactionManager* cm);
-  // Parallel Scavenge
-  inline void ps_push_contents(PSPromotionManager* pm);
 #endif
 
   template 
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index bcc44b24eb3..6732f62ed1b 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -439,15 +439,6 @@ void oopDesc::pc_update_contents(ParCompactionManager* cm) {
   }
   // Else skip it.  The TypeArrayKlass in the header never needs scavenging.
 }
-
-void oopDesc::ps_push_contents(PSPromotionManager* pm) {
-  Klass* k = klass();
-  if (!k->is_typeArray_klass()) {
-    // It might contain oops beyond the header, so take the virtual call.
-    k->oop_ps_push_contents(this, pm);
-  }
-  // Else skip it.  The TypeArrayKlass in the header never needs scavenging.
-}
 #endif // INCLUDE_PARALLELGC
 
 template 
diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp
index bc356f704a8..c267855fca3 100644
--- a/src/hotspot/share/oops/typeArrayKlass.hpp
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp
@@ -76,9 +76,8 @@ class TypeArrayKlass : public ArrayKlass {
 
   // GC specific object visitors
   //
+
 #if INCLUDE_PARALLELGC
-  // Parallel Scavenge
-  void oop_ps_push_contents(  oop obj, PSPromotionManager* pm);
   // Parallel Compact
   void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);

From 78fe66c3bb2c53091f22db2a7f13756e9edf4a27 Mon Sep 17 00:00:00 2001
From: Leo Korinth 
Date: Fri, 12 Oct 2018 12:13:06 +0200
Subject: [PATCH 110/124] 8211446: Replace oop_pc_follow_contents with
 oop_iterate and closure

Reviewed-by: sjohanss, tschatzl
---
 src/hotspot/share/gc/parallel/pcTasks.cpp     |  10 +-
 .../share/gc/parallel/psCompactionManager.cpp | 109 +-----------------
 .../share/gc/parallel/psCompactionManager.hpp |  18 +--
 .../parallel/psCompactionManager.inline.hpp   |  76 ++++++++----
 .../share/gc/parallel/psParallelCompact.cpp   |  43 +++++--
 .../share/oops/instanceClassLoaderKlass.hpp   |   1 -
 src/hotspot/share/oops/instanceKlass.hpp      |   1 -
 .../share/oops/instanceMirrorKlass.hpp        |   1 -
 src/hotspot/share/oops/instanceRefKlass.hpp   |   1 -
 src/hotspot/share/oops/klass.hpp              |   1 -
 src/hotspot/share/oops/objArrayKlass.hpp      |   1 -
 src/hotspot/share/oops/oop.hpp                |   1 -
 src/hotspot/share/oops/oop.inline.hpp         |   3 -
 src/hotspot/share/oops/typeArrayKlass.hpp     |   1 -
 14 files changed, 94 insertions(+), 173 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/pcTasks.cpp b/src/hotspot/share/gc/parallel/pcTasks.cpp
index 5807bb48edf..66d69dd74f6 100644
--- a/src/hotspot/share/gc/parallel/pcTasks.cpp
+++ b/src/hotspot/share/gc/parallel/pcTasks.cpp
@@ -35,6 +35,7 @@
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "logging/log.hpp"
+#include "memory/iterator.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/objArrayKlass.inline.hpp"
@@ -58,7 +59,7 @@ void ThreadRootsMarkingTask::do_it(GCTaskManager* manager, uint which) {
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
 
-  ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
+  PCMarkAndPushClosure mark_and_push_closure(cm);
   MarkingCodeBlobClosure mark_and_push_in_blobs(&mark_and_push_closure, !CodeBlobToOopClosure::FixRelocations);
 
   _thread->oops_do(&mark_and_push_closure, &mark_and_push_in_blobs);
@@ -73,7 +74,7 @@ void MarkFromRootsTask::do_it(GCTaskManager* manager, uint which) {
 
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
+  PCMarkAndPushClosure mark_and_push_closure(cm);
 
   switch (_root_type) {
     case universe:
@@ -139,7 +140,7 @@ void RefProcTaskProxy::do_it(GCTaskManager* manager, uint which)
 
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
+  PCMarkAndPushClosure mark_and_push_closure(cm);
   ParCompactionManager::FollowStackClosure follow_stack_closure(cm);
   _rp_task.work(_work_id, *PSParallelCompact::is_alive_closure(),
                 mark_and_push_closure, follow_stack_closure);
@@ -182,13 +183,12 @@ void StealMarkingTask::do_it(GCTaskManager* manager, uint which) {
 
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
 
   oop obj = NULL;
   ObjArrayTask task;
   do {
     while (ParCompactionManager::steal_objarray(which,  task)) {
-      cm->follow_contents((objArrayOop)task.obj(), task.index());
+      cm->follow_array((objArrayOop)task.obj(), task.index());
       cm->follow_marking_stacks();
     }
     while (ParCompactionManager::steal(which, obj)) {
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
index 1a82dae92a3..6bd34f6b878 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp
@@ -132,113 +132,6 @@ ParCompactionManager::gc_thread_compaction_manager(uint index) {
   return _manager_array[index];
 }
 
-void InstanceKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
-  assert(obj != NULL, "can't follow the content of NULL object");
-
-  cm->follow_klass(this);
-  // Only mark the header and let the scan of the meta-data mark
-  // everything else.
-
-  ParCompactionManager::MarkAndPushClosure cl(cm);
-  if (UseCompressedOops) {
-    InstanceKlass::oop_oop_iterate_oop_maps(obj, &cl);
-  } else {
-    InstanceKlass::oop_oop_iterate_oop_maps(obj, &cl);
-  }
-}
-
-void InstanceMirrorKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
-  InstanceKlass::oop_pc_follow_contents(obj, cm);
-
-  // Follow the klass field in the mirror.
-  Klass* klass = java_lang_Class::as_Klass(obj);
-  if (klass != NULL) {
-    // An unsafe anonymous class doesn't have its own class loader,
-    // so the call to follow_klass will mark and push its java mirror instead of the
-    // class loader. When handling the java mirror for an unsafe anonymous
-    // class we need to make sure its class loader data is claimed, this is done
-    // by calling follow_class_loader explicitly. For non-anonymous classes the
-    // call to follow_class_loader is made when the class loader itself is handled.
-    if (klass->is_instance_klass() &&
-        InstanceKlass::cast(klass)->is_unsafe_anonymous()) {
-      cm->follow_class_loader(klass->class_loader_data());
-    } else {
-      cm->follow_klass(klass);
-    }
-  } else {
-    // If klass is NULL then this a mirror for a primitive type.
-    // We don't have to follow them, since they are handled as strong
-    // roots in Universe::oops_do.
-    assert(java_lang_Class::is_primitive(obj), "Sanity check");
-  }
-
-  ParCompactionManager::MarkAndPushClosure cl(cm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_statics(obj, &cl);
-  } else {
-    oop_oop_iterate_statics(obj, &cl);
-  }
-}
-
-void InstanceClassLoaderKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
-  InstanceKlass::oop_pc_follow_contents(obj, cm);
-
-  ClassLoaderData * const loader_data = java_lang_ClassLoader::loader_data_acquire(obj);
-  if (loader_data != NULL) {
-    cm->follow_class_loader(loader_data);
-  }
-}
-
-template 
-static void oop_pc_follow_contents_specialized(InstanceRefKlass* klass, oop obj, ParCompactionManager* cm) {
-  T* referent_addr = (T*)java_lang_ref_Reference::referent_addr_raw(obj);
-  T heap_oop = RawAccess<>::oop_load(referent_addr);
-  log_develop_trace(gc, ref)("InstanceRefKlass::oop_pc_follow_contents " PTR_FORMAT, p2i(obj));
-  if (!CompressedOops::is_null(heap_oop)) {
-    oop referent = CompressedOops::decode_not_null(heap_oop);
-    if (PSParallelCompact::mark_bitmap()->is_unmarked(referent) &&
-        PSParallelCompact::ref_processor()->discover_reference(obj, klass->reference_type())) {
-      // reference already enqueued, referent will be traversed later
-      klass->InstanceKlass::oop_pc_follow_contents(obj, cm);
-      log_develop_trace(gc, ref)("       Non NULL enqueued " PTR_FORMAT, p2i(obj));
-      return;
-    } else {
-      // treat referent as normal oop
-      log_develop_trace(gc, ref)("       Non NULL normal " PTR_FORMAT, p2i(obj));
-      cm->mark_and_push(referent_addr);
-    }
-  }
-  // Treat discovered as normal oop.
-  T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr_raw(obj);
-  cm->mark_and_push(discovered_addr);
-  klass->InstanceKlass::oop_pc_follow_contents(obj, cm);
-}
-
-
-void InstanceRefKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
-  if (UseCompressedOops) {
-    oop_pc_follow_contents_specialized(this, obj, cm);
-  } else {
-    oop_pc_follow_contents_specialized(this, obj, cm);
-  }
-}
-
-void ObjArrayKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
-  cm->follow_klass(this);
-
-  if (UseCompressedOops) {
-    oop_pc_follow_contents_specialized(objArrayOop(obj), 0, cm);
-  } else {
-    oop_pc_follow_contents_specialized(objArrayOop(obj), 0, cm);
-  }
-}
-
-void TypeArrayKlass::oop_pc_follow_contents(oop obj, ParCompactionManager* cm) {
-  assert(obj->is_typeArray(),"must be a type array");
-  // Performance tweak: We skip iterating over the klass pointer since we
-  // know that Universe::TypeArrayKlass never moves.
-}
-
 void ParCompactionManager::follow_marking_stacks() {
   do {
     // Drain the overflow stack first, to allow stealing from the marking stack.
@@ -253,7 +146,7 @@ void ParCompactionManager::follow_marking_stacks() {
     // Process ObjArrays one at a time to avoid marking stack bloat.
     ObjArrayTask task;
     if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) {
-      follow_contents((objArrayOop)task.obj(), task.index());
+      follow_array((objArrayOop)task.obj(), task.index());
     }
   } while (!marking_stacks_empty());
 
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
index a79c360124c..782f26d813d 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,24 +171,10 @@ private:
   void drain_region_stacks();
 
   void follow_contents(oop obj);
-  void follow_contents(objArrayOop array, int index);
+  void follow_array(objArrayOop array, int index);
 
   void update_contents(oop obj);
 
-  class MarkAndPushClosure: public BasicOopIterateClosure {
-   private:
-    ParCompactionManager* _compaction_manager;
-   public:
-    MarkAndPushClosure(ParCompactionManager* cm) : _compaction_manager(cm) { }
-
-    template  void do_oop_work(T* p);
-    virtual void do_oop(oop* p);
-    virtual void do_oop(narrowOop* p);
-
-    // This closure provides its own oop verification code.
-    debug_only(virtual bool should_verify_oops() { return false; })
-  };
-
   class FollowStackClosure: public VoidClosure {
    private:
     ParCompactionManager* _compaction_manager;
diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index dbac5a06571..e2ad1f460eb 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
 #define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
 
+#include "classfile/javaClasses.inline.hpp"
 #include "gc/parallel/parMarkBitMap.hpp"
 #include "gc/parallel/psCompactionManager.hpp"
 #include "gc/parallel/psParallelCompact.inline.hpp"
@@ -37,6 +38,37 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+class PCMarkAndPushClosure: public OopClosure {
+private:
+  ParCompactionManager* _compaction_manager;
+public:
+  PCMarkAndPushClosure(ParCompactionManager* cm) : _compaction_manager(cm) { }
+
+  template  void do_oop_nv(T* p)      { _compaction_manager->mark_and_push(p); }
+  virtual void do_oop(oop* p)                     { do_oop_nv(p); }
+  virtual void do_oop(narrowOop* p)               { do_oop_nv(p); }
+
+  // This closure provides its own oop verification code.
+  debug_only(virtual bool should_verify_oops()    { return false; })
+};
+
+class PCIterateMarkAndPushClosure: public MetadataVisitingOopIterateClosure {
+private:
+  ParCompactionManager* _compaction_manager;
+public:
+  PCIterateMarkAndPushClosure(ParCompactionManager* cm, ReferenceProcessor* rp) : MetadataVisitingOopIterateClosure(rp), _compaction_manager(cm) { }
+
+  template  void do_oop_nv(T* p)      { _compaction_manager->mark_and_push(p); }
+  virtual void do_oop(oop* p)                     { do_oop_nv(p); }
+  virtual void do_oop(narrowOop* p)               { do_oop_nv(p); }
+
+  void do_klass_nv(Klass* k)                      { _compaction_manager->follow_klass(k); }
+  void do_cld_nv(ClassLoaderData* cld)            { _compaction_manager->follow_class_loader(cld); }
+
+  // This closure provides its own oop verification code.
+  debug_only(virtual bool should_verify_oops()    { return false; })
+};
+
 inline bool ParCompactionManager::steal(int queue_num, oop& t) {
   return stack_array()->steal(queue_num, t);
 }
@@ -84,14 +116,6 @@ inline void ParCompactionManager::mark_and_push(T* p) {
   }
 }
 
-template 
-inline void ParCompactionManager::MarkAndPushClosure::do_oop_work(T* p) {
-  _compaction_manager->mark_and_push(p);
-}
-
-inline void ParCompactionManager::MarkAndPushClosure::do_oop(oop* p)       { do_oop_work(p); }
-inline void ParCompactionManager::MarkAndPushClosure::do_oop(narrowOop* p) { do_oop_work(p); }
-
 inline void ParCompactionManager::follow_klass(Klass* klass) {
   oop holder = klass->klass_holder();
   mark_and_push(&holder);
@@ -101,19 +125,8 @@ inline void ParCompactionManager::FollowStackClosure::do_void() {
   _compaction_manager->follow_marking_stacks();
 }
 
-inline void ParCompactionManager::follow_class_loader(ClassLoaderData* cld) {
-  MarkAndPushClosure mark_and_push_closure(this);
-
-  cld->oops_do(&mark_and_push_closure, true);
-}
-
-inline void ParCompactionManager::follow_contents(oop obj) {
-  assert(PSParallelCompact::mark_bitmap()->is_marked(obj), "should be marked");
-  obj->pc_follow_contents(this);
-}
-
-template 
-inline void oop_pc_follow_contents_specialized(objArrayOop obj, int index, ParCompactionManager* cm) {
+template 
+inline void follow_array_specialized(objArrayOop obj, int index, ParCompactionManager* cm) {
   const size_t len = size_t(obj->length());
   const size_t beg_index = size_t(index);
   assert(beg_index < len || len == 0, "index too large");
@@ -134,11 +147,11 @@ inline void oop_pc_follow_contents_specialized(objArrayOop obj, int index, ParCo
   }
 }
 
-inline void ParCompactionManager::follow_contents(objArrayOop obj, int index) {
+inline void ParCompactionManager::follow_array(objArrayOop obj, int index) {
   if (UseCompressedOops) {
-    oop_pc_follow_contents_specialized(obj, index, this);
+    follow_array_specialized(obj, index, this);
   } else {
-    oop_pc_follow_contents_specialized(obj, index, this);
+    follow_array_specialized(obj, index, this);
   }
 }
 
@@ -146,4 +159,19 @@ inline void ParCompactionManager::update_contents(oop obj) {
   obj->pc_update_contents(this);
 }
 
+inline void ParCompactionManager::follow_class_loader(ClassLoaderData* cld) {
+  PCMarkAndPushClosure mark_and_push_closure(this);
+  cld->oops_do(&mark_and_push_closure, true);
+}
+
+inline void ParCompactionManager::follow_contents(oop obj) {
+  assert(PSParallelCompact::mark_bitmap()->is_marked(obj), "should be marked");
+  if (obj->is_objArray()) {
+    follow_array(objArrayOop(obj), 0);
+  } else {
+    PCIterateMarkAndPushClosure cl(this, PSParallelCompact::ref_processor());
+    obj->oop_iterate(&cl);
+  }
+}
+
 #endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index c897eb0e2c3..a1ba62a9f51 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -846,18 +846,43 @@ PSParallelCompact::IsAliveClosure PSParallelCompact::_is_alive_closure;
 
 bool PSParallelCompact::IsAliveClosure::do_object_b(oop p) { return mark_bitmap()->is_marked(p); }
 
+class PCReferenceProcessor: public ReferenceProcessor {
+public:
+  PCReferenceProcessor(
+    BoolObjectClosure* is_subject_to_discovery,
+    BoolObjectClosure* is_alive_non_header) :
+      ReferenceProcessor(is_subject_to_discovery,
+      ParallelRefProcEnabled && (ParallelGCThreads > 1), // mt processing
+      ParallelGCThreads,   // mt processing degree
+      true,                // mt discovery
+      ParallelGCThreads,   // mt discovery degree
+      true,                // atomic_discovery
+      is_alive_non_header) {
+  }
+
+  template bool discover(oop obj, ReferenceType type) {
+    T* referent_addr = (T*) java_lang_ref_Reference::referent_addr_raw(obj);
+    T heap_oop = RawAccess<>::oop_load(referent_addr);
+    oop referent = CompressedOops::decode_not_null(heap_oop);
+    return PSParallelCompact::mark_bitmap()->is_unmarked(referent)
+        && ReferenceProcessor::discover_reference(obj, type);
+  }
+  virtual bool discover_reference(oop obj, ReferenceType type) {
+    if (UseCompressedOops) {
+      return discover(obj, type);
+    } else {
+      return discover(obj, type);
+    }
+  }
+};
+
 void PSParallelCompact::post_initialize() {
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
   _span_based_discoverer.set_span(heap->reserved_region());
   _ref_processor =
-    new ReferenceProcessor(&_span_based_discoverer,
-                           ParallelRefProcEnabled && (ParallelGCThreads > 1), // mt processing
-                           ParallelGCThreads,   // mt processing degree
-                           true,                // mt discovery
-                           ParallelGCThreads,   // mt discovery degree
-                           true,                // atomic_discovery
-                           &_is_alive_closure,  // non-header is alive closure
-                           false);              // disable adjusting number of processing threads
+    new PCReferenceProcessor(&_span_based_discoverer,
+                             &_is_alive_closure); // non-header is alive closure
+
   _counters = new CollectorCounters("PSParallelCompact", 1);
 
   // Initialize static fields in ParCompactionManager.
@@ -2077,7 +2102,7 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
   TaskQueueSetSuper* qset = ParCompactionManager::stack_array();
   ParallelTaskTerminator terminator(active_gc_threads, qset);
 
-  ParCompactionManager::MarkAndPushClosure mark_and_push_closure(cm);
+  PCMarkAndPushClosure mark_and_push_closure(cm);
   ParCompactionManager::FollowStackClosure follow_stack_closure(cm);
 
   // Need new claim bits before marking starts.
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index 365c36a0344..3f4ded2f6c6 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -52,7 +52,6 @@ public:
   //
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
 #endif
 
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index acc9a6b1e7f..efa4dce7372 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -1187,7 +1187,6 @@ public:
   //
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
 #endif
 
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index ccfb7f6dfac..e197b94b7e8 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -93,7 +93,6 @@ class InstanceMirrorKlass: public InstanceKlass {
   //
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
 #endif
 
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index 725d53c7e84..2966c04443f 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -62,7 +62,6 @@ class InstanceRefKlass: public InstanceKlass {
   //
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
 #endif
 
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 4838b5cb84a..fd753228cb0 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -677,7 +677,6 @@ protected:
   //
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  virtual void oop_pc_follow_contents(oop obj, ParCompactionManager* cm) = 0;
   virtual void oop_pc_update_pointers(oop obj, ParCompactionManager* cm) = 0;
 #endif
 
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index 25633341346..42958b39232 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -124,7 +124,6 @@ class ObjArrayKlass : public ArrayKlass {
   //
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
 #endif
 
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index ff1f0b09500..15efce0dbb7 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -289,7 +289,6 @@ class oopDesc {
 
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  inline void pc_follow_contents(ParCompactionManager* cm);
   inline void pc_update_contents(ParCompactionManager* cm);
 #endif
 
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index 6732f62ed1b..e95f60d8c3a 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -427,9 +427,6 @@ void oopDesc::incr_age() {
 }
 
 #if INCLUDE_PARALLELGC
-void oopDesc::pc_follow_contents(ParCompactionManager* cm) {
-  klass()->oop_pc_follow_contents(this, cm);
-}
 
 void oopDesc::pc_update_contents(ParCompactionManager* cm) {
   Klass* k = klass();
diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp
index c267855fca3..bc2da542a20 100644
--- a/src/hotspot/share/oops/typeArrayKlass.hpp
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp
@@ -79,7 +79,6 @@ class TypeArrayKlass : public ArrayKlass {
 
 #if INCLUDE_PARALLELGC
   // Parallel Compact
-  void oop_pc_follow_contents(oop obj, ParCompactionManager* cm);
   void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
 #endif
 

From e898052f3b63e9bc332566872ea53661084dfdfb Mon Sep 17 00:00:00 2001
From: Leo Korinth 
Date: Fri, 12 Oct 2018 12:14:01 +0200
Subject: [PATCH 111/124] 8211447: Replace oop_pc_update_pointers with
 oop_iterate and closure

Reviewed-by: sjohanss, tschatzl
---
 .../parallel/psCompactionManager.inline.hpp   |  5 +-
 .../share/gc/parallel/psParallelCompact.cpp   | 72 +------------------
 .../share/gc/parallel/psParallelCompact.hpp   | 17 -----
 .../gc/parallel/psParallelCompact.inline.hpp  | 21 ++++--
 .../share/oops/instanceClassLoaderKlass.hpp   | 10 +--
 src/hotspot/share/oops/instanceKlass.hpp      |  7 --
 .../share/oops/instanceMirrorKlass.hpp        |  7 --
 src/hotspot/share/oops/instanceRefKlass.hpp   |  7 --
 src/hotspot/share/oops/klass.hpp              |  7 --
 src/hotspot/share/oops/objArrayKlass.hpp      |  7 --
 src/hotspot/share/oops/oop.hpp                |  7 --
 src/hotspot/share/oops/oop.inline.hpp         | 12 ----
 src/hotspot/share/oops/typeArrayKlass.hpp     |  8 ---
 13 files changed, 21 insertions(+), 166 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
index e2ad1f460eb..8160b31be22 100644
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
@@ -156,7 +156,10 @@ inline void ParCompactionManager::follow_array(objArrayOop obj, int index) {
 }
 
 inline void ParCompactionManager::update_contents(oop obj) {
-  obj->pc_update_contents(this);
+  if (!obj->klass()->is_typeArray_klass()) {
+    PCAdjustPointerClosure apc(this);
+    obj->oop_iterate(&apc);
+  }
 }
 
 inline void ParCompactionManager::follow_class_loader(ClassLoaderData* cld) {
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index a1ba62a9f51..e98e572c4e3 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -2203,7 +2203,7 @@ void PSParallelCompact::adjust_roots(ParCompactionManager* cm) {
   // Need new claim bits when tracing through and adjusting pointers.
   ClassLoaderDataGraph::clear_claimed_marks();
 
-  PSParallelCompact::AdjustPointerClosure oop_closure(cm);
+  PCAdjustPointerClosure oop_closure(cm);
 
   // General strong roots.
   Universe::oops_do(&oop_closure);
@@ -3096,76 +3096,6 @@ void MoveAndUpdateClosure::copy_partial_obj()
   update_state(words);
 }
 
-void InstanceKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) {
-  PSParallelCompact::AdjustPointerClosure closure(cm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_oop_maps(obj, &closure);
-  } else {
-    oop_oop_iterate_oop_maps(obj, &closure);
-  }
-}
-
-void InstanceMirrorKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) {
-  InstanceKlass::oop_pc_update_pointers(obj, cm);
-
-  PSParallelCompact::AdjustPointerClosure closure(cm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_statics(obj, &closure);
-  } else {
-    oop_oop_iterate_statics(obj, &closure);
-  }
-}
-
-void InstanceClassLoaderKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) {
-  InstanceKlass::oop_pc_update_pointers(obj, cm);
-}
-
-#ifdef ASSERT
-template  static void trace_reference_gc(const char *s, oop obj,
-                                                  T* referent_addr,
-                                                  T* discovered_addr) {
-  log_develop_trace(gc, ref)("%s obj " PTR_FORMAT, s, p2i(obj));
-  log_develop_trace(gc, ref)("     referent_addr/* " PTR_FORMAT " / " PTR_FORMAT,
-                             p2i(referent_addr), referent_addr ? p2i((oop)RawAccess<>::oop_load(referent_addr)) : NULL);
-  log_develop_trace(gc, ref)("     discovered_addr/* " PTR_FORMAT " / " PTR_FORMAT,
-                             p2i(discovered_addr), discovered_addr ? p2i((oop)RawAccess<>::oop_load(discovered_addr)) : NULL);
-}
-#endif
-
-template 
-static void oop_pc_update_pointers_specialized(oop obj, ParCompactionManager* cm) {
-  T* referent_addr = (T*)java_lang_ref_Reference::referent_addr_raw(obj);
-  PSParallelCompact::adjust_pointer(referent_addr, cm);
-  T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr_raw(obj);
-  PSParallelCompact::adjust_pointer(discovered_addr, cm);
-  debug_only(trace_reference_gc("InstanceRefKlass::oop_update_ptrs", obj,
-                                referent_addr, discovered_addr);)
-}
-
-void InstanceRefKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) {
-  InstanceKlass::oop_pc_update_pointers(obj, cm);
-
-  if (UseCompressedOops) {
-    oop_pc_update_pointers_specialized(obj, cm);
-  } else {
-    oop_pc_update_pointers_specialized(obj, cm);
-  }
-}
-
-void ObjArrayKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) {
-  assert(obj->is_objArray(), "obj must be obj array");
-  PSParallelCompact::AdjustPointerClosure closure(cm);
-  if (UseCompressedOops) {
-    oop_oop_iterate_elements(objArrayOop(obj), &closure);
-  } else {
-    oop_oop_iterate_elements(objArrayOop(obj), &closure);
-  }
-}
-
-void TypeArrayKlass::oop_pc_update_pointers(oop obj, ParCompactionManager* cm) {
-  assert(obj->is_typeArray(),"must be a type array");
-}
-
 ParMarkBitMapClosure::IterationStatus
 MoveAndUpdateClosure::do_addr(HeapWord* addr, size_t words) {
   assert(destination() != NULL, "sanity");
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
index 9c752d12cca..6477c68983c 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp
@@ -934,23 +934,6 @@ class PSParallelCompact : AllStatic {
     virtual bool do_object_b(oop p);
   };
 
-  class AdjustPointerClosure: public BasicOopIterateClosure {
-   public:
-    AdjustPointerClosure(ParCompactionManager* cm) {
-      assert(cm != NULL, "associate ParCompactionManage should not be NULL");
-      _cm = cm;
-    }
-    template  void do_oop_work(T* p);
-    virtual void do_oop(oop* p);
-    virtual void do_oop(narrowOop* p);
-
-    // This closure provides its own oop verification code.
-    debug_only(virtual bool should_verify_oops() { return false; })
-   private:
-    ParCompactionManager* _cm;
-  };
-
-  friend class AdjustPointerClosure;
   friend class RefProcTaskProxy;
   friend class PSParallelCompactTest;
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
index 0633d5e5368..c1949e2de0d 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
@@ -124,12 +124,21 @@ inline void PSParallelCompact::adjust_pointer(T* p, ParCompactionManager* cm) {
   }
 }
 
-template 
-void PSParallelCompact::AdjustPointerClosure::do_oop_work(T* p) {
-  adjust_pointer(p, _cm);
-}
+class PCAdjustPointerClosure: public BasicOopIterateClosure {
+public:
+  PCAdjustPointerClosure(ParCompactionManager* cm) {
+    assert(cm != NULL, "associate ParCompactionManage should not be NULL");
+    _cm = cm;
+  }
+  template  void do_oop_nv(T* p) { PSParallelCompact::adjust_pointer(p, _cm); }
+  virtual void do_oop(oop* p)                { do_oop_nv(p); }
+  virtual void do_oop(narrowOop* p)          { do_oop_nv(p); }
 
-inline void PSParallelCompact::AdjustPointerClosure::do_oop(oop* p)       { do_oop_work(p); }
-inline void PSParallelCompact::AdjustPointerClosure::do_oop(narrowOop* p) { do_oop_work(p); }
+  // This closure provides its own oop verification code.
+  debug_only(virtual bool should_verify_oops() { return false; })
+  virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
+private:
+  ParCompactionManager* _cm;
+};
 
 #endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
index 3f4ded2f6c6..c8dac589d2d 100644
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp
@@ -33,7 +33,7 @@ class ClassFileParser;
 // An InstanceClassLoaderKlass is a specialization of the InstanceKlass. It does
 // not add any field.  It is added to walk the dependencies for the class loader
 // key that this class loader points to.  This is how the loader_data graph is
-// walked and dependant class loaders are kept alive.  I thought we walked
+// walked and dependent class loaders are kept alive.  I thought we walked
 // the list later?
 
 class InstanceClassLoaderKlass: public InstanceKlass {
@@ -48,18 +48,10 @@ private:
 public:
   InstanceClassLoaderKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
 
-  // GC specific object visitors
-  //
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
-#endif
-
   // Oop fields (and metadata) iterators
   //
   // The InstanceClassLoaderKlass iterators also visit the CLD pointer (or mirror of anonymous klasses.)
 
- public:
   // Forward iteration
   // Iterate over the oop fields and metadata.
   template 
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index efa4dce7372..f207d4b7728 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -1183,13 +1183,6 @@ public:
   const char* signature_name() const;
   static Symbol* package_from_name(const Symbol* name, TRAPS);
 
-  // GC specific object visitors
-  //
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
-#endif
-
   // Oop fields (and metadata) iterators
   //
   // The InstanceKlass iterators also visits the Object's klass.
diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp
index e197b94b7e8..c2e905d6770 100644
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp
@@ -89,13 +89,6 @@ class InstanceMirrorKlass: public InstanceKlass {
   // allocation
   instanceOop allocate_instance(Klass* k, TRAPS);
 
-  // GC specific object visitors
-  //
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
-#endif
-
   static void serialize_offsets(class SerializeClosure* f) NOT_CDS_RETURN;
 
   // Oop fields (and metadata) iterators
diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp
index 2966c04443f..66086bc1248 100644
--- a/src/hotspot/share/oops/instanceRefKlass.hpp
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp
@@ -58,13 +58,6 @@ class InstanceRefKlass: public InstanceKlass {
  public:
   InstanceRefKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
 
-  // GC specific object visitors
-  //
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
-#endif
-
   // Oop fields (and metadata) iterators
   //
   // The InstanceRefKlass iterators also support reference processing.
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index fd753228cb0..35ea1367832 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -673,13 +673,6 @@ protected:
     clean_weak_klass_links(/*unloading_occurred*/ true , /* clean_alive_klasses */ false);
   }
 
-  // GC specific object visitors
-  //
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  virtual void oop_pc_update_pointers(oop obj, ParCompactionManager* cm) = 0;
-#endif
-
   virtual void array_klasses_do(void f(Klass* k)) {}
 
   // Return self, except for abstract classes with exactly 1
diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp
index 42958b39232..10ae0cf95c9 100644
--- a/src/hotspot/share/oops/objArrayKlass.hpp
+++ b/src/hotspot/share/oops/objArrayKlass.hpp
@@ -120,13 +120,6 @@ class ObjArrayKlass : public ArrayKlass {
   // Initialization (virtual from Klass)
   void initialize(TRAPS);
 
-  // GC specific object visitors
-  //
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
-#endif
-
   // Oop fields (and metadata) iterators
   //
   // The ObjArrayKlass iterators also visits the Object's klass.
diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp
index 15efce0dbb7..9002037aa84 100644
--- a/src/hotspot/share/oops/oop.hpp
+++ b/src/hotspot/share/oops/oop.hpp
@@ -285,13 +285,6 @@ class oopDesc {
   // mark-sweep support
   void follow_body(int begin, int end);
 
-  // Garbage Collection support
-
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  inline void pc_update_contents(ParCompactionManager* cm);
-#endif
-
   template 
   inline void oop_iterate(OopClosureType* cl);
 
diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp
index e95f60d8c3a..93dbe9e9b2a 100644
--- a/src/hotspot/share/oops/oop.inline.hpp
+++ b/src/hotspot/share/oops/oop.inline.hpp
@@ -426,18 +426,6 @@ void oopDesc::incr_age() {
   }
 }
 
-#if INCLUDE_PARALLELGC
-
-void oopDesc::pc_update_contents(ParCompactionManager* cm) {
-  Klass* k = klass();
-  if (!k->is_typeArray_klass()) {
-    // It might contain oops beyond the header, so take the virtual call.
-    k->oop_pc_update_pointers(this, cm);
-  }
-  // Else skip it.  The TypeArrayKlass in the header never needs scavenging.
-}
-#endif // INCLUDE_PARALLELGC
-
 template 
 void oopDesc::oop_iterate(OopClosureType* cl) {
   OopIteratorClosureDispatch::oop_oop_iterate(cl, this, klass());
diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp
index bc2da542a20..a237be1cca3 100644
--- a/src/hotspot/share/oops/typeArrayKlass.hpp
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp
@@ -74,14 +74,6 @@ class TypeArrayKlass : public ArrayKlass {
   // Copying
   void  copy_array(arrayOop s, int src_pos, arrayOop d, int dst_pos, int length, TRAPS);
 
-  // GC specific object visitors
-  //
-
-#if INCLUDE_PARALLELGC
-  // Parallel Compact
-  void oop_pc_update_pointers(oop obj, ParCompactionManager* cm);
-#endif
-
   // Oop iterators. Since there are no oops in TypeArrayKlasses,
   // these functions only return the size of the object.
 

From 497de20391725e39f71b1d47feb34059cf45677b Mon Sep 17 00:00:00 2001
From: Sean Coffey 
Date: Mon, 15 Oct 2018 14:42:31 +0100
Subject: [PATCH 112/124] 8209862: CipherCore performance improvement

Co-authored-by: Sergey Kuksenko 
Reviewed-by: apetcher, ascarpino
---
 .../com/sun/crypto/provider/CipherCore.java   | 212 +++++++++++-------
 1 file changed, 126 insertions(+), 86 deletions(-)

diff --git a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
index 81027aab8dc..f641eaa320f 100644
--- a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
+++ b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java
@@ -253,11 +253,10 @@ final class CipherCore {
         return result;
     }
 
-
     /**
      * Sets the padding mechanism of this cipher.
      *
-     * @param padding the padding mechanism
+     * @param paddingScheme the padding mechanism
      *
      * @exception NoSuchPaddingException if the requested padding mechanism
      * does not exist
@@ -660,10 +659,7 @@ final class CipherCore {
      * (e.g., has not been initialized)
      */
     byte[] update(byte[] input, int inputOffset, int inputLen) {
-        if (requireReinit) {
-            throw new IllegalStateException
-                ("Must use either different key or iv for GCM encryption");
-        }
+        checkReinit();
 
         byte[] output = null;
         try {
@@ -711,10 +707,7 @@ final class CipherCore {
      */
     int update(byte[] input, int inputOffset, int inputLen, byte[] output,
                int outputOffset) throws ShortBufferException {
-        if (requireReinit) {
-            throw new IllegalStateException
-                ("Must use either different key or iv for GCM encryption");
-        }
+        checkReinit();
 
         // figure out how much can be sent to crypto function
         int len = Math.addExact(buffered, inputLen);
@@ -849,12 +842,20 @@ final class CipherCore {
      */
     byte[] doFinal(byte[] input, int inputOffset, int inputLen)
         throws IllegalBlockSizeException, BadPaddingException {
-        byte[] output = null;
         try {
-            output = new byte[getOutputSizeByOperation(inputLen, true)];
-            int len = doFinal(input, inputOffset, inputLen, output, 0);
-            if (len < output.length) {
-                byte[] copy = Arrays.copyOf(output, len);
+            checkReinit();
+            byte[] output = new byte[getOutputSizeByOperation(inputLen, true)];
+            byte[] finalBuf = prepareInputBuffer(input, inputOffset,
+                    inputLen, output, 0);
+            int finalOffset = (finalBuf == input) ? inputOffset : 0;
+            int finalBufLen = (finalBuf == input) ? inputLen : finalBuf.length;
+
+            int outLen = fillOutputBuffer(finalBuf, finalOffset, output, 0,
+                    finalBufLen, input);
+
+            endDoFinal();
+            if (outLen < output.length) {
+                byte[] copy = Arrays.copyOf(output, outLen);
                 if (decrypting) {
                     // Zero out internal (ouput) array
                     Arrays.fill(output, (byte) 0x00);
@@ -909,26 +910,81 @@ final class CipherCore {
                 int outputOffset)
         throws IllegalBlockSizeException, ShortBufferException,
                BadPaddingException {
-        if (requireReinit) {
-            throw new IllegalStateException
-                ("Must use either different key or iv for GCM encryption");
-        }
+        checkReinit();
 
         int estOutSize = getOutputSizeByOperation(inputLen, true);
-        // check output buffer capacity.
-        // if we are decrypting with padding applied, we can perform this
-        // check only after we have determined how many padding bytes there
-        // are.
-        int outputCapacity = output.length - outputOffset;
-        int minOutSize = (decrypting? (estOutSize - blockSize):estOutSize);
-        if ((output == null) || (outputCapacity < minOutSize)) {
-            throw new ShortBufferException("Output buffer must be "
-                + "(at least) " + minOutSize + " bytes long");
-        }
+        int outputCapacity = checkOutputCapacity(output, outputOffset,
+                estOutSize);
+        int offset = decrypting ? 0 : outputOffset; // 0 for decrypting
+        byte[] finalBuf = prepareInputBuffer(input, inputOffset,
+                inputLen, output, outputOffset);
+        byte[] outWithPadding = null; // for decrypting only
 
+        int finalOffset = (finalBuf == input) ? inputOffset : 0;
+        int finalBufLen = (finalBuf == input) ? inputLen : finalBuf.length;
+
+        if (decrypting) {
+            // if the size of specified output buffer is less than
+            // the length of the cipher text, then the current
+            // content of cipher has to be preserved in order for
+            // users to retry the call with a larger buffer in the
+            // case of ShortBufferException.
+            if (outputCapacity < estOutSize) {
+                cipher.save();
+            }
+            // create temporary output buffer so that only "real"
+            // data bytes are passed to user's output buffer.
+            outWithPadding = new byte[estOutSize];
+        }
+        byte[] outBuffer = decrypting ? outWithPadding : output;
+
+        int outLen = fillOutputBuffer(finalBuf, finalOffset, outBuffer,
+                offset, finalBufLen, input);
+
+        if (decrypting) {
+
+            if (outputCapacity < outLen) {
+                // restore so users can retry with a larger buffer
+                cipher.restore();
+                throw new ShortBufferException("Output buffer too short: "
+                                               + (outputCapacity)
+                                               + " bytes given, " + outLen
+                                               + " bytes needed");
+            }
+            // copy the result into user-supplied output buffer
+            System.arraycopy(outWithPadding, 0, output, outputOffset, outLen);
+            // decrypt mode. Zero out output data that's not required
+            Arrays.fill(outWithPadding, (byte) 0x00);
+        }
+        endDoFinal();
+        return outLen;
+    }
+
+    private void endDoFinal() {
+        buffered = 0;
+        diffBlocksize = blockSize;
+        if (cipherMode != ECB_MODE) {
+            cipher.reset();
+        }
+    }
+
+    private int unpad(int outLen, byte[] outWithPadding)
+            throws BadPaddingException {
+        int padStart = padding.unpad(outWithPadding, 0, outLen);
+        if (padStart < 0) {
+            throw new BadPaddingException("Given final block not " +
+            "properly padded. Such issues can arise if a bad key " +
+            "is used during decryption.");
+        }
+        outLen = padStart;
+        return outLen;
+    }
+
+    private byte[] prepareInputBuffer(byte[] input, int inputOffset,
+                      int inputLen, byte[] output, int outputOffset)
+                      throws IllegalBlockSizeException, ShortBufferException {
         // calculate total input length
         int len = Math.addExact(buffered, inputLen);
-
         // calculate padding length
         int totalLen = Math.addExact(len, cipher.getBufferedLength());
         int paddingLen = 0;
@@ -958,18 +1014,15 @@ final class CipherCore {
          *  - there are internally buffered bytes
          *  - doing encryption and padding is needed
          */
-        byte[] finalBuf = input;
-        int finalOffset = inputOffset;
-        int finalBufLen = inputLen;
         if ((buffered != 0) || (!decrypting && padding != null) ||
             ((input == output)
               && (outputOffset - inputOffset < inputLen)
               && (inputOffset - outputOffset < buffer.length))) {
+            byte[] finalBuf;
             if (decrypting || padding == null) {
                 paddingLen = 0;
             }
             finalBuf = new byte[Math.addExact(len, paddingLen)];
-            finalOffset = 0;
             if (buffered != 0) {
                 System.arraycopy(buffer, 0, finalBuf, 0, buffered);
                 if (!decrypting) {
@@ -980,56 +1033,31 @@ final class CipherCore {
             }
             if (inputLen != 0) {
                 System.arraycopy(input, inputOffset, finalBuf,
-                                 buffered, inputLen);
+                        buffered, inputLen);
             }
             if (paddingLen != 0) {
                 padding.padWithLen(finalBuf, Math.addExact(buffered, inputLen), paddingLen);
             }
-            finalBufLen = finalBuf.length;
+            return finalBuf;
         }
-        int outLen = 0;
-        if (decrypting) {
-            // if the size of specified output buffer is less than
-            // the length of the cipher text, then the current
-            // content of cipher has to be preserved in order for
-            // users to retry the call with a larger buffer in the
-            // case of ShortBufferException.
-            if (outputCapacity < estOutSize) {
-                cipher.save();
-            }
-            // create temporary output buffer so that only "real"
-            // data bytes are passed to user's output buffer.
-            byte[] outWithPadding = new byte[estOutSize];
-            outLen = finalNoPadding(finalBuf, finalOffset, outWithPadding,
-                                    0, finalBufLen);
+        return input;
+    }
 
-            if (padding != null) {
-                int padStart = padding.unpad(outWithPadding, 0, outLen);
-                if (padStart < 0) {
-                    throw new BadPaddingException("Given final block not " +
-                    "properly padded. Such issues can arise if a bad key " +
-                    "is used during decryption.");
-                }
-                outLen = padStart;
+    private int fillOutputBuffer(byte[] finalBuf, int finalOffset,
+                                 byte[] output, int outOfs, int finalBufLen,
+                                 byte[] input)
+            throws ShortBufferException, BadPaddingException,
+            IllegalBlockSizeException {
+        int len;
+        try {
+            len = finalNoPadding(finalBuf, finalOffset, output,
+                    outOfs, finalBufLen);
+            if (decrypting && padding != null) {
+                len = unpad(len, output);
             }
-
-            if (outputCapacity < outLen) {
-                // restore so users can retry with a larger buffer
-                cipher.restore();
-                throw new ShortBufferException("Output buffer too short: "
-                                               + (outputCapacity)
-                                               + " bytes given, " + outLen
-                                               + " bytes needed");
-            }
-            // copy the result into user-supplied output buffer
-            System.arraycopy(outWithPadding, 0, output, outputOffset, outLen);
-            // decrypt mode. Zero out output data that's not required
-            Arrays.fill(outWithPadding, (byte) 0x00);
-        } else { // encrypting
-            try {
-                outLen = finalNoPadding(finalBuf, finalOffset, output,
-                                        outputOffset, finalBufLen);
-            } finally {
+            return len;
+        } finally {
+            if (!decrypting) {
                 // reset after doFinal() for GCM encryption
                 requireReinit = (cipherMode == GCM_MODE);
                 if (finalBuf != input) {
@@ -1038,13 +1066,28 @@ final class CipherCore {
                 }
             }
         }
+    }
 
-        buffered = 0;
-        diffBlocksize = blockSize;
-        if (cipherMode != ECB_MODE) {
-            cipher.reset();
+    private int checkOutputCapacity(byte[] output, int outputOffset,
+                            int estOutSize) throws ShortBufferException {
+        // check output buffer capacity.
+        // if we are decrypting with padding applied, we can perform this
+        // check only after we have determined how many padding bytes there
+        // are.
+        int outputCapacity = output.length - outputOffset;
+        int minOutSize = decrypting ? (estOutSize - blockSize) : estOutSize;
+        if ((output == null) || (outputCapacity < minOutSize)) {
+            throw new ShortBufferException("Output buffer must be "
+                + "(at least) " + minOutSize + " bytes long");
+        }
+        return outputCapacity;
+    }
+
+    private void checkReinit() {
+        if (requireReinit) {
+            throw new IllegalStateException
+                ("Must use either different key or iv for GCM encryption");
         }
-        return outLen;
     }
 
     private int finalNoPadding(byte[] in, int inOfs, byte[] out, int outOfs,
@@ -1177,10 +1220,7 @@ final class CipherCore {
      * @since 1.8
      */
     void updateAAD(byte[] src, int offset, int len) {
-        if (requireReinit) {
-            throw new IllegalStateException
-                ("Must use either different key or iv for GCM encryption");
-        }
+        checkReinit();
         cipher.updateAAD(src, offset, len);
     }
 }

From 4fe2edae5948e95f1940a64a3e9d4379e8362d8c Mon Sep 17 00:00:00 2001
From: John Jiang 
Date: Mon, 15 Oct 2018 22:47:03 +0800
Subject: [PATCH 113/124] 8211978: Move
 testlibrary/jdk/testlibrary/SimpleSSLContext.java and testkeys to network
 testlibrary

Move SimpleSSLContext.java and testkeys to test/lib/jdk/test/lib/net

Reviewed-by: chegar
---
 .../com/sun/net/httpserver/SelCacheTest.java  |   8 +-
 test/jdk/com/sun/net/httpserver/Test1.java    |   8 +-
 test/jdk/com/sun/net/httpserver/Test12.java   |  10 +-
 test/jdk/com/sun/net/httpserver/Test13.java   |  10 +-
 test/jdk/com/sun/net/httpserver/Test6a.java   |  10 +-
 test/jdk/com/sun/net/httpserver/Test7a.java   |  10 +-
 test/jdk/com/sun/net/httpserver/Test8a.java   |  10 +-
 test/jdk/com/sun/net/httpserver/Test9.java    |  10 +-
 test/jdk/com/sun/net/httpserver/Test9a.java   |  10 +-
 .../HTTPSetAuthenticatorTest.java             |   6 +-
 .../SetAuthenticator/HTTPTest.java            |   8 +-
 test/jdk/java/net/URLPermission/URLTest.java  |   8 +-
 .../java/net/httpclient/AbstractNoBody.java   |   2 +-
 .../AbstractThrowingPublishers.java           |   2 +-
 .../AbstractThrowingPushPromises.java         |   6 +-
 .../AbstractThrowingSubscribers.java          |   2 +-
 .../net/httpclient/AsFileDownloadTest.java    |   6 +-
 .../net/httpclient/AsFileDownloadTest.policy  |   6 +-
 .../net/httpclient/BasicRedirectTest.java     |   6 +-
 .../net/httpclient/CancelledResponse.java     |   6 +-
 .../net/httpclient/ConcurrentResponses.java   |   6 +-
 .../java/net/httpclient/CookieHeaderTest.java |   6 +-
 .../httpclient/CustomRequestPublisher.java    |   6 +-
 .../httpclient/CustomResponseSubscriber.java  |   6 +-
 .../net/httpclient/DependentActionsTest.java  |   6 +-
 .../DependentPromiseActionsTest.java          |   6 +-
 .../java/net/httpclient/DigestEchoClient.java |   6 +-
 .../net/httpclient/DigestEchoClientSSL.java   |   4 +-
 test/jdk/java/net/httpclient/EchoHandler.java |   2 +-
 .../net/httpclient/EncodedCharsInURI.java     |   6 +-
 .../net/httpclient/EscapedOctetsInURI.java    |   6 +-
 .../java/net/httpclient/ExpectContinue.java   |   6 +-
 .../httpclient/FlowAdapterPublisherTest.java  |   6 +-
 .../httpclient/FlowAdapterSubscriberTest.java |   8 +-
 test/jdk/java/net/httpclient/HeadTest.java    |   6 +-
 .../net/httpclient/HttpClientBuilderTest.java |   6 +-
 .../java/net/httpclient/HttpEchoHandler.java  |   2 +-
 .../java/net/httpclient/HttpsTunnelTest.java  |   6 +-
 .../net/httpclient/ImmutableFlowItems.java    |   6 +-
 ...InvalidInputStreamSubscriptionRequest.java |   6 +-
 .../net/httpclient/InvalidSSLContextTest.java |   6 +-
 .../InvalidSubscriptionRequest.java           |   6 +-
 .../net/httpclient/LightWeightHttpServer.java |   6 +-
 .../net/httpclient/LineBodyHandlerTest.java   |   6 +-
 .../jdk/java/net/httpclient/ManyRequests.java |   6 +-
 .../java/net/httpclient/ManyRequests2.java    |  13 +-
 .../net/httpclient/ManyRequestsLegacy.java    |  13 +-
 .../httpclient/MappingResponseSubscriber.java |   6 +-
 test/jdk/java/net/httpclient/MaxStreams.java  |   6 +-
 .../java/net/httpclient/NoBodyPartOne.java    |   4 +-
 .../java/net/httpclient/NoBodyPartTwo.java    |   4 +-
 .../net/httpclient/NonAsciiCharsInURI.java    |   6 +-
 .../httpclient/ProxyAuthDisabledSchemes.java  |   4 +-
 .../ProxyAuthDisabledSchemesSSL.java          |   4 +-
 test/jdk/java/net/httpclient/ProxyTest.java   |   8 +-
 .../net/httpclient/RedirectMethodChange.java  |   6 +-
 .../net/httpclient/RedirectWithCookie.java    |   6 +-
 .../java/net/httpclient/RequestBodyTest.java  |   4 +-
 .../net/httpclient/RequestBodyTest.policy     |   6 +-
 .../httpclient/ResponseBodyBeforeError.java   |   6 +-
 .../net/httpclient/ResponsePublisher.java     |   6 +-
 .../java/net/httpclient/RetryWithCookie.java  |   6 +-
 .../java/net/httpclient/ServerCloseTest.java  |   6 +-
 .../net/httpclient/ShortResponseBody.java     |   6 +-
 .../ShortResponseBodyWithRetry.java           |   4 +-
 test/jdk/java/net/httpclient/SmokeTest.java   |   6 +-
 .../net/httpclient/SpecialHeadersTest.java    |   6 +-
 .../java/net/httpclient/SplitResponse.java    |   6 +-
 .../net/httpclient/SplitResponseAsync.java    |   6 +-
 .../httpclient/SplitResponseKeepAlive.java    |   6 +-
 .../SplitResponseKeepAliveAsync.java          |   6 +-
 .../java/net/httpclient/SplitResponseSSL.java |   6 +-
 .../net/httpclient/SplitResponseSSLAsync.java |   6 +-
 .../httpclient/SplitResponseSSLKeepAlive.java |   6 +-
 .../SplitResponseSSLKeepAliveAsync.java       |   6 +-
 .../java/net/httpclient/StreamingBody.java    |   6 +-
 .../ThrowingPublishersCustomAfterCancel.java  |   4 +-
 .../ThrowingPublishersCustomBeforeCancel.java |   4 +-
 .../ThrowingPublishersIOAfterCancel.java      |   4 +-
 .../ThrowingPublishersIOBeforeCancel.java     |   4 +-
 .../ThrowingPublishersInNextRequest.java      |   4 +-
 .../ThrowingPublishersInRequest.java          |   4 +-
 .../ThrowingPublishersInSubscribe.java        |   4 +-
 .../httpclient/ThrowingPublishersSanity.java  |   4 +-
 ...rowingPushPromisesAsInputStreamCustom.java |   4 +-
 .../ThrowingPushPromisesAsInputStreamIO.java  |   4 +-
 .../ThrowingPushPromisesAsLinesCustom.java    |   4 +-
 .../ThrowingPushPromisesAsLinesIO.java        |   4 +-
 .../ThrowingPushPromisesAsStringCustom.java   |   4 +-
 .../ThrowingPushPromisesAsStringIO.java       |   4 +-
 .../ThrowingPushPromisesSanity.java           |   4 +-
 .../ThrowingSubscribersAsInputStream.java     |   4 +-
 ...ThrowingSubscribersAsInputStreamAsync.java |   4 +-
 .../ThrowingSubscribersAsLines.java           |   4 +-
 .../ThrowingSubscribersAsLinesAsync.java      |   4 +-
 .../ThrowingSubscribersAsString.java          |   4 +-
 .../ThrowingSubscribersAsStringAsync.java     |   4 +-
 .../httpclient/ThrowingSubscribersSanity.java |   4 +-
 .../jdk/java/net/httpclient/TimeoutBasic.java |   6 +-
 .../java/net/httpclient/UnauthorizedTest.java |   6 +-
 .../net/httpclient/UnknownBodyLengthTest.java |   6 +-
 test/jdk/java/net/httpclient/dependent.policy |   6 +-
 .../net/httpclient/http2/BadHeadersTest.java  |   6 +-
 .../java/net/httpclient/http2/BasicTest.java  |   6 +-
 .../http2/ContinuationFrameTest.java          |   6 +-
 .../java/net/httpclient/http2/ErrorTest.java  |   6 +-
 .../httpclient/http2/FixedThreadPoolTest.java |   6 +-
 .../httpclient/http2/ImplicitPushCancel.java  |   4 +-
 .../java/net/httpclient/http2/ProxyTest2.java |   8 +-
 .../net/httpclient/http2/RedirectTest.java    |   4 +-
 .../java/net/httpclient/http2/ServerPush.java |   4 +-
 .../http2/ServerPushWithDiffTypes.java        |   4 +-
 .../java/net/httpclient/security/Driver.java  |   3 +-
 .../net/httpclient/security/Security.java     |   4 +-
 .../websocket/WSHandshakeExceptionTest.java   |   6 +-
 .../net/http/AbstractSSLTubeTest.java         |  83 +------------
 .../jdk/internal/net/http/FlowTest.java       |  86 +-------------
 .../internal/net/http/SimpleSSLContext.java   | 112 ++++++++++++++++++
 .../net/ssl/HttpsURLConnection/Equals.java    |   8 +-
 .../net/www/protocol/http/RedirectOnPost.java |   8 +-
 .../jdk/test/lib/net}/SimpleSSLContext.java   |  31 ++---
 .../jdk/test/lib/net}/testkeys                | Bin
 122 files changed, 463 insertions(+), 520 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
 rename test/{jdk/lib/testlibrary/jdk/testlibrary => lib/jdk/test/lib/net}/SimpleSSLContext.java (82%)
 rename test/{jdk/lib/testlibrary/jdk/testlibrary => lib/jdk/test/lib/net}/testkeys (100%)

diff --git a/test/jdk/com/sun/net/httpserver/SelCacheTest.java b/test/jdk/com/sun/net/httpserver/SelCacheTest.java
index 8c644bccfa5..9100401af27 100644
--- a/test/jdk/com/sun/net/httpserver/SelCacheTest.java
+++ b/test/jdk/com/sun/net/httpserver/SelCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,14 +24,14 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm -Dsun.net.httpserver.selCacheTimeout=2 SelCacheTest
  * @summary  Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 import java.util.*;
 import java.util.concurrent.*;
diff --git a/test/jdk/com/sun/net/httpserver/Test1.java b/test/jdk/com/sun/net/httpserver/Test1.java
index 55d278fe1ae..f79b204f995 100644
--- a/test/jdk/com/sun/net/httpserver/Test1.java
+++ b/test/jdk/com/sun/net/httpserver/Test1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test1
  * @run main/othervm -Dsun.net.httpserver.maxReqTime=10 Test1
  * @run main/othervm -Dsun.net.httpserver.nodelay=true Test1
@@ -38,7 +38,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /* basic http/s connectivity test
  * Tests:
diff --git a/test/jdk/com/sun/net/httpserver/Test12.java b/test/jdk/com/sun/net/httpserver/Test12.java
index 910ec385a9c..dd724c267ce 100644
--- a/test/jdk/com/sun/net/httpserver/Test12.java
+++ b/test/jdk/com/sun/net/httpserver/Test12.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test12
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /* basic http/s connectivity test
  * Tests:
diff --git a/test/jdk/com/sun/net/httpserver/Test13.java b/test/jdk/com/sun/net/httpserver/Test13.java
index 0436f8b0643..6061cc0776c 100644
--- a/test/jdk/com/sun/net/httpserver/Test13.java
+++ b/test/jdk/com/sun/net/httpserver/Test13.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test13
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -37,7 +37,7 @@ import java.util.logging.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /* basic http/s connectivity test
  * Tests:
diff --git a/test/jdk/com/sun/net/httpserver/Test6a.java b/test/jdk/com/sun/net/httpserver/Test6a.java
index fd5a48ee730..18b5dfe3953 100644
--- a/test/jdk/com/sun/net/httpserver/Test6a.java
+++ b/test/jdk/com/sun/net/httpserver/Test6a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test6a
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /**
  * Test https POST large file via chunked encoding (unusually small chunks)
diff --git a/test/jdk/com/sun/net/httpserver/Test7a.java b/test/jdk/com/sun/net/httpserver/Test7a.java
index 3599edf2030..b170cded2aa 100644
--- a/test/jdk/com/sun/net/httpserver/Test7a.java
+++ b/test/jdk/com/sun/net/httpserver/Test7a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test7a
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /**
  * Test POST large file via chunked encoding (large chunks)
diff --git a/test/jdk/com/sun/net/httpserver/Test8a.java b/test/jdk/com/sun/net/httpserver/Test8a.java
index ac11931cacd..daf65e21fa7 100644
--- a/test/jdk/com/sun/net/httpserver/Test8a.java
+++ b/test/jdk/com/sun/net/httpserver/Test8a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test8a
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /**
  * Test POST large file via fixed len encoding
diff --git a/test/jdk/com/sun/net/httpserver/Test9.java b/test/jdk/com/sun/net/httpserver/Test9.java
index 581b9e54c9f..fa0588a91fc 100644
--- a/test/jdk/com/sun/net/httpserver/Test9.java
+++ b/test/jdk/com/sun/net/httpserver/Test9.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test9
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /* Same as Test1 but requests run in parallel.
  */
diff --git a/test/jdk/com/sun/net/httpserver/Test9a.java b/test/jdk/com/sun/net/httpserver/Test9a.java
index 6fd3f16562a..ff5be52be0b 100644
--- a/test/jdk/com/sun/net/httpserver/Test9a.java
+++ b/test/jdk/com/sun/net/httpserver/Test9a.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,10 +24,10 @@
 /**
  * @test
  * @bug 6270015
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm Test9a
- * @summary  Light weight HTTP server
+ * @summary Light weight HTTP server
  */
 
 import com.sun.net.httpserver.*;
@@ -36,7 +36,7 @@ import java.util.concurrent.*;
 import java.io.*;
 import java.net.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /* Same as Test1 but requests run in parallel.
  */
diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java
index 144236e1f64..c916b13db43 100644
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPSetAuthenticatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,12 +35,12 @@ import java.util.stream.Stream;
 /*
  * @test
  * @bug 8169415
- * @library /lib/testlibrary/
+ * @library /test/lib
  * @modules java.logging
  *          java.base/sun.net.www
  *          java.base/sun.net.www.protocol.http
  *          jdk.httpserver/sun.net.httpserver
- * @build jdk.testlibrary.SimpleSSLContext HTTPTest HTTPTestServer HTTPTestClient HTTPSetAuthenticatorTest
+ * @build jdk.test.lib.net.SimpleSSLContext HTTPTest HTTPTestServer HTTPTestClient HTTPSetAuthenticatorTest
  * @summary A simple HTTP test that starts an echo server supporting the given
  *          authentication scheme, then starts a regular HTTP client to invoke it.
  *          The client first does a GET request on "/", then follows on
diff --git a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java
index ba7d729dc27..9a6cd93dd00 100644
--- a/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java
+++ b/test/jdk/java/net/HttpURLConnection/SetAuthenticator/HTTPTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,16 +41,16 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /*
  * @test
  * @bug 8169415
- * @library /lib/testlibrary/
+ * @library /test/lib
  * @modules java.logging
  *          java.base/sun.net.www
  *          jdk.httpserver/sun.net.httpserver
- * @build jdk.testlibrary.SimpleSSLContext HTTPTest HTTPTestServer HTTPTestClient
+ * @build jdk.test.lib.net.SimpleSSLContext HTTPTest HTTPTestServer HTTPTestClient
  * @summary A simple HTTP test that starts an echo server supporting Digest
  *          authentication, then starts a regular HTTP client to invoke it.
  *          The client first does a GET request on "/", then follows on
diff --git a/test/jdk/java/net/URLPermission/URLTest.java b/test/jdk/java/net/URLPermission/URLTest.java
index 1923eb681f4..763738db46c 100644
--- a/test/jdk/java/net/URLPermission/URLTest.java
+++ b/test/jdk/java/net/URLPermission/URLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.net.URLPermission;
  * @test
  * @bug 8010464
  * @modules jdk.httpserver
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm URLTest
  * @summary check URLPermission with Http(s)URLConnection
  */
@@ -38,7 +38,7 @@ import java.security.*;
 import java.util.concurrent.*;
 import com.sun.net.httpserver.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 public class URLTest {
 
diff --git a/test/jdk/java/net/httpclient/AbstractNoBody.java b/test/jdk/java/net/httpclient/AbstractNoBody.java
index afe4865d060..38ae9b758f6 100644
--- a/test/jdk/java/net/httpclient/AbstractNoBody.java
+++ b/test/jdk/java/net/httpclient/AbstractNoBody.java
@@ -35,7 +35,7 @@ import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
 import java.net.http.HttpClient;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java b/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
index 35d1a68f02f..38c5208cf55 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingPublishers.java
@@ -24,7 +24,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java b/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
index e829a617f60..ed324a6e5a9 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingPushPromises.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
@@ -35,7 +35,7 @@
  * @run testng/othervm -Djdk.internal.httpclient.debug=true AbstractThrowingPushPromises
  */
 
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java b/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
index 6e9759086dc..72ec7bb05c5 100644
--- a/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
+++ b/test/jdk/java/net/httpclient/AbstractThrowingSubscribers.java
@@ -24,7 +24,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.java b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
index 52b5a1f90d0..2d22a1a841f 100644
--- a/test/jdk/java/net/httpclient/AsFileDownloadTest.java
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.java
@@ -31,9 +31,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build jdk.test.lib.Platform
  * @build jdk.test.lib.util.FileUtils
  * @run testng/othervm AsFileDownloadTest
@@ -67,7 +67,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import jdk.test.lib.util.FileUtils;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/AsFileDownloadTest.policy b/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
index a8454c470e2..0f38171503d 100644
--- a/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
+++ b/test/jdk/java/net/httpclient/AsFileDownloadTest.policy
@@ -21,10 +21,10 @@
 // questions.
 //
 
-// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../test/lib/-" {
     permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
 };
 
 // for JTwork//classes/0/java/net/httpclient/http2/server/*
diff --git a/test/jdk/java/net/httpclient/BasicRedirectTest.java b/test/jdk/java/net/httpclient/BasicRedirectTest.java
index f446e1bb7a6..8fb36b7454b 100644
--- a/test/jdk/java/net/httpclient/BasicRedirectTest.java
+++ b/test/jdk/java/net/httpclient/BasicRedirectTest.java
@@ -30,9 +30,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       BasicRedirectTest
@@ -53,7 +53,7 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/CancelledResponse.java b/test/jdk/java/net/httpclient/CancelledResponse.java
index 528c8991e3f..f69bf066ba2 100644
--- a/test/jdk/java/net/httpclient/CancelledResponse.java
+++ b/test/jdk/java/net/httpclient/CancelledResponse.java
@@ -26,7 +26,7 @@ import java.net.http.HttpClient.Version;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLContext;
@@ -55,9 +55,9 @@ import static java.nio.charset.StandardCharsets.ISO_8859_1;
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.net.http/jdk.internal.net.http.common
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer ReferenceTracker
  * @run main/othervm  CancelledResponse
  * @run main/othervm  CancelledResponse SSL
diff --git a/test/jdk/java/net/httpclient/ConcurrentResponses.java b/test/jdk/java/net/httpclient/ConcurrentResponses.java
index 2a61b17b79d..718a1b6aee6 100644
--- a/test/jdk/java/net/httpclient/ConcurrentResponses.java
+++ b/test/jdk/java/net/httpclient/ConcurrentResponses.java
@@ -32,9 +32,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *      -Djdk.httpclient.HttpClient.log=headers,errors,channel
  *      ConcurrentResponses
@@ -67,7 +67,7 @@ import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.net.http.HttpResponse.BodySubscriber;
 import java.net.http.HttpResponse.BodySubscribers;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/CookieHeaderTest.java b/test/jdk/java/net/httpclient/CookieHeaderTest.java
index 4c770ad337e..f5c9b57d376 100644
--- a/test/jdk/java/net/httpclient/CookieHeaderTest.java
+++ b/test/jdk/java/net/httpclient/CookieHeaderTest.java
@@ -31,9 +31,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.tls.acknowledgeCloseNotify=true
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
@@ -43,7 +43,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/CustomRequestPublisher.java b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
index 0aeb398b0e9..34c7f8611ac 100644
--- a/test/jdk/java/net/httpclient/CustomRequestPublisher.java
+++ b/test/jdk/java/net/httpclient/CustomRequestPublisher.java
@@ -30,9 +30,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm CustomRequestPublisher
  */
 
@@ -62,7 +62,7 @@ import javax.net.ssl.SSLSession;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
index c91f1052192..ff7460ec4d5 100644
--- a/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/CustomResponseSubscriber.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @summary Tests response body subscribers's onComplete is not invoked before onSubscribe
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -57,7 +57,7 @@ import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodySubscriber;
 import java.net.http.HttpResponse.BodySubscribers;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/DependentActionsTest.java b/test/jdk/java/net/httpclient/DependentActionsTest.java
index 72563ecd482..ea715a1832b 100644
--- a/test/jdk/java/net/httpclient/DependentActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentActionsTest.java
@@ -26,8 +26,8 @@
  * @summary Verify that dependent synchronous actions added before the CF
  *          completes are executed either asynchronously in an executor when the
  *          CF later completes, or in the user thread that joins.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters DependentActionsTest
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DependentActionsTest
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -43,7 +43,7 @@ import java.lang.StackWalker.StackFrame;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
index 65843f046e0..94e7d39e5c8 100644
--- a/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
+++ b/test/jdk/java/net/httpclient/DependentPromiseActionsTest.java
@@ -26,8 +26,8 @@
  * @summary Verify that dependent synchronous actions added before the promise CF
  *          completes are executed either asynchronously in an executor when the
  *          CF later completes, or in the user thread that joins.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters DependentPromiseActionsTest
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DependentPromiseActionsTest
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -40,7 +40,7 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.StackWalker.StackFrame;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/DigestEchoClient.java b/test/jdk/java/net/httpclient/DigestEchoClient.java
index 0a51ede7843..a3321dc3b3c 100644
--- a/test/jdk/java/net/httpclient/DigestEchoClient.java
+++ b/test/jdk/java/net/httpclient/DigestEchoClient.java
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import sun.net.NetProperties;
 import sun.net.www.HeaderParser;
 import static java.lang.System.out;
@@ -62,8 +62,8 @@ import static java.lang.String.format;
  * @summary this test verifies that a client may provides authorization
  *          headers directly when connecting with a server.
  * @bug 8087112
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters DigestEchoServer
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer
  *        ReferenceTracker DigestEchoClient
  * @modules java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/DigestEchoClientSSL.java b/test/jdk/java/net/httpclient/DigestEchoClientSSL.java
index f2d3b1b07c2..63e86912a5c 100644
--- a/test/jdk/java/net/httpclient/DigestEchoClientSSL.java
+++ b/test/jdk/java/net/httpclient/DigestEchoClientSSL.java
@@ -26,8 +26,8 @@
  * @bug 8087112
  * @summary this test verifies that a client may provides authorization
  *          headers directly when connecting with a server over SSL.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext DigestEchoServer
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext DigestEchoServer
  *        DigestEchoClient ReferenceTracker DigestEchoClientSSL
  * @modules java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/EchoHandler.java b/test/jdk/java/net/httpclient/EchoHandler.java
index 64c9b0851b9..9fd86083801 100644
--- a/test/jdk/java/net/httpclient/EchoHandler.java
+++ b/test/jdk/java/net/httpclient/EchoHandler.java
@@ -32,7 +32,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import static java.net.http.HttpRequest.*;
 import static java.net.http.HttpResponse.*;
 import java.util.logging.ConsoleHandler;
diff --git a/test/jdk/java/net/httpclient/EncodedCharsInURI.java b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
index 94f68096d21..6d7a42e8532 100644
--- a/test/jdk/java/net/httpclient/EncodedCharsInURI.java
+++ b/test/jdk/java/net/httpclient/EncodedCharsInURI.java
@@ -26,8 +26,8 @@
  * @bug 8199683
  * @summary Tests that escaped characters in URI are correctly
  *          handled (not re-escaped and not unescaped)
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters EncodedCharsInURI
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters EncodedCharsInURI
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -42,7 +42,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
index 5e509c1d2a6..9e44f6aac97 100644
--- a/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
+++ b/test/jdk/java/net/httpclient/EscapedOctetsInURI.java
@@ -31,9 +31,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=reqeusts,headers
  *       EscapedOctetsInURI
@@ -58,7 +58,7 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/ExpectContinue.java b/test/jdk/java/net/httpclient/ExpectContinue.java
index 8715b4b10fe..f3bed36c75c 100644
--- a/test/jdk/java/net/httpclient/ExpectContinue.java
+++ b/test/jdk/java/net/httpclient/ExpectContinue.java
@@ -26,8 +26,8 @@
  * @summary Basic test for Expect 100-Continue ( HTTP/1.1 only )
  * @modules java.net.http
  *          jdk.httpserver
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm ExpectContinue
  */
 
@@ -49,7 +49,7 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.List;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
index fb1ad779bba..73dea64edfd 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java
@@ -43,7 +43,7 @@ import com.sun.net.httpserver.HttpsServer;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
@@ -67,9 +67,9 @@ import static org.testng.Assert.fail;
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm FlowAdapterPublisherTest
  */
 
diff --git a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
index 9d5b0848134..8a2796c991f 100644
--- a/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
+++ b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +48,7 @@ import java.net.http.HttpRequest.BodyPublishers;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.net.http.HttpResponse.BodySubscribers;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
@@ -68,9 +68,9 @@ import static org.testng.Assert.assertTrue;
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.internal.httpclient.debug=true FlowAdapterSubscriberTest
  */
 
diff --git a/test/jdk/java/net/httpclient/HeadTest.java b/test/jdk/java/net/httpclient/HeadTest.java
index 8910f4b33bd..30fb5741d5d 100644
--- a/test/jdk/java/net/httpclient/HeadTest.java
+++ b/test/jdk/java/net/httpclient/HeadTest.java
@@ -31,9 +31,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       HeadTest
@@ -42,7 +42,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
index c041f3108be..121793014db 100644
--- a/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
+++ b/test/jdk/java/net/httpclient/HttpClientBuilderTest.java
@@ -48,7 +48,7 @@ import javax.net.ssl.SSLParameters;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Redirect;
 import java.net.http.HttpClient.Version;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.Test;
 import static java.time.Duration.*;
 import static org.testng.Assert.*;
@@ -56,8 +56,8 @@ import static org.testng.Assert.*;
 /*
  * @test
  * @summary HttpClient[.Builder] API and behaviour checks
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng HttpClientBuilderTest
  */
 
diff --git a/test/jdk/java/net/httpclient/HttpEchoHandler.java b/test/jdk/java/net/httpclient/HttpEchoHandler.java
index e375cca2d95..319a5b901f9 100644
--- a/test/jdk/java/net/httpclient/HttpEchoHandler.java
+++ b/test/jdk/java/net/httpclient/HttpEchoHandler.java
@@ -32,7 +32,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import static java.net.http.HttpRequest.*;
 import static java.net.http.HttpResponse.*;
 import java.util.logging.ConsoleHandler;
diff --git a/test/jdk/java/net/httpclient/HttpsTunnelTest.java b/test/jdk/java/net/httpclient/HttpsTunnelTest.java
index d582e41745f..14f509d4f4e 100644
--- a/test/jdk/java/net/httpclient/HttpsTunnelTest.java
+++ b/test/jdk/java/net/httpclient/HttpsTunnelTest.java
@@ -23,7 +23,7 @@
 
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import javax.net.ssl.SSLContext;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -49,8 +49,8 @@ import static java.lang.System.out;
  *          be preemptively downgraded. That, is the stack should attempt
  *          a new h2 connection to the new host.
  * @bug 8196967
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpsTunnelTest
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters DigestEchoServer HttpsTunnelTest
  * @modules java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
  *          java.net.http/jdk.internal.net.http.hpack
diff --git a/test/jdk/java/net/httpclient/ImmutableFlowItems.java b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
index a9bfe032aa4..9a22a34bfe0 100644
--- a/test/jdk/java/net/httpclient/ImmutableFlowItems.java
+++ b/test/jdk/java/net/httpclient/ImmutableFlowItems.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests response body subscribers's onNext's Lists are unmodifiable,
  *          and that the buffers are read-only
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -57,7 +57,7 @@ import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodySubscriber;
 import java.net.http.HttpResponse.BodySubscribers;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
index 02815e8ddfb..1a7791f336a 100644
--- a/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
+++ b/test/jdk/java/net/httpclient/InvalidInputStreamSubscriptionRequest.java
@@ -26,8 +26,8 @@
  * @summary Tests an asynchronous BodySubscriber that completes
  *          immediately with an InputStream which issues bad
  *          requests
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext ReferenceTracker
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -38,7 +38,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
index 49e1d8b060c..8f5dceb5706 100644
--- a/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
+++ b/test/jdk/java/net/httpclient/InvalidSSLContextTest.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Test to ensure the HTTP client throws an appropriate SSL exception
  *          when SSL context is not valid.
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.internal.httpclient.debug=true InvalidSSLContextTest
  */
 
@@ -47,7 +47,7 @@ import java.net.http.HttpClient.Version;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.Assert;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
index da2b5cf1d48..adcf169730c 100644
--- a/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
+++ b/test/jdk/java/net/httpclient/InvalidSubscriptionRequest.java
@@ -27,8 +27,8 @@
  * @summary Tests an asynchronous BodySubscriber that completes
  *          immediately with a Publisher> whose
  *          subscriber issues bad requests
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext ReferenceTracker
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -39,7 +39,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/LightWeightHttpServer.java b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
index 39d2990c748..54fa174296f 100644
--- a/test/jdk/java/net/httpclient/LightWeightHttpServer.java
+++ b/test/jdk/java/net/httpclient/LightWeightHttpServer.java
@@ -22,8 +22,8 @@
  */
 
 /**
- * library /lib/testlibrary/ /
- * build jdk.testlibrary.SimpleSSLContext ProxyServer
+ * library /test/lib /
+ * build jdk.test.lib.net.SimpleSSLContext ProxyServer
  * compile ../../../com/sun/net/httpserver/LogFilter.java
  * compile ../../../com/sun/net/httpserver/EchoHandler.java
  * compile ../../../com/sun/net/httpserver/FileServerHandler.java
@@ -50,7 +50,7 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 public class LightWeightHttpServer {
 
diff --git a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
index cf02292867a..039bc9c8cd8 100644
--- a/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
+++ b/test/jdk/java/net/httpclient/LineBodyHandlerTest.java
@@ -52,7 +52,7 @@ import javax.net.ssl.SSLContext;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
@@ -77,9 +77,9 @@ import static org.testng.Assert.assertTrue;
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer LineBodyHandlerTest HttpServerAdapters
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm LineBodyHandlerTest
  */
 
diff --git a/test/jdk/java/net/httpclient/ManyRequests.java b/test/jdk/java/net/httpclient/ManyRequests.java
index 55c96c36532..97435d768c6 100644
--- a/test/jdk/java/net/httpclient/ManyRequests.java
+++ b/test/jdk/java/net/httpclient/ManyRequests.java
@@ -27,8 +27,8 @@
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary/ /
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
@@ -63,7 +63,7 @@ import java.util.logging.Logger;
 import java.util.logging.Level;
 import java.util.concurrent.CompletableFuture;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 public class ManyRequests {
 
diff --git a/test/jdk/java/net/httpclient/ManyRequests2.java b/test/jdk/java/net/httpclient/ManyRequests2.java
index dcbe1f42a5e..f600b00c348 100644
--- a/test/jdk/java/net/httpclient/ManyRequests2.java
+++ b/test/jdk/java/net/httpclient/ManyRequests2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary/ /
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
@@ -36,8 +36,11 @@
  * @run main/othervm/timeout=40 -Dtest.XFixed=true ManyRequests2
  * @run main/othervm/timeout=40 -Dtest.XFixed=true -Dtest.insertDelay=true ManyRequests2
  * @run main/othervm/timeout=40 -Dtest.XFixed=true -Dtest.chunkSize=64 ManyRequests2
- * @run main/othervm/timeout=40 -Djdk.internal.httpclient.debug=true -Dtest.XFixed=true -Dtest.insertDelay=true -Dtest.chunkSize=64 ManyRequests2
- * @summary Send a large number of requests asynchronously. The server echoes back using known content length.
+ * @run main/othervm/timeout=40 -Djdk.internal.httpclient.debug=true
+ *                              -Dtest.XFixed=true -Dtest.insertDelay=true
+ *                              -Dtest.chunkSize=64 ManyRequests2
+ * @summary Send a large number of requests asynchronously.
+ *          The server echoes back using known content length.
  */
  // * @run main/othervm/timeout=40 -Djdk.httpclient.HttpClient.log=ssl ManyRequests
 
diff --git a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
index 01fe8d8c31f..e0d245bca77 100644
--- a/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
+++ b/test/jdk/java/net/httpclient/ManyRequestsLegacy.java
@@ -26,16 +26,19 @@
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary/ /
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
  * @run main/othervm/timeout=40 ManyRequestsLegacy
  * @run main/othervm/timeout=40 -Dtest.insertDelay=true ManyRequestsLegacy
  * @run main/othervm/timeout=40 -Dtest.chunkSize=64 ManyRequestsLegacy
- * @run main/othervm/timeout=40 -Dtest.insertDelay=true -Dtest.chunkSize=64 ManyRequestsLegacy
- * @summary Send a large number of requests asynchronously using the legacy URL.openConnection(), to help sanitize results of the test ManyRequest.java.
+ * @run main/othervm/timeout=40 -Dtest.insertDelay=true
+ *                              -Dtest.chunkSize=64 ManyRequestsLegacy
+ * @summary Send a large number of requests asynchronously using the legacy
+ *          URL.openConnection(), to help sanitize results of the test
+ *          ManyRequest.java.
  */
 
 import javax.net.ssl.HttpsURLConnection;
@@ -70,7 +73,7 @@ import java.util.LinkedList;
 import java.util.Random;
 import java.util.logging.Logger;
 import java.util.logging.Level;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 public class ManyRequestsLegacy {
 
diff --git a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
index 026fcbbabde..cbe936afe93 100644
--- a/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
+++ b/test/jdk/java/net/httpclient/MappingResponseSubscriber.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @summary Tests mapped response subscriber
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -62,7 +62,7 @@ import java.net.http.HttpResponse.BodySubscribers;
 import  java.net.http.HttpResponse.BodySubscriber;
 import java.util.function.Function;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/MaxStreams.java b/test/jdk/java/net/httpclient/MaxStreams.java
index c1b86487b07..07ae0b4d5bc 100644
--- a/test/jdk/java/net/httpclient/MaxStreams.java
+++ b/test/jdk/java/net/httpclient/MaxStreams.java
@@ -32,9 +32,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -ea -esa MaxStreams
  */
 
@@ -60,7 +60,7 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandler;
 import java.net.http.HttpResponse.BodyHandlers;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/NoBodyPartOne.java b/test/jdk/java/net/httpclient/NoBodyPartOne.java
index e71225df70b..66aaa2fc0e0 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartOne.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartOne.java
@@ -25,8 +25,8 @@
  * @test
  * @bug 8161157
  * @summary Test response body handlers/subscribers when there is no body
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/NoBodyPartTwo.java b/test/jdk/java/net/httpclient/NoBodyPartTwo.java
index e612695b513..ba4843e2901 100644
--- a/test/jdk/java/net/httpclient/NoBodyPartTwo.java
+++ b/test/jdk/java/net/httpclient/NoBodyPartTwo.java
@@ -25,8 +25,8 @@
  * @test
  * @bug 8161157
  * @summary Test response body handlers/subscribers when there is no body
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java b/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
index 2ce05ac40b9..e3701a826f2 100644
--- a/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
+++ b/test/jdk/java/net/httpclient/NonAsciiCharsInURI.java
@@ -32,9 +32,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @compile -encoding utf-8 NonAsciiCharsInURI.java
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=reqeusts,headers
@@ -58,7 +58,7 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java
index 2827aca8721..4de6a295a96 100644
--- a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java
+++ b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemes.java
@@ -28,8 +28,8 @@
  *          it verifies that the client honor the jdk.http.auth.*.disabledSchemes
  *          net properties.
  * @bug 8087112
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext DigestEchoServer DigestEchoClient
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext DigestEchoServer DigestEchoClient
  *        ReferenceTracker ProxyAuthDisabledSchemes
  * @modules java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
index f3541bce7f9..a5642d43c33 100644
--- a/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
+++ b/test/jdk/java/net/httpclient/ProxyAuthDisabledSchemesSSL.java
@@ -28,8 +28,8 @@
  *          headers directly when connecting with a server over SSL, and
  *          it verifies that the client honor the jdk.http.auth.*.disabledSchemes
  *          net properties.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext DigestEchoServer DigestEchoClient
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext DigestEchoServer DigestEchoClient
  *        ReferenceTracker ProxyAuthDisabledSchemesSSL
  * @modules java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/ProxyTest.java b/test/jdk/java/net/httpclient/ProxyTest.java
index 06091818cfe..1c7a8f89459 100644
--- a/test/jdk/java/net/httpclient/ProxyTest.java
+++ b/test/jdk/java/net/httpclient/ProxyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import javax.net.ssl.SSLSession;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /**
  * @test
@@ -67,8 +67,8 @@ import jdk.testlibrary.SimpleSSLContext;
  *          an SSL Tunnel connection when the client is HTTP/2 and the server
  *          and proxy are HTTP/1.1
  * @modules java.net.http
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext ProxyTest
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext ProxyTest
  * @run main/othervm ProxyTest
  * @author danielfuchs
  */
diff --git a/test/jdk/java/net/httpclient/RedirectMethodChange.java b/test/jdk/java/net/httpclient/RedirectMethodChange.java
index eb445ebac47..c5d4aef8676 100644
--- a/test/jdk/java/net/httpclient/RedirectMethodChange.java
+++ b/test/jdk/java/net/httpclient/RedirectMethodChange.java
@@ -29,9 +29,9 @@
  *          java.net.http/jdk.internal.net.http.frame
  *          java.net.http/jdk.internal.net.http.hpack
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm RedirectMethodChange
  */
 
@@ -50,7 +50,7 @@ import java.net.http.HttpResponse.BodyHandlers;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/RedirectWithCookie.java b/test/jdk/java/net/httpclient/RedirectWithCookie.java
index dc6d5aa4f95..14d971b9165 100644
--- a/test/jdk/java/net/httpclient/RedirectWithCookie.java
+++ b/test/jdk/java/net/httpclient/RedirectWithCookie.java
@@ -30,9 +30,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       RedirectWithCookie
@@ -55,7 +55,7 @@ import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.util.List;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.java b/test/jdk/java/net/httpclient/RequestBodyTest.java
index 12238b8dd2c..b323efd86e5 100644
--- a/test/jdk/java/net/httpclient/RequestBodyTest.java
+++ b/test/jdk/java/net/httpclient/RequestBodyTest.java
@@ -27,11 +27,11 @@
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary/ /test/lib
+ * @library /test/lib
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build LightWeightHttpServer
  * @build jdk.test.lib.Platform
  * @build jdk.test.lib.util.FileUtils
diff --git a/test/jdk/java/net/httpclient/RequestBodyTest.policy b/test/jdk/java/net/httpclient/RequestBodyTest.policy
index f2f57e6f6d4..d3797cf472d 100644
--- a/test/jdk/java/net/httpclient/RequestBodyTest.policy
+++ b/test/jdk/java/net/httpclient/RequestBodyTest.policy
@@ -27,10 +27,10 @@ grant codeBase "file:${test.classes}/../../../../test/lib/-" {
     permission java.io.FilePermission "RequestBodyTest.tmp", "read,delete";
 };
 
-// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../test/lib/-" {
     permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
 };
 
 grant codeBase "file:${test.classes}/*" {
diff --git a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
index 4a9aa49f118..7f990138e79 100644
--- a/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
+++ b/test/jdk/java/net/httpclient/ResponseBodyBeforeError.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests that all response body is delivered to the BodySubscriber
  *          before an abortive error terminates the flow
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm ResponseBodyBeforeError
  */
 
@@ -52,7 +52,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Flow;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/ResponsePublisher.java b/test/jdk/java/net/httpclient/ResponsePublisher.java
index 44e7240ed8e..862b6c18043 100644
--- a/test/jdk/java/net/httpclient/ResponsePublisher.java
+++ b/test/jdk/java/net/httpclient/ResponsePublisher.java
@@ -26,8 +26,8 @@
  * @bug 8201186
  * @summary Tests an asynchronous BodySubscriber that completes
  *          immediately with a Publisher>
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -40,7 +40,7 @@ import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/RetryWithCookie.java b/test/jdk/java/net/httpclient/RetryWithCookie.java
index 6f85f6ac704..9e7442412b7 100644
--- a/test/jdk/java/net/httpclient/RetryWithCookie.java
+++ b/test/jdk/java/net/httpclient/RetryWithCookie.java
@@ -31,9 +31,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext ReferenceTracker
+ * @build jdk.test.lib.net.SimpleSSLContext ReferenceTracker
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       RetryWithCookie
@@ -42,7 +42,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/ServerCloseTest.java b/test/jdk/java/net/httpclient/ServerCloseTest.java
index aa1ca9dcaad..d7fa39aa56a 100644
--- a/test/jdk/java/net/httpclient/ServerCloseTest.java
+++ b/test/jdk/java/net/httpclient/ServerCloseTest.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests that our client deals correctly with servers that
  *          close the connection right after sending the last byte.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters EncodedCharsInURI
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters EncodedCharsInURI
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -35,7 +35,7 @@
  */
 //*        -Djdk.internal.httpclient.debug=true
 
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
diff --git a/test/jdk/java/net/httpclient/ShortResponseBody.java b/test/jdk/java/net/httpclient/ShortResponseBody.java
index ab9e3683d9a..69c77898ee2 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBody.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBody.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests Exception detail message when too few response bytes are
  *          received before a socket exception or eof.
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=headers,errors,channel
  *       ShortResponseBody
@@ -55,7 +55,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/ShortResponseBodyWithRetry.java b/test/jdk/java/net/httpclient/ShortResponseBodyWithRetry.java
index c6aaca978d2..00446fb91b6 100644
--- a/test/jdk/java/net/httpclient/ShortResponseBodyWithRetry.java
+++ b/test/jdk/java/net/httpclient/ShortResponseBodyWithRetry.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @summary Run of ShortResponseBody with -Djdk.httpclient.enableAllMethodRetry
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build ShortResponseBody
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=headers,errors,channel
diff --git a/test/jdk/java/net/httpclient/SmokeTest.java b/test/jdk/java/net/httpclient/SmokeTest.java
index 7bc41bbd656..51626cc0b81 100644
--- a/test/jdk/java/net/httpclient/SmokeTest.java
+++ b/test/jdk/java/net/httpclient/SmokeTest.java
@@ -27,8 +27,8 @@
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary/ /
- * @build jdk.testlibrary.SimpleSSLContext ProxyServer
+ * @library /test/lib /
+ * @build jdk.test.lib.net.SimpleSSLContext ProxyServer
  * @compile ../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../com/sun/net/httpserver/EchoHandler.java
  * @compile ../../../com/sun/net/httpserver/FileServerHandler.java
@@ -88,7 +88,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
 import static java.nio.file.StandardOpenOption.WRITE;
 
diff --git a/test/jdk/java/net/httpclient/SpecialHeadersTest.java b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
index ddf054f3aea..29fca738058 100644
--- a/test/jdk/java/net/httpclient/SpecialHeadersTest.java
+++ b/test/jdk/java/net/httpclient/SpecialHeadersTest.java
@@ -32,9 +32,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer HttpServerAdapters SpecialHeadersTest
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=requests,headers,errors
  *       SpecialHeadersTest
@@ -43,7 +43,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/SplitResponse.java b/test/jdk/java/net/httpclient/SplitResponse.java
index b0fcfaf724a..48f958047b7 100644
--- a/test/jdk/java/net/httpclient/SplitResponse.java
+++ b/test/jdk/java/net/httpclient/SplitResponse.java
@@ -40,7 +40,7 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.stream.Stream;
 
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import static java.lang.System.out;
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
@@ -49,8 +49,8 @@ import static java.net.http.HttpResponse.BodyHandlers.ofString;
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer
  * @run main/othervm
  *     -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseAsync.java b/test/jdk/java/net/httpclient/SplitResponseAsync.java
index e148e6a05be..caed3dc8d67 100644
--- a/test/jdk/java/net/httpclient/SplitResponseAsync.java
+++ b/test/jdk/java/net/httpclient/SplitResponseAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java b/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java
index 7cc4696e3f5..f805f26a1e4 100644
--- a/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java
+++ b/test/jdk/java/net/httpclient/SplitResponseKeepAlive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java b/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java
index 8dba0339385..c8d034444b6 100644
--- a/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java
+++ b/test/jdk/java/net/httpclient/SplitResponseKeepAliveAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseSSL.java b/test/jdk/java/net/httpclient/SplitResponseSSL.java
index 1c7f8522172..ba030d74efa 100644
--- a/test/jdk/java/net/httpclient/SplitResponseSSL.java
+++ b/test/jdk/java/net/httpclient/SplitResponseSSL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java b/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java
index 09d2d059d4a..e78b6703d59 100644
--- a/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java
+++ b/test/jdk/java/net/httpclient/SplitResponseSSLAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java
index 43080a0eba3..9892370cdef 100644
--- a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java
+++ b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAlive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java
index d1fccdc37f7..96dbb5f5bc0 100644
--- a/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java
+++ b/test/jdk/java/net/httpclient/SplitResponseSSLKeepAliveAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 /**
  * @test
  * @bug 8087112
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @build MockServer SplitResponse
  * @run main/othervm
  *      -Djdk.internal.httpclient.debug=true
diff --git a/test/jdk/java/net/httpclient/StreamingBody.java b/test/jdk/java/net/httpclient/StreamingBody.java
index 5079bf69ae0..9572d14a81c 100644
--- a/test/jdk/java/net/httpclient/StreamingBody.java
+++ b/test/jdk/java/net/httpclient/StreamingBody.java
@@ -31,9 +31,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=trace,headers,requests
  *       StreamingBody
@@ -53,7 +53,7 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.SSLContext;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
index 5a1f56c30e4..318b4622b50 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersCustomAfterCancel.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersCustomAfterCancel
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
index 99ef419dfe7..aaf05ee2a55 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersCustomBeforeCancel.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersCustomBeforeCancel
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
index 4aff72f126b..4af4827bdd3 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersIOAfterCancel.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersIOAfterCancel
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java b/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
index 9da7bb33fd1..63c36072509 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersIOBeforeCancel.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersIOBeforeCancel
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java b/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
index bae0a6a6099..7ffc09da042 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersInNextRequest.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersInNextRequest
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java b/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
index 27c0749379e..60e0e2aa147 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersInRequest.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersInRequest
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java b/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
index 7c626adae31..5b1dd9d36ff 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersInSubscribe.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersInSubscribe
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java b/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java
index eeec40fc20a..48f6fc913d3 100644
--- a/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java
+++ b/test/jdk/java/net/httpclient/ThrowingPublishersSanity.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when request publishers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
  *        ReferenceTracker AbstractThrowingPublishers ThrowingPublishersSanity
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java
index 1f4fac2910a..c3801a0c429 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamCustom.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsInputStreamCustom
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java
index e4955648d8f..f11c31421a1 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsInputStreamIO.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsInputStreamIO
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java
index 1e9b596a79f..847bc382838 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesCustom.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsLinesCustom
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java
index e860039980f..7b7ffab49a2 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsLinesIO.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsLinesIO
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java
index 75decf5bb1e..eb6f2a7c8f9 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringCustom.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsStringCustom
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java
index 8e070469a1b..24d38f1a6df 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesAsStringIO.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesAsStringIO
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java b/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java
index c6a70418369..b2ffd374d2e 100644
--- a/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java
+++ b/test/jdk/java/net/httpclient/ThrowingPushPromisesSanity.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when push promise handlers and their
  *          response body handlers and subscribers throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker AbstractThrowingPushPromises ThrowingPushPromisesSanity
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java
index 7a79abab723..eb2636f3159 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStream.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersAsInputStream AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java
index 1a52bc1d3c2..98baae29ec2 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsInputStreamAsync.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersAsInputStreamAsync AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java
index 30d00493f6c..eccdf54f398 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLines.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersAsLines AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java
index 3506745d1b6..ba3583244b6 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsLinesAsync.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersAsLinesAsync AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java
index 909e5e0c045..43ec0756842 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsString.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersAsString AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java b/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java
index 9944e9b6fd8..9620bf20f52 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersAsStringAsync.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersAsStringAsync AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java b/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java
index a78d330b425..7e4d600f0fc 100644
--- a/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java
+++ b/test/jdk/java/net/httpclient/ThrowingSubscribersSanity.java
@@ -25,8 +25,8 @@
  * @test
  * @summary Tests what happens when response body handlers and subscribers
  *          throw unexpected exceptions.
- * @library /lib/testlibrary http2/server
- * @build jdk.testlibrary.SimpleSSLContext HttpServerAdapters
+ * @library /test/lib http2/server
+ * @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
   *       ReferenceTracker ThrowingSubscribersSanity AbstractThrowingSubscribers
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
diff --git a/test/jdk/java/net/httpclient/TimeoutBasic.java b/test/jdk/java/net/httpclient/TimeoutBasic.java
index e1f7fa48075..cdaedf06219 100644
--- a/test/jdk/java/net/httpclient/TimeoutBasic.java
+++ b/test/jdk/java/net/httpclient/TimeoutBasic.java
@@ -31,7 +31,7 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
 import java.net.http.HttpTimeoutException;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 import javax.net.ServerSocketFactory;
 import javax.net.ssl.SSLContext;
@@ -46,8 +46,8 @@ import static java.lang.System.out;
 
 /**
  * @test
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @summary Basic tests for response timeouts
  * @run main/othervm TimeoutBasic
  */
diff --git a/test/jdk/java/net/httpclient/UnauthorizedTest.java b/test/jdk/java/net/httpclient/UnauthorizedTest.java
index 5dfccc4f6b2..7f183620de2 100644
--- a/test/jdk/java/net/httpclient/UnauthorizedTest.java
+++ b/test/jdk/java/net/httpclient/UnauthorizedTest.java
@@ -35,9 +35,9 @@
  *          java.net.http/jdk.internal.net.http.hpack
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary /test/lib http2/server
+ * @library /test/lib http2/server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm
  *       -Djdk.httpclient.HttpClient.log=headers
  *       UnauthorizedTest
@@ -46,7 +46,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java b/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java
index 8962024d24b..fd97843131e 100644
--- a/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java
+++ b/test/jdk/java/net/httpclient/UnknownBodyLengthTest.java
@@ -35,13 +35,13 @@ import javax.net.ssl.SSLParameters;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 /**
  * @test
  * @bug 8207966
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm -Djdk.tls.acknowledgeCloseNotify=true UnknownBodyLengthTest plain false
  * @run main/othervm -Djdk.tls.acknowledgeCloseNotify=true UnknownBodyLengthTest SSL false
  * @run main/othervm -Djdk.tls.acknowledgeCloseNotify=true UnknownBodyLengthTest plain true
diff --git a/test/jdk/java/net/httpclient/dependent.policy b/test/jdk/java/net/httpclient/dependent.policy
index 6a618eee712..2396a118b20 100644
--- a/test/jdk/java/net/httpclient/dependent.policy
+++ b/test/jdk/java/net/httpclient/dependent.policy
@@ -21,10 +21,10 @@
 // questions.
 //
 
-// for JTwork/classes/0/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.class
-grant codeBase "file:${test.classes}/../../../../lib/testlibrary/-" {
+// for JTwork/classes/0/test/lib/jdk/test/lib/net/SimpleSSLContext.class
+grant codeBase "file:${test.classes}/../../../../test/lib/-" {
     permission java.util.PropertyPermission "test.src.path", "read";
-    permission java.io.FilePermission "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+    permission java.io.FilePermission "${test.src}/../../../../lib/jdk/test/lib/net/testkeys", "read";
 };
 
 // for JTwork//classes/0/java/net/httpclient/http2/server/*
diff --git a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
index 01d00926956..2e4765fdf1b 100644
--- a/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
+++ b/test/jdk/java/net/httpclient/http2/BadHeadersTest.java
@@ -27,9 +27,9 @@
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
  *          java.net.http/jdk.internal.net.http.hpack
- * @library /lib/testlibrary server
+ * @library /test/lib server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm -Djdk.internal.httpclient.debug=true BadHeadersTest
  */
 
@@ -38,7 +38,7 @@ import jdk.internal.net.http.frame.ContinuationFrame;
 import jdk.internal.net.http.frame.HeaderFrame;
 import jdk.internal.net.http.frame.HeadersFrame;
 import jdk.internal.net.http.frame.Http2Frame;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/http2/BasicTest.java b/test/jdk/java/net/httpclient/http2/BasicTest.java
index 04f8ba9456c..00e4d80c12d 100644
--- a/test/jdk/java/net/httpclient/http2/BasicTest.java
+++ b/test/jdk/java/net/httpclient/http2/BasicTest.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @bug 8087112
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -47,7 +47,7 @@ import java.util.concurrent.*;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.Test;
 import static java.net.http.HttpClient.Version.HTTP_2;
 
diff --git a/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java b/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
index ef13067f53b..ac692f478c8 100644
--- a/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
+++ b/test/jdk/java/net/httpclient/http2/ContinuationFrameTest.java
@@ -28,9 +28,9 @@
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
  *          java.net.http/jdk.internal.net.http.hpack
- * @library /lib/testlibrary server
+ * @library /test/lib server
  * @build Http2TestServer
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run testng/othervm ContinuationFrameTest
  */
 
@@ -55,7 +55,7 @@ import jdk.internal.net.http.frame.ContinuationFrame;
 import jdk.internal.net.http.frame.HeaderFrame;
 import jdk.internal.net.http.frame.HeadersFrame;
 import jdk.internal.net.http.frame.Http2Frame;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/http2/ErrorTest.java b/test/jdk/java/net/httpclient/http2/ErrorTest.java
index 11ddc662614..54143e91bbc 100644
--- a/test/jdk/java/net/httpclient/http2/ErrorTest.java
+++ b/test/jdk/java/net/httpclient/http2/ErrorTest.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @bug 8157105
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -46,7 +46,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import static java.net.http.HttpClient.Version.HTTP_2;
 
 import org.testng.annotations.Test;
diff --git a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
index f154241a5b8..1db21bf7805 100644
--- a/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
+++ b/test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @bug 8087112 8177935
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
@@ -40,7 +40,7 @@ import java.net.http.HttpResponse.BodyHandlers;
 import javax.net.ssl.*;
 import java.nio.file.*;
 import java.util.concurrent.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import static java.net.http.HttpClient.Version.HTTP_2;
 import org.testng.annotations.Test;
 
diff --git a/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java b/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
index d0783461c83..69d9123203d 100644
--- a/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
+++ b/test/jdk/java/net/httpclient/http2/ImplicitPushCancel.java
@@ -23,8 +23,8 @@
 
 /*
  * @test
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/http2/ProxyTest2.java b/test/jdk/java/net/httpclient/http2/ProxyTest2.java
index 1c6a3f03072..41ab317d4c9 100644
--- a/test/jdk/java/net/httpclient/http2/ProxyTest2.java
+++ b/test/jdk/java/net/httpclient/http2/ProxyTest2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ import javax.net.ssl.SSLSession;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import java.util.concurrent.*;
 
 /**
@@ -61,12 +61,12 @@ import java.util.concurrent.*;
  * @summary  Verifies that you can access an HTTP/2 server over HTTPS by
  *           tunnelling through an HTTP/1.1 proxy.
  * @modules java.net.http
- * @library /lib/testlibrary server
+ * @library /test/lib server
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
  *          java.net.http/jdk.internal.net.http.hpack
- * @build jdk.testlibrary.SimpleSSLContext ProxyTest2
+ * @build jdk.test.lib.net.SimpleSSLContext ProxyTest2
  * @run main/othervm ProxyTest2
  * @author danielfuchs
  */
diff --git a/test/jdk/java/net/httpclient/http2/RedirectTest.java b/test/jdk/java/net/httpclient/http2/RedirectTest.java
index 41b08008baf..bf886502954 100644
--- a/test/jdk/java/net/httpclient/http2/RedirectTest.java
+++ b/test/jdk/java/net/httpclient/http2/RedirectTest.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @bug 8156514
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/http2/ServerPush.java b/test/jdk/java/net/httpclient/http2/ServerPush.java
index 5b44dbf718f..5652dae79c5 100644
--- a/test/jdk/java/net/httpclient/http2/ServerPush.java
+++ b/test/jdk/java/net/httpclient/http2/ServerPush.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @bug 8087112 8159814
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java b/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
index 165ad825f63..8b5426d70d6 100644
--- a/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
+++ b/test/jdk/java/net/httpclient/http2/ServerPushWithDiffTypes.java
@@ -23,8 +23,8 @@
 
 /*
  * @test
- * @library /lib/testlibrary server
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib server
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.base/sun.net.www.http
  *          java.net.http/jdk.internal.net.http.common
  *          java.net.http/jdk.internal.net.http.frame
diff --git a/test/jdk/java/net/httpclient/security/Driver.java b/test/jdk/java/net/httpclient/security/Driver.java
index e09612361fb..29a8f7d222d 100644
--- a/test/jdk/java/net/httpclient/security/Driver.java
+++ b/test/jdk/java/net/httpclient/security/Driver.java
@@ -24,12 +24,11 @@
 /*
  * @test
  * @bug 8087112
- * @library /lib/testlibrary/
  * @library /test/lib
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @build jdk.testlibrary.SimpleSSLContext jdk.test.lib.Utils
+ * @build jdk.test.lib.net.SimpleSSLContext jdk.test.lib.Utils
  * @compile ../../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
  * @compile ../ProxyServer.java
diff --git a/test/jdk/java/net/httpclient/security/Security.java b/test/jdk/java/net/httpclient/security/Security.java
index be23f10bc86..58594b55688 100644
--- a/test/jdk/java/net/httpclient/security/Security.java
+++ b/test/jdk/java/net/httpclient/security/Security.java
@@ -27,8 +27,8 @@
  * @modules java.net.http
  *          java.logging
  *          jdk.httpserver
- * @library /lib/testlibrary/
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @compile ../../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
  * @compile ../ProxyServer.java
diff --git a/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java b/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
index 2feac502b93..8702a49549f 100644
--- a/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
+++ b/test/jdk/java/net/httpclient/websocket/WSHandshakeExceptionTest.java
@@ -24,8 +24,8 @@
 /*
  * @test
  * @summary Basic test for WebSocketHandshakeException
- * @library /lib/testlibrary
- * @build jdk.testlibrary.SimpleSSLContext
+ * @library /test/lib
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @modules java.net.http
  *          jdk.httpserver
  * @run testng/othervm -Djdk.internal.httpclient.debug=true WSHandshakeExceptionTest
@@ -39,7 +39,7 @@ import java.net.InetAddress;
 import java.net.http.HttpClient;
 import java.net.http.WebSocket;
 import java.net.http.WebSocketHandshakeException;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
index 6eb6f2c2313..9b69588ce3f 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/AbstractSSLTubeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,22 +28,13 @@ import jdk.internal.net.http.common.SSLTube;
 import jdk.internal.net.http.common.Utils;
 import org.testng.annotations.Test;
 
-import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.concurrent.CompletableFuture;
@@ -244,76 +235,4 @@ public class AbstractSSLTubeTest extends AbstractRandomTest {
         engine.setUseClientMode(client);
         return engine;
     }
-
-    /**
-     * Creates a simple usable SSLContext for SSLSocketFactory or a HttpsServer
-     * using either a given keystore or a default one in the test tree.
-     *
-     * Using this class with a security manager requires the following
-     * permissions to be granted:
-     *
-     * permission "java.util.PropertyPermission" "test.src.path", "read";
-     * permission java.io.FilePermission "${test.src}/../../../../lib/testlibrary/jdk/testlibrary/testkeys",
-     * "read"; The exact path above depends on the location of the test.
-     */
-    protected static class SimpleSSLContext {
-
-        private final SSLContext ssl;
-
-        /**
-         * Loads default keystore from SimpleSSLContext source directory
-         */
-        public SimpleSSLContext() throws IOException {
-            String paths = System.getProperty("test.src.path");
-            StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
-            boolean securityExceptions = false;
-            SSLContext sslContext = null;
-            while (st.hasMoreTokens()) {
-                String path = st.nextToken();
-                try {
-                    File f = new File(path, "../../../../lib/testlibrary/jdk/testlibrary/testkeys");
-                    if (f.exists()) {
-                        try (FileInputStream fis = new FileInputStream(f)) {
-                            sslContext = init(fis);
-                            break;
-                        }
-                    }
-                } catch (SecurityException e) {
-                    // catch and ignore because permission only required
-                    // for one entry on path (at most)
-                    securityExceptions = true;
-                }
-            }
-            if (securityExceptions) {
-                System.err.println("SecurityExceptions thrown on loading testkeys");
-            }
-            ssl = sslContext;
-        }
-
-        private SSLContext init(InputStream i) throws IOException {
-            try {
-                char[] passphrase = "passphrase".toCharArray();
-                KeyStore ks = KeyStore.getInstance("JKS");
-                ks.load(i, passphrase);
-
-                KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-                kmf.init(ks, passphrase);
-
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-                tmf.init(ks);
-
-                SSLContext ssl = SSLContext.getInstance("TLS");
-                ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-                return ssl;
-            } catch (KeyManagementException | KeyStoreException |
-                    UnrecoverableKeyException | CertificateException |
-                    NoSuchAlgorithmException e) {
-                throw new RuntimeException(e.getMessage());
-            }
-        }
-
-        public SSLContext get() {
-            return ssl;
-        }
-    }
 }
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
index e34a75229e1..e6188bf4bb8 100644
--- a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/FlowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@
 package jdk.internal.net.http;
 
 import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -33,12 +31,6 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.Random;
 import java.util.StringTokenizer;
@@ -53,9 +45,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SubmissionPublisher;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.*;
-import javax.net.ssl.TrustManagerFactory;
 import jdk.internal.net.http.common.Utils;
 import org.testng.annotations.Test;
 import jdk.internal.net.http.common.SSLFlowDelegate;
@@ -467,80 +457,6 @@ public class FlowTest extends AbstractRandomTest {
         }
     }
 
-    /**
-     * Creates a simple usable SSLContext for SSLSocketFactory
-     * or a HttpsServer using either a given keystore or a default
-     * one in the test tree.
-     * 
    
-     * Using this class with a security manager requires the following
-     * permissions to be granted:
-     * 
    
-     * permission "java.util.PropertyPermission" "test.src.path", "read";
-     * permission java.io.FilePermission
-     * "${test.src}/../../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
-     * The exact path above depends on the location of the test.
-     */
-    static class SimpleSSLContext {
-
-        private final SSLContext ssl;
-
-        /**
-         * Loads default keystore from SimpleSSLContext source directory
-         */
-        public SimpleSSLContext() throws IOException {
-            String paths = System.getProperty("test.src.path");
-            StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
-            boolean securityExceptions = false;
-            SSLContext sslContext = null;
-            while (st.hasMoreTokens()) {
-                String path = st.nextToken();
-                try {
-                    File f = new File(path, "../../../../lib/testlibrary/jdk/testlibrary/testkeys");
-                    if (f.exists()) {
-                        try (FileInputStream fis = new FileInputStream(f)) {
-                            sslContext = init(fis);
-                            break;
-                        }
-                    }
-                } catch (SecurityException e) {
-                    // catch and ignore because permission only required
-                    // for one entry on path (at most)
-                    securityExceptions = true;
-                }
-            }
-            if (securityExceptions) {
-                System.out.println("SecurityExceptions thrown on loading testkeys");
-            }
-            ssl = sslContext;
-        }
-
-        private SSLContext init(InputStream i) throws IOException {
-            try {
-                char[] passphrase = "passphrase".toCharArray();
-                KeyStore ks = KeyStore.getInstance("JKS");
-                ks.load(i, passphrase);
-
-                KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-                kmf.init(ks, passphrase);
-
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-                tmf.init(ks);
-
-                SSLContext ssl = SSLContext.getInstance("TLS");
-                ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-                return ssl;
-            } catch (KeyManagementException | KeyStoreException |
-                    UnrecoverableKeyException | CertificateException |
-                    NoSuchAlgorithmException e) {
-                throw new RuntimeException(e.getMessage());
-            }
-        }
-
-        public SSLContext get() {
-            return ssl;
-        }
-    }
-
     private static void sleep(int millis) {
         try {
             Thread.sleep(millis);
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
new file mode 100644
index 00000000000..00ae3a0fa7d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/SimpleSSLContext.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.net.http;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.util.StringTokenizer;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
+/**
+ * Creates a simple usable SSLContext for SSLSocketFactory
+ * or a HttpsServer using a default keystore in the test tree.
+ * 
    
+ * Using this class with a security manager requires the following
+ * permissions to be granted:
+ * 
    
+ * permission "java.util.PropertyPermission" "test.src.path", "read";
+ * permission java.io.FilePermission "/path/to/test/lib/jdk/test/lib/testkeys", "read";
+ * The exact path above depends on the location of the test.
+ */
+public class SimpleSSLContext {
+
+    private final SSLContext ssl;
+
+    /**
+     * Loads default keystore from SimpleSSLContext source directory
+     */
+    public SimpleSSLContext() throws IOException {
+        String paths = System.getProperty("test.src.path");
+        StringTokenizer st = new StringTokenizer(paths, File.pathSeparator);
+        boolean securityExceptions = false;
+        SSLContext sslContext = null;
+        while (st.hasMoreTokens()) {
+            String path = st.nextToken();
+            try {
+                File f = new File(path, "../../../../../lib/jdk/test/lib/net/testkeys");
+                if (f.exists()) {
+                    try (FileInputStream fis = new FileInputStream(f)) {
+                        sslContext = init(fis);
+                        break;
+                    }
+                }
+            } catch (SecurityException e) {
+                // catch and ignore because permission only required
+                // for one entry on path (at most)
+                securityExceptions = true;
+            }
+        }
+        if (securityExceptions) {
+            System.out.println("SecurityExceptions thrown on loading testkeys");
+        }
+        ssl = sslContext;
+    }
+
+    private SSLContext init(InputStream i) throws IOException {
+        try {
+            char[] passphrase = "passphrase".toCharArray();
+            KeyStore ks = KeyStore.getInstance("PKCS12");
+            ks.load(i, passphrase);
+
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
+            kmf.init(ks, passphrase);
+
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+            tmf.init(ks);
+
+            SSLContext ssl = SSLContext.getInstance("TLS");
+            ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+            return ssl;
+        } catch (KeyManagementException | KeyStoreException |
+                UnrecoverableKeyException | CertificateException |
+                NoSuchAlgorithmException e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    public SSLContext get() {
+        return ssl;
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java b/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java
index 38ee581bdbc..d36dfb2630e 100644
--- a/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java
+++ b/test/jdk/javax/net/ssl/HttpsURLConnection/Equals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 8055299
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.httpserver
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @run main/othervm -Djavax.net.debug=ssl,handshake,record Equals
  */
 import com.sun.net.httpserver.*;
@@ -34,7 +34,7 @@ import java.net.*;
 import java.io.*;
 import javax.net.ssl.*;
 import java.util.concurrent.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 public class Equals {
 
diff --git a/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java
index 8c485af01ac..2923c4807f5 100644
--- a/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java
+++ b/test/jdk/sun/net/www/protocol/http/RedirectOnPost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 
 /**
  * @test
- * @library /lib/testlibrary/
+ * @library /test/lib
  * @modules jdk.httpserver
- * @build jdk.testlibrary.SimpleSSLContext
+ * @build jdk.test.lib.net.SimpleSSLContext
  * @compile RedirectOnPost.java
  * @run main/othervm RedirectOnPost
  * @bug 8029127
@@ -38,7 +38,7 @@ import java.util.*;
 import com.sun.net.httpserver.*;
 import java.util.concurrent.*;
 import javax.net.ssl.*;
-import jdk.testlibrary.SimpleSSLContext;
+import jdk.test.lib.net.SimpleSSLContext;
 
 public class RedirectOnPost {
 
diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java b/test/lib/jdk/test/lib/net/SimpleSSLContext.java
similarity index 82%
rename from test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java
rename to test/lib/jdk/test/lib/net/SimpleSSLContext.java
index 47143dc3b2b..0bfbb5fdc34 100644
--- a/test/jdk/lib/testlibrary/jdk/testlibrary/SimpleSSLContext.java
+++ b/test/lib/jdk/test/lib/net/SimpleSSLContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +21,10 @@
  * questions.
  */
 
-package jdk.testlibrary;
+package jdk.test.lib.net;
 
 import java.util.*;
-import java.util.concurrent.*;
 import java.io.*;
-import java.net.*;
 import java.security.*;
 import java.security.cert.*;
 import javax.net.ssl.*;
@@ -40,8 +38,7 @@ import javax.net.ssl.*;
  * permissions to be granted:
  *
  * permission "java.util.PropertyPermission" "test.src.path", "read";
- * permission java.io.FilePermission
- *    "${test.src}/../../../lib/testlibrary/jdk/testlibrary/testkeys", "read";
+ * permission java.io.FilePermission "/path/to/test/lib/jdk/test/lib/testkeys", "read";
  * The exact path above depends on the location of the test.
  */
 public class SimpleSSLContext {
@@ -63,7 +60,7 @@ public class SimpleSSLContext {
                     while (st.hasMoreTokens()) {
                         String path = st.nextToken();
                         try {
-                            File f = new File(path, "jdk/testlibrary/testkeys");
+                            File f = new File(path, "jdk/test/lib/net/testkeys");
                             if (f.exists()) {
                                 try (FileInputStream fis = new FileInputStream(f)) {
                                     init(fis);
@@ -98,7 +95,7 @@ public class SimpleSSLContext {
      * loads default keystore from given directory
      */
     public SimpleSSLContext(String dir) throws IOException {
-        String file = dir+"/testkeys";
+        String file = dir + "/testkeys";
         try (FileInputStream fis = new FileInputStream(file)) {
             init(fis);
         }
@@ -107,26 +104,20 @@ public class SimpleSSLContext {
     private void init(InputStream i) throws IOException {
         try {
             char[] passphrase = "passphrase".toCharArray();
-            KeyStore ks = KeyStore.getInstance("JKS");
+            KeyStore ks = KeyStore.getInstance("PKCS12");
             ks.load(i, passphrase);
 
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
             kmf.init(ks, passphrase);
 
-            TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
             tmf.init(ks);
 
             ssl = SSLContext.getInstance("TLS");
             ssl.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-        } catch (KeyManagementException e) {
-            throw new RuntimeException(e.getMessage());
-        } catch (KeyStoreException e) {
-            throw new RuntimeException(e.getMessage());
-        } catch (UnrecoverableKeyException e) {
-            throw new RuntimeException(e.getMessage());
-        } catch (CertificateException e) {
-            throw new RuntimeException(e.getMessage());
-        } catch (NoSuchAlgorithmException e) {
+        } catch (KeyManagementException | KeyStoreException |
+                UnrecoverableKeyException | CertificateException |
+                NoSuchAlgorithmException e) {
             throw new RuntimeException(e.getMessage());
         }
     }
diff --git a/test/jdk/lib/testlibrary/jdk/testlibrary/testkeys b/test/lib/jdk/test/lib/net/testkeys
similarity index 100%
rename from test/jdk/lib/testlibrary/jdk/testlibrary/testkeys
rename to test/lib/jdk/test/lib/net/testkeys

From a0ce3d3f18e455a5fc8a587d4f37233152510764 Mon Sep 17 00:00:00 2001
From: Zhengyu Gu 
Date: Mon, 15 Oct 2018 11:53:15 -0400
Subject: [PATCH 114/124] 8212074: Add method to peek the remaining tasks in
 task queues

Add methods for implementing new task termination protocol

Reviewed-by: tschatzl, shade, rkennke
---
 src/hotspot/share/gc/shared/taskqueue.hpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp
index 7b9f47a65d1..0c1f9beec43 100644
--- a/src/hotspot/share/gc/shared/taskqueue.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.hpp
@@ -370,6 +370,8 @@ class TaskQueueSetSuper {
 public:
   // Returns "true" if some TaskQueue in the set contains a task.
   virtual bool peek() = 0;
+  // Tasks in queue
+  virtual uint tasks() const = 0;
 };
 
 template  class TaskQueueSetSuperImpl: public CHeapObj, public TaskQueueSetSuper {
@@ -399,6 +401,7 @@ public:
   bool steal(uint queue_num, E& t);
 
   bool peek();
+  uint tasks() const;
 
   uint size() const { return _n; }
 };
@@ -424,6 +427,15 @@ bool GenericTaskQueueSet::peek() {
   return false;
 }
 
+template
+uint GenericTaskQueueSet::tasks() const {
+  uint n = 0;
+  for (uint j = 0; j < _n; j++) {
+    n += _queues[j]->size();
+  }
+  return n;
+}
+
 // When to terminate from the termination protocol.
 class TerminatorTerminator: public CHeapObj {
 public:

From 56847065afc6644acede196dc8d6973b67b4a2e0 Mon Sep 17 00:00:00 2001
From: Abdul Kolarkunnu 
Date: Thu, 11 Oct 2018 07:22:53 -0700
Subject: [PATCH 115/124] 8211139: Increase timeout value in all tests under
 jdk/sanity/client/SwingSet/src

Reviewed-by: serb
---
 .../SwingSet/src/ButtonDemoScreenshotTest.java     |  2 +-
 .../sanity/client/SwingSet/src/ButtonDemoTest.java |  2 +-
 .../client/SwingSet/src/ComboBoxDemoTest.java      |  2 +-
 .../sanity/client/SwingSet/src/DialogDemoTest.java |  2 +-
 .../sanity/client/SwingSet/src/FrameDemoTest.java  |  4 ++--
 .../client/SwingSet/src/GridBagLayoutDemoTest.java |  2 +-
 .../sanity/client/SwingSet/src/ListDemoTest.java   |  2 +-
 .../client/SwingSet/src/OptionPaneDemoTest.java    |  2 +-
 .../client/SwingSet/src/ProgressBarDemoTest.java   |  2 +-
 .../client/SwingSet/src/ScrollPaneDemoTest.java    |  2 +-
 .../client/SwingSet/src/SpinnerDemoTest.java       |  2 +-
 .../client/SwingSet/src/TabbedPaneDemoTest.java    |  2 +-
 .../sanity/client/SwingSet/src/TableDemoTest.java  |  2 +-
 .../client/SwingSet/src/TextFieldDemoTest.java     |  2 +-
 .../client/SwingSet/src/ToggleButtonDemoTest.java  |  2 +-
 .../client/SwingSet/src/ToolTipDemoTest.java       |  2 +-
 .../sanity/client/SwingSet/src/TreeDemoTest.java   |  2 +-
 .../sanity/client/SwingSet/src/WindowDemoTest.java |  2 +-
 .../lib/Extensions/src/org/jemmy2ext/JemmyExt.java | 14 +++++++++-----
 19 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java b/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java
index 545603aaf3e..5106b7be0df 100644
--- a/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java
@@ -54,7 +54,7 @@ import static org.jemmy2ext.JemmyExt.*;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.button.ButtonDemo
- * @run testng ButtonDemoScreenshotTest
+ * @run testng/timeout=600 ButtonDemoScreenshotTest
  */
 @Listeners(GuiTestListener.class)
 public class ButtonDemoScreenshotTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java
index 7154037ca90..fd27a8d972b 100644
--- a/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ButtonDemoTest.java
@@ -56,7 +56,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.button.ButtonDemo
- * @run testng ButtonDemoTest
+ * @run testng/timeout=600 ButtonDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ButtonDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java
index 3a52bcf3b1b..d3ed7697df3 100644
--- a/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ComboBoxDemoTest.java
@@ -45,7 +45,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.combobox.ComboBoxDemo
- * @run testng ComboBoxDemoTest
+ * @run testng/timeout=600 ComboBoxDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ComboBoxDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java b/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java
index 1d92414509f..6377259bdf1 100644
--- a/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/DialogDemoTest.java
@@ -55,7 +55,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.dialog.DialogDemo
- * @run testng DialogDemoTest
+ * @run testng/timeout=600 DialogDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class DialogDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/FrameDemoTest.java b/test/jdk/sanity/client/SwingSet/src/FrameDemoTest.java
index f820cb2b77d..aaa0a624980 100644
--- a/test/jdk/sanity/client/SwingSet/src/FrameDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/FrameDemoTest.java
@@ -86,7 +86,7 @@ import com.sun.swingset3.demos.frame.FrameDemo;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.frame.FrameDemo
- * @run testng FrameDemoTest
+ * @run testng/timeout=600 FrameDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class FrameDemoTest {
@@ -293,4 +293,4 @@ public class FrameDemoTest {
         });
     }
 
-}
\ No newline at end of file
+}
diff --git a/test/jdk/sanity/client/SwingSet/src/GridBagLayoutDemoTest.java b/test/jdk/sanity/client/SwingSet/src/GridBagLayoutDemoTest.java
index ca4a4f33d32..e833db90685 100644
--- a/test/jdk/sanity/client/SwingSet/src/GridBagLayoutDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/GridBagLayoutDemoTest.java
@@ -51,7 +51,7 @@ import static org.jemmy2ext.JemmyExt.getUIValue;
  * @modules java.desktop
  *          java.logging
  * @build com.sun.swingset3.demos.gridbaglayout.GridBagLayoutDemo
- * @run testng GridBagLayoutDemoTest
+ * @run testng/timeout=600 GridBagLayoutDemoTest
  */
 
 @Listeners(GuiTestListener.class)
diff --git a/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java
index 6925416efe0..fda5f3fe72d 100644
--- a/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ListDemoTest.java
@@ -56,7 +56,7 @@ import static org.testng.AssertJUnit.*;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.list.ListDemo
- * @run testng ListDemoTest
+ * @run testng/timeout=600 ListDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ListDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java
index 0b20dcdf93c..bf4d11fe997 100644
--- a/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/OptionPaneDemoTest.java
@@ -55,7 +55,7 @@ import static org.testng.AssertJUnit.*;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.optionpane.OptionPaneDemo
- * @run testng OptionPaneDemoTest
+ * @run testng/timeout=600 OptionPaneDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class OptionPaneDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java
index 33aa7af9104..1afb02c634b 100644
--- a/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ProgressBarDemoTest.java
@@ -49,7 +49,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.progressbar.ProgressBarDemo
- * @run testng/timeout=240 ProgressBarDemoTest
+ * @run testng/timeout=1200 ProgressBarDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ProgressBarDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java
index 80b534ad562..e2aca591932 100644
--- a/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ScrollPaneDemoTest.java
@@ -45,7 +45,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.scrollpane.ScrollPaneDemo
- * @run testng ScrollPaneDemoTest
+ * @run testng/timeout=600 ScrollPaneDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ScrollPaneDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java b/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java
index e71df060103..c547162fec6 100644
--- a/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/SpinnerDemoTest.java
@@ -47,7 +47,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.spinner.SpinnerDemo
- * @run testng SpinnerDemoTest
+ * @run testng/timeout=600 SpinnerDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class SpinnerDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java
index 3abda73049c..6b7b270173f 100644
--- a/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/TabbedPaneDemoTest.java
@@ -48,7 +48,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.tabbedpane.TabbedPaneDemo
- * @run testng TabbedPaneDemoTest
+ * @run testng/timeout=600 TabbedPaneDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class TabbedPaneDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/TableDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TableDemoTest.java
index de824e7c0a9..da77e1cffd9 100644
--- a/test/jdk/sanity/client/SwingSet/src/TableDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/TableDemoTest.java
@@ -64,7 +64,7 @@ import com.sun.swingset3.demos.table.TableDemo;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.table.TableDemo
- * @run testng TableDemoTest
+ * @run testng/timeout=600 TableDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class TableDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java
index b94bdb0b8a1..4a8eab0177d 100644
--- a/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/TextFieldDemoTest.java
@@ -65,7 +65,7 @@ import static org.testng.AssertJUnit.*;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.textfield.TextFieldDemo
- * @run testng TextFieldDemoTest
+ * @run testng/timeout=600 TextFieldDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class TextFieldDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java
index 49da775491a..dfaf8c9c329 100644
--- a/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ToggleButtonDemoTest.java
@@ -61,7 +61,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.togglebutton.ToggleButtonDemo
- * @run testng ToggleButtonDemoTest
+ * @run testng/timeout=600 ToggleButtonDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ToggleButtonDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/ToolTipDemoTest.java b/test/jdk/sanity/client/SwingSet/src/ToolTipDemoTest.java
index 7d30383a34f..9a6d7e1ccc7 100644
--- a/test/jdk/sanity/client/SwingSet/src/ToolTipDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/ToolTipDemoTest.java
@@ -61,7 +61,7 @@ import com.sun.swingset3.demos.tooltip.ToolTipDemo;
  *         java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.tooltip.ToolTipDemo
- * @run testng ToolTipDemoTest
+ * @run testng/timeout=600 ToolTipDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class ToolTipDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java b/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java
index c454c54739d..ab541c35c66 100644
--- a/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/TreeDemoTest.java
@@ -56,7 +56,7 @@ import static org.testng.AssertJUnit.*;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.tree.TreeDemo
- * @run testng TreeDemoTest
+ * @run testng/timeout=600 TreeDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class TreeDemoTest {
diff --git a/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java b/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java
index e9fc06f2ac3..1b15153c239 100644
--- a/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java
+++ b/test/jdk/sanity/client/SwingSet/src/WindowDemoTest.java
@@ -49,7 +49,7 @@ import org.testng.annotations.Listeners;
  *          java.logging
  * @build org.jemmy2ext.JemmyExt
  * @build com.sun.swingset3.demos.window.WindowDemo
- * @run testng WindowDemoTest
+ * @run testng/timeout=600 WindowDemoTest
  */
 @Listeners(GuiTestListener.class)
 public class WindowDemoTest {
diff --git a/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java b/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java
index 2c3b23677ac..8063c60c986 100644
--- a/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java
+++ b/test/jdk/sanity/client/lib/Extensions/src/org/jemmy2ext/JemmyExt.java
@@ -48,6 +48,7 @@ import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JWindow;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.TitledBorder;
@@ -340,19 +341,21 @@ public class JemmyExt {
      * full dump and a screenshot of the whole screen.
      */
     public static void captureAll() {
-        PNGEncoder.captureScreen("failure.png", PNGEncoder.COLOR_MODE);
+        String lookAndFeelClassName = UIManager.getLookAndFeel().getClass().getSimpleName();
+        PNGEncoder.captureScreen("failure_" + lookAndFeelClassName + ".png", PNGEncoder.COLOR_MODE);
         try {
-            Dumper.dumpAll("dumpAll.xml");
+            Dumper.dumpAll("dumpAll_" + lookAndFeelClassName + ".xml");
         } catch (FileNotFoundException ex) {
             Logger.getLogger(JemmyExt.class.getName()).log(Level.SEVERE, null, ex);
         }
-        captureWindows();
+        captureWindows(lookAndFeelClassName);
     }
 
     /**
      * Captures each showing window image using Window.paint() method.
+     * @param lookAndFeelClassName
      */
-    private static void captureWindows() {
+    private static void captureWindows(String lookAndFeelClassName) {
         try {
             EventQueue.invokeAndWait(() -> {
                 Window[] windows = Window.getWindows();
@@ -367,7 +370,8 @@ public class JemmyExt {
                     g.dispose();
 
                     try {
-                        ImageIO.write(img, "png", new File("window" + index++ + ".png"));
+                        ImageIO.write(img, "png", new File("window_" + lookAndFeelClassName
+                                + "_" + index++ + ".png"));
                     } catch (IOException e) {
                         e.printStackTrace();
                     }

From 232912a6cabba7a80eb10415cf96e9760abd4ec8 Mon Sep 17 00:00:00 2001
From: Erik Joelsson 
Date: Mon, 15 Oct 2018 11:36:20 -0700
Subject: [PATCH 116/124] 8212028: Use run-test makefile framework for testing
 in Oracle's Mach5

Reviewed-by: ihse
---
 make/Help.gmk                                 |   2 +-
 make/RunTests.gmk                             | 113 ++++++++++++------
 make/RunTestsPrebuilt.gmk                     |  43 ++++---
 make/RunTestsPrebuiltSpec.gmk                 |  12 +-
 make/common/MakeBase.gmk                      |   8 +-
 make/conf/jib-profiles.js                     |  38 ++++--
 .../escapeAnalysis/TestArrayCopy.java         |   2 +-
 .../compiler/graalunit/JttLangMathALTest.java |   3 +-
 .../compiler/graalunit/JttLangMathMZTest.java |   3 +-
 .../ContinuousCallSiteTargetChange.java       |   2 +-
 .../appcds/jvmti/InstrumentationApp.java      |   8 +-
 .../appcds/jvmti/InstrumentationTest.java     |   4 +-
 .../correctBootstrap/TestDescription.java     |   2 +-
 .../incorrectBootstrap/TestDescription.java   |   2 +-
 .../stress/classfmt/mh/TestDescription.java   |   2 +-
 .../stress/classfmt/mt/TestDescription.java   |   2 +-
 .../stress/gc/createLotsOfMHConsts/Test.java  |   2 +-
 test/jdk/tools/jimage/JImageExtractTest.java  |   2 +-
 18 files changed, 164 insertions(+), 86 deletions(-)

diff --git a/make/Help.gmk b/make/Help.gmk
index 461d3431a62..e58f54862af 100644
--- a/make/Help.gmk
+++ b/make/Help.gmk
@@ -119,7 +119,7 @@ print-configurations:
 run-test-prebuilt:
 	@( cd $(topdir) && \
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
-	    run-test-prebuilt TEST="$(TEST)" )
+	    run-test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 
 ALL_GLOBAL_TARGETS := help print-configurations run-test-prebuilt
 
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 3f72b3c0329..a252d2c0987 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -45,8 +45,8 @@ ifneq ($(TEST_VM_OPTS), )
 endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
-    KEYWORDS := JOBS TIMEOUT, \
-    STRING_KEYWORDS := VM_OPTIONS, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR, \
+    STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
 ))
 
 # Helper function to propagate TEST_OPTS values.
@@ -103,6 +103,31 @@ endif
 GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTEST_LAUNCHER_DIRS)))
 
+################################################################################
+# Setup global test running parameters
+################################################################################
+
+# Each factor variable comes in 3 variants. The first one is reserved for users
+# to use on command line. The other two are for predifined configurations in JDL
+# and for machine specific configurations respectively.
+TEST_JOBS_FACTOR ?= 1
+TEST_JOBS_FACTOR_JDL ?= 1
+TEST_JOBS_FACTOR_MACHINE ?= 1
+
+ifeq ($(TEST_JOBS), 0)
+  # Concurrency based on min(cores / 2, 12) * TEST_JOBS_FACTOR
+  TEST_JOBS := $(shell $(AWK) \
+    'BEGIN { \
+      c = $(NUM_CORES) / 2; \
+      if (c > 12) c = 12; \
+      c = c * $(TEST_JOBS_FACTOR); \
+      c = c * $(TEST_JOBS_FACTOR_JDL); \
+      c = c * $(TEST_JOBS_FACTOR_MACHINE); \
+      if (c < 1) c = 1; \
+      printf "%.0f", c; \
+    }')
+endif
+
 ################################################################################
 # Parse control variables
 ################################################################################
@@ -110,16 +135,19 @@ GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTE
 ifneq ($(TEST_OPTS), )
   # Inform the user
   $(info Running tests using TEST_OPTS control variable '$(TEST_OPTS)')
-
-  $(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
-  $(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
-
-  $(eval $(call SetTestOpt,JOBS,JTREG))
-  $(eval $(call SetTestOpt,TIMEOUT,JTREG))
 endif
 
+$(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
+$(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
+$(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
+$(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
+
+$(eval $(call SetTestOpt,JOBS,JTREG))
+$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
+
 $(eval $(call ParseKeywordVariable, JTREG, \
-    KEYWORDS := JOBS TIMEOUT TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM \
+        EXTRA_PROBLEM_LISTS KEYWORDS, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \
 ))
 
@@ -129,8 +157,8 @@ ifneq ($(JTREG), )
 endif
 
 $(eval $(call ParseKeywordVariable, GTEST, \
-    KEYWORDS := REPEAT, \
-    STRING_KEYWORDS := OPTIONS VM_OPTIONS, \
+    SINGLE_KEYWORDS := REPEAT, \
+    STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS, \
 ))
 
 ifneq ($(GTEST), )
@@ -143,17 +171,6 @@ endif
 # Component-specific Jtreg settings
 ################################################################################
 
-ifeq ($(TEST_JOBS), 0)
-  # If TEST_JOBS is not specified, hotspot fallback default is
-  # min(num_cores / 2, 12).
-  hotspot_JTREG_JOBS := $(shell $(EXPR) $(NUM_CORES) / 2)
-  ifeq ($(hotspot_JTREG_JOBS), 0)
-    hotspot_JTREG_JOBS := 1
-  else ifeq ($(shell $(EXPR) $(hotspot_JTREG_JOBS) \> 12), 1)
-    hotspot_JTREG_JOBS := 12
-  endif
-endif
-
 hotspot_JTREG_MAX_MEM := 0
 hotspot_JTREG_ASSERT := false
 hotspot_JTREG_NATIVEPATH := $(TEST_IMAGE_DIR)/hotspot/jtreg/native
@@ -165,6 +182,8 @@ langtools_JTREG_PROBLEM_LIST += $(TOPDIR)/test/langtools/ProblemList.txt
 nashorn_JTREG_PROBLEM_LIST += $(TOPDIR)/test/nashorn/ProblemList.txt
 hotspot_JTREG_PROBLEM_LIST += $(TOPDIR)/test/hotspot/jtreg/ProblemList.txt
 
+langtools_JTREG_MAX_MEM := 768m
+
 ################################################################################
 # Parse test selection
 #
@@ -368,15 +387,16 @@ define SetupRunGtestTestBody
     $1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT)
   endif
 
-  run-test-$1:
+  run-test-$1: $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
-	         -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
-	         --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
-	         $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
+	        -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
+	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
+	        $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
+	        $$($1_GTEST_JAVA_OPTIONS) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
@@ -447,12 +467,11 @@ define SetupRunJtregTestBody
 
   $1_TEST_NAME := $$(strip $$(patsubst jtreg:%, %, $$($1_TEST)))
 
-  $1_COMPONENT := \
+  $1_TEST_ROOT := \
       $$(strip $$(foreach root, $$(JTREG_TESTROOTS), \
-        $$(if $$(filter $$(root)%, $$(JTREG_TOPDIR)/$$($1_TEST_NAME)), \
-          $$(lastword $$(subst /, $$(SPACE), $$(root))) \
-        ) \
+        $$(if $$(filter $$(root)%, $$(JTREG_TOPDIR)/$$($1_TEST_NAME)), $$(root)) \
       ))
+  $1_COMPONENT := $$(lastword $$(subst /, $$(SPACE), $$($1_TEST_ROOT)))
   # This will work only as long as just hotspot has the additional "jtreg" directory
   ifeq ($$($1_COMPONENT), jtreg)
     $1_COMPONENT := hotspot
@@ -475,11 +494,12 @@ define SetupRunJtregTestBody
   $$(eval $$(call SetJtregValue,$1,JTREG_BASIC_OPTIONS))
   $$(eval $$(call SetJtregValue,$1,JTREG_PROBLEM_LIST))
 
+  # Only the problem list for the current test root should be used.
+  $1_JTREG_PROBLEM_LIST := $$(filter $$($1_TEST_ROOT)%, $$($1_JTREG_PROBLEM_LIST))
+
   ifneq ($(TEST_JOBS), 0)
-    # User has specified TEST_JOBS, use that as fallback default
     $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(TEST_JOBS)))
   else
-    # Use JOBS as default (except for hotspot)
     $$(eval $$(call SetJtregValue,$1,JTREG_JOBS,$$(JOBS)))
   endif
 
@@ -487,7 +507,7 @@ define SetupRunJtregTestBody
   # we may end up with a lot of JVM's
   $1_JTREG_MAX_RAM_PERCENTAGE := $$(shell $$(EXPR) 25 / $$($1_JTREG_JOBS))
 
-  JTREG_TIMEOUT ?= 4
+  JTREG_TIMEOUT_FACTOR ?= 4
   JTREG_VERBOSE ?= fail,error,summary
   JTREG_RETAIN ?= fail,error
 
@@ -498,10 +518,10 @@ define SetupRunJtregTestBody
 
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT) \
+      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
 
-  $1_JTREG_BASIC_OPTIONS += -automatic -keywords:\!ignore -ignore:quiet
+  $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
 
   # Make it possible to specify the JIB_DATA_DIR for tests using the
   # JIB Artifact resolver
@@ -531,6 +551,14 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$($1_JTREG_PROBLEM_LIST))
   endif
 
+  ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
+    # Accept both absolute paths as well as relative to the current test root.
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix -exclude:, $$(wildcard \
+        $$(JTREG_EXTRA_PROBLEM_LISTS) \
+        $$(addprefix $$($1_TEST_ROOT)/, $$(JTREG_EXTRA_PROBLEM_LISTS)) \
+    ))
+  endif
+
   ifneq ($$(JIB_HOME), )
     $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
   endif
@@ -541,10 +569,21 @@ define SetupRunJtregTestBody
     $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
   endif
 
+  ifneq ($$(JTREG_KEYWORDS), )
+    # The keywords string may contain problematic characters and may be quoted
+    # already when it arrives here. Remove any existing quotes and replace them
+    # with one set of single quotes.
+    $1_JTREG_KEYWORDS := \
+        $$(strip $$(subst $$(SQUOTE),,$$(subst $$(DQUOTE),,$$(JTREG_KEYWORDS))))
+    ifneq ($$($1_JTREG_KEYWORDS), )
+      $1_JTREG_BASIC_OPTIONS += -k:'$$($1_JTREG_KEYWORDS)'
+    endif
+  endif
+
   clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 
-  run-test-$1: clean-workdir-$1
+  run-test-$1: clean-workdir-$1 $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
@@ -631,7 +670,7 @@ define SetupRunSpecialTestBody
     $$(error Invalid special test specification: $$($1_TEST_NAME))
   endif
 
-  run-test-$1:
+  run-test-$1: $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 2660e766e25..ff9e8be1dc7 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -49,10 +49,11 @@ TOPDIR := $(strip $(patsubst %/make/, %, $(dir $(makefile_path))))
 # given.
 # Note: No spaces are allowed around the arguments.
 #
-# $1: The name of the argument
+# $1: The name of the variable
 # $2: The default value, if any, or OPTIONAL (do not provide a default but
 #     do not exit if it is missing)
 # $3: If NO_CHECK, disable checking for target file/directory existence
+#     If MKDIR, create the default directory
 define SetupVariable
   ifeq ($$($1), )
     ifeq ($2, )
@@ -75,10 +76,17 @@ define SetupVariable
   endif
   # If $1 has a value (is not optional), and $3 is not set (to NO_CHECK),
   # and if wildcard is empty, then complain that the file is missing.
-  ifeq ($$(strip $$(if $$($1), , OPTIONAL) $$(wildcard $$($1)) $3), )
-    $$(info Error: Prebuilt variable $1 points to missing file/directory:)
-    $$(info '$$($1)')
-    $$(error Cannot continue.)
+  ifeq ($3, MKDIR)
+    ifneq ($$(findstring $$(LOG), info debug trace), )
+      $$(info Creating directory for $1)
+    endif
+    $$(shell mkdir -p $$($1))
+  else ifneq ($3, NO_CHECK)
+    ifeq ($$(strip $$(if $$($1), , OPTIONAL) $$(wildcard $$($1))), )
+      $$(info Error: Prebuilt variable $1 points to missing file/directory:)
+      $$(info '$$($1)')
+      $$(error Cannot continue.)
+    endif
   endif
 endef
 
@@ -106,14 +114,14 @@ endef
 # Verify that user has given correct additional input.
 
 # These variables are absolutely necessary
-$(eval $(call SetupVariable,OUTPUTDIR))
+$(eval $(call SetupVariable,OUTPUTDIR,$(TOPDIR)/build/run-test-prebuilt,MKDIR))
 $(eval $(call SetupVariable,BOOT_JDK))
 $(eval $(call SetupVariable,JT_HOME))
 
 # These can have default values based on the ones above
 $(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
 $(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
-$(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols))
+$(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK))
 
 # Provide default values for tools that we need
 $(eval $(call SetupVariable,MAKE,make,NO_CHECK))
@@ -202,8 +210,8 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   ifeq ($(wildcard $(TEST_IMAGE_DIR)/bin/fixpath.exe), )
-    $$(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)')
-    $$(error Cannot continue.)
+    $(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)')
+    $(error Cannot continue.)
   endif
   FIXPATH := $(TEST_IMAGE_DIR)/bin/fixpath.exe -c
   PATH_SEP:=;
@@ -214,15 +222,17 @@ endif
 
 # Check number of cores
 ifeq ($(OPENJDK_TARGET_OS), linux)
-    NUM_CORES := $(shell $(CAT) /proc/cpuinfo  | $(GREP) -c processor)
+  NUM_CORES := $(shell $(CAT) /proc/cpuinfo  | $(GREP) -c processor)
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
-    NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu)
+  NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu)
 else ifeq ($(OPENJDK_TARGET_OS), solaris)
-    NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line)
+  NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
-    NUM_CORES := $(NUMBER_OF_PROCESSORS)
-else
-    NUM_CORES := 1
+  NUM_CORES := $(NUMBER_OF_PROCESSORS)
+endif
+ifeq ($(NUM_CORES), )
+  $(warn Could not find number of CPUs, assuming 1)
+  NUM_CORES := 1
 endif
 
 ################################################################################
@@ -276,9 +286,6 @@ run-test-prebuilt:
 	@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
-	@if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
-	  exit 1 ; \
-	fi
 
 all: run-test-prebuilt
 
diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index fd76562e7e1..200ab32c144 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -124,7 +124,7 @@ JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
 JARSIGNER := $(FIXPATH) $(JARSIGNER_CMD)
 
-BUILD_JAVA := $(JAVA)
+BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
 # Some common tools. Assume most common name and no path.
 AWK := awk
@@ -172,3 +172,13 @@ UNZIP := unzip
 EXPR := expr
 FILE := file
 HG := hg
+
+# On Solaris gnu versions of some tools are required.
+ifeq ($(OPENJDK_BUILD_OS), solaris)
+  AWK := gawk
+  GREP := ggrep
+  EGREP := ggrep -E
+  FGREP := grep -F
+  SED := gsed
+  TAR := gtar
+endif
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index d511836f097..170c3ed0da0 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -842,7 +842,7 @@ endef
 # Parameter 1 is the name of the rule, and is also the name of the variable.
 #
 # Remaining parameters are named arguments. These include:
-#   KEYWORDS          A list of valid keywords
+#   SINGLE_KEYWORDS   A list of valid keywords with single string values
 #   STRING_KEYWORDS   A list of valid keywords, processed as string. This means
 #       that '%20' will be replaced by ' ' to allow for multi-word strings.
 #
@@ -856,7 +856,7 @@ define ParseKeywordVariableBody
       $$(eval mangled_part_eval := $$(call DoubleDollar, $$(mangled_part))) \
       $$(eval part := $$$$(subst ||||,$$$$(SPACE),$$$$(mangled_part_eval))) \
       $$(eval $1_NO_MATCH := true) \
-      $$(foreach keyword, $$($1_KEYWORDS), \
+      $$(foreach keyword, $$($1_SINGLE_KEYWORDS), \
         $$(eval keyword_eval := $$(call DoubleDollar, $$(keyword))) \
         $$(if $$(filter $$(keyword)=%, $$(part)), \
           $$(eval $(strip $1)_$$$$(keyword_eval) := $$$$(strip $$$$(patsubst $$$$(keyword_eval)=%, %, $$$$(part)))) \
@@ -871,11 +871,11 @@ define ParseKeywordVariableBody
         ) \
       ) \
       $$(if $$($1_NO_MATCH), \
-        $$(if $$(filter $$(part), $$($1_KEYWORDS) $$($1_STRING_KEYWORDS)), \
+        $$(if $$(filter $$(part), $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS)), \
           $$(info Keyword $$(part) for $1 needs to be assigned a value.) \
         , \
           $$(info $$(part) is not a valid keyword for $1.) \
-          $$(info Valid keywords: $$($1_KEYWORDS) $$($1_STRING_KEYWORDS).) \
+          $$(info Valid keywords: $$($1_SINGLE_KEYWORDS) $$($1_STRING_KEYWORDS).) \
         ) \
         $$(error Cannot continue) \
       ) \
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index a3285c234fb..6e7e1439582 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -755,16 +755,15 @@ var getJibProfilesProfiles = function (input, common, data) {
         "run-test-prebuilt": {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
-            src: "src.conf",
             dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
-                testedProfile + ".test", "src.full"
+                testedProfile + ".test"
             ],
-            work_dir: input.get("src.full", "install_path") + "/test",
+            src: "src.conf",
+            make_args: [ "run-test-prebuilt", "LOG_CMDLINES=true" ],
             environment: {
-                "JT_JAVA": common.boot_jdk_home,
-                "PRODUCT_HOME": input.get(testedProfile + ".jdk", "home_path"),
-                "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path"),
-                "TEST_OUTPUT_DIR": input.src_top_dir
+                "BOOT_JDK": common.boot_jdk_home,
+                "JDK_IMAGE_DIR": input.get(testedProfile + ".jdk", "home_path"),
+                "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path")
             },
             labels: "test"
         }
@@ -802,13 +801,34 @@ var getJibProfilesProfiles = function (input, common, data) {
         windowsRunTestPrebuiltExtra = {
             dependencies: [ testedProfile + ".jdk_symbols" ],
             environment: {
-                "PRODUCT_SYMBOLS_HOME": input.get(testedProfile + ".jdk_symbols", "home_path"),
+                "SYMBOLS_IMAGE_DIR": input.get(testedProfile + ".jdk_symbols", "home_path"),
             }
         };
         profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"],
             windowsRunTestPrebuiltExtra);
     }
 
+    // The profile run-test-prebuilt defines src.conf as the src bundle. When
+    // running in Mach 5, this reduces the time it takes to populate the
+    // considerably. But with just src.conf, we cannot actually run any tests,
+    // so if running from a workspace with just src.conf in it, we need to also
+    // get src.full as a dependency, and define the work_dir (where make gets
+    // run) to be in the src.full install path. By running in the install path,
+    // the same cached installation of the full src can be reused for multiple
+    // test tasks. Care must however be taken not to polute that work dir by
+    // setting the appropriate make variables to control output directories.
+    //
+    // Use the existance of the top level README as indication of if this is
+    // the full source or just src.conf.
+    if (!new java.io.File(__DIR__, "../../README").exists()) {
+        var runTestPrebuiltSrcFullExtra = {
+            dependencies: "src.full",
+            work_dir: input.get("src.full", "install_path"),
+        }
+        profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"],
+            runTestPrebuiltSrcFullExtra);
+    }
+
     // Generate the missing platform attributes
     profiles = generatePlatformAttributes(profiles);
     profiles = generateDefaultMakeTargetsConfigureArg(common, profiles);
@@ -835,7 +855,7 @@ var getJibProfilesDependencies = function (input, common) {
                     : "gcc7.3.0-Fedora27+1.0"),
         linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0
                     ? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0"
-                    : (input.profile.indexOf("arm32") >= 0
+                    : (input.profile != null && input.profile.indexOf("arm32") >= 0
                        ? "gcc7.3.0-Fedora27+1.0"
                        : "arm-linaro-4.7+1.0"
                        )
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopy.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopy.java
index 91c09a05acb..4ad0ff80c80 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopy.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestArrayCopy.java
@@ -33,7 +33,7 @@
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  *
- * @run main/othervm
+ * @run main/othervm/timeout=300
  *        -Xbootclasspath/a:.
  *        -XX:+UnlockDiagnosticVMOptions
  *        -XX:+WhiteBoxAPI
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
index 3ba1127bb4d..e17fa343021 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
@@ -34,5 +34,6 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
+ * @run main/othervm/timeout=300 compiler.graalunit.common.GraalUnitTestLauncher
+ *     -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
  */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
index 874e697d047..86e09fe10e0 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
@@ -34,5 +34,6 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
+ * @run main/othervm/timeout=300 compiler.graalunit.common.GraalUnitTestLauncher
+ *     -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
  */
diff --git a/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java b/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java
index 7fdd282033d..f41f883597f 100644
--- a/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java
+++ b/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java
@@ -25,7 +25,7 @@
  * @test
  * @library /test/lib /
  *
- * @run driver compiler.jsr292.ContinuousCallSiteTargetChange
+ * @run driver/timeout=300 compiler.jsr292.ContinuousCallSiteTargetChange
  */
 
 package compiler.jsr292;
diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java
index 1328f583031..ecb4da0b137 100644
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationApp.java
@@ -116,10 +116,10 @@ public class InstrumentationApp {
         System.out.println("INFO: AppCDSv1 " + (wb.isSharedClass(InstrumentationApp.class) ? "enabled" :"disabled"));
         System.out.println("INFO: AppCDSv2 " + (isAppCDSV2Enabled()                        ? "enabled" : "disabled"));
 
-        File bootJar = new File(args[0]);
-        File appJar  = new File(args[1]);
-        File custJar = new File(args[2]);
-        String flagFile = args[3];
+        String flagFile = args[0];
+        File bootJar = new File(args[1]);
+        File appJar  = new File(args[2]);
+        File custJar = new File(args[3]);
         waitAttach(flagFile);
 
         instrumentation = InstrumentationRegisterClassFileTransformer.getInstrumentation();
diff --git a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java
index 8ee5803fd4c..b1ce6dabbd5 100644
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java
@@ -120,7 +120,7 @@ public class InstrumentationTest {
                 "-XX:+WhiteBoxAPI",
                 "-Xshare:off",
                 agentCmdArg,
-                "InstrumentationApp", bootJar, appJar, custJar, flagFile);
+                "InstrumentationApp", flagFile, bootJar, appJar, custJar);
         TestCommon.executeAndLog(pb, "no-sharing").shouldHaveExitValue(0);
         checkAttach(t);
 
@@ -155,7 +155,7 @@ public class InstrumentationTest {
                 "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:+WhiteBoxAPI",
                 agentCmdArg,
-               "InstrumentationApp", bootJar, appJar, custJar, flagFile);
+               "InstrumentationApp", flagFile, bootJar, appJar, custJar);
 
         CDSOptions opts = (new CDSOptions()).setXShareMode("auto");
         TestCommon.checkExec(out, opts);
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 1d1d23c7ad9..f5fcea91fd9 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
@@ -50,7 +50,7 @@
  * @build vm.mlvm.share.ClassfileGeneratorTest
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm
+ * @run main/othervm/timeout=300
  *      vm.mlvm.share.ClassfileGeneratorTest
  *      -generator vm.mlvm.cp.share.GenManyIndyCorrectBootstrap
  */
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 e82f7881fff..df8f5f83b53 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
@@ -51,7 +51,7 @@
  * @build vm.mlvm.share.ClassfileGeneratorTest
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm
+ * @run main/othervm/timeout=300
  *      vm.mlvm.share.ClassfileGeneratorTest
  *      -generator vm.mlvm.cp.share.GenManyIndyIncorrectBootstrap
  */
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 132267c067f..afbcea913e3 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
@@ -50,6 +50,6 @@
  * @build vm.mlvm.share.ClassfileGeneratorTest
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm vm.mlvm.share.ClassfileGeneratorTest -generator vm.mlvm.cp.share.GenCPFullOfMH
+ * @run main/othervm/timeout=300 vm.mlvm.share.ClassfileGeneratorTest -generator vm.mlvm.cp.share.GenCPFullOfMH
  */
 
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 18155a3ffd1..b50296fcdea 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
@@ -50,6 +50,6 @@
  * @build vm.mlvm.share.ClassfileGeneratorTest
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm vm.mlvm.share.ClassfileGeneratorTest -generator vm.mlvm.cp.share.GenCPFullOfMT
+ * @run main/othervm/timeout=300 vm.mlvm.share.ClassfileGeneratorTest -generator vm.mlvm.cp.share.GenCPFullOfMT
  */
 
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 5d0a916af0d..0630b3b896e 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
@@ -50,7 +50,7 @@
  * @build vm.mlvm.meth.stress.gc.createLotsOfMHConsts.Test
  * @run driver vm.mlvm.share.IndifiedClassesBuilder
  *
- * @run main/othervm
+ * @run main/othervm/timeout=300
  *      vm.mlvm.meth.stress.gc.createLotsOfMHConsts.Test
  *      -stressIterationsFactor 100000
  *      -generator vm.mlvm.cp.share.GenCPFullOfMH
diff --git a/test/jdk/tools/jimage/JImageExtractTest.java b/test/jdk/tools/jimage/JImageExtractTest.java
index 3b636e698fa..4895fdf218e 100644
--- a/test/jdk/tools/jimage/JImageExtractTest.java
+++ b/test/jdk/tools/jimage/JImageExtractTest.java
@@ -27,7 +27,7 @@
  * @library /test/lib
  * @modules jdk.jlink/jdk.tools.jimage
  * @build jdk.test.lib.Asserts
- * @run main/othervm JImageExtractTest
+ * @run main/othervm/timeout=300 JImageExtractTest
  */
 
 import java.io.IOException;

From ace36f9ac36a7aee9f1810cd5337d45dd879ed9b Mon Sep 17 00:00:00 2001
From: Jiangli Zhou 
Date: Mon, 15 Oct 2018 15:21:54 -0400
Subject: [PATCH 117/124] 8211956: AppCDS crashes for some uses with JRuby

Make sure FileMapInfo::verify_mapped_heap_regions only verifies 'num' of spaces.

Reviewed-by: iklam
---
 src/hotspot/share/memory/filemap.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/memory/filemap.cpp b/src/hotspot/share/memory/filemap.cpp
index 16eb8c692dd..0381756af19 100644
--- a/src/hotspot/share/memory/filemap.cpp
+++ b/src/hotspot/share/memory/filemap.cpp
@@ -1088,8 +1088,8 @@ bool FileMapInfo::map_heap_data(MemRegion **heap_mem, int first,
 }
 
 bool FileMapInfo::verify_mapped_heap_regions(int first, int num) {
-  for (int i = first;
-           i <= first + num; i++) {
+  assert(num > 0, "sanity");
+  for (int i = first; i < first + num; i++) {
     if (!verify_region_checksum(i)) {
       return false;
     }

From a0e02d649c2c4d7a4ce546349d20f77882815553 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev 
Date: Mon, 15 Oct 2018 22:30:32 +0200
Subject: [PATCH 118/124] 8212178: Soft reference reclamation race in
 com.sun.xml.internal.stream.util.ThreadLocalBufferAllocator

Reviewed-by: rkennke, kbarrett, joehw
---
 .../util/ThreadLocalBufferAllocator.java      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
index a1d71f182c2..5ac6c39d255 100644
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,15 +39,19 @@ import java.lang.ref.*;
  * @author Santiago PericasGeertsen
  */
 public class ThreadLocalBufferAllocator {
-   private static ThreadLocal> tlba = new ThreadLocal<>();
+    private static final ThreadLocal> TL = new ThreadLocal<>();
 
-   public static BufferAllocator getBufferAllocator() {
-        SoftReference bAllocatorRef = tlba.get();
-        if (bAllocatorRef == null || bAllocatorRef.get() == null) {
-            bAllocatorRef = new SoftReference<>(new BufferAllocator());
-            tlba.set(bAllocatorRef);
+    public static BufferAllocator getBufferAllocator() {
+        BufferAllocator ba = null;
+        SoftReference sr = TL.get();
+        if (sr != null) {
+            ba = sr.get();
         }
-
-        return bAllocatorRef.get();
-   }
+        if (ba == null) {
+            ba = new BufferAllocator();
+            sr = new SoftReference<>(ba);
+            TL.set(sr);
+        }
+        return ba;
+    }
 }

From 6352b5f64d0c9892ae9b1c109d070d4f40ae8803 Mon Sep 17 00:00:00 2001
From: Abdul Kolarkunnu 
Date: Wed, 3 Oct 2018 23:00:32 -0700
Subject: [PATCH 119/124] 8209499: Create test for SwingSet EditorPaneDemo

Reviewed-by: serb
---
 .../SwingSet/src/EditorPaneDemoTest.java      | 184 ++++++++++++++++++
 .../demos/editorpane/EditorPaneDemo.java      | 150 ++++++++++++++
 .../swingset3/demos/editorpane/book/CREDITS   |   2 +
 .../demos/editorpane/book/Octavo/ant.jpg      | Bin 0 -> 41161 bytes
 .../demos/editorpane/book/Octavo/book.jpg     | Bin 0 -> 50766 bytes
 .../demos/editorpane/book/Octavo/bug.jpg      | Bin 0 -> 68393 bytes
 .../demos/editorpane/book/Octavo/bug2.jpg     | Bin 0 -> 50942 bytes
 .../demos/editorpane/book/Octavo/crest.jpg    | Bin 0 -> 42208 bytes
 .../demos/editorpane/book/Octavo/king.jpg     | Bin 0 -> 39225 bytes
 .../demos/editorpane/book/Octavo/micro.jpg    | Bin 0 -> 36282 bytes
 .../demos/editorpane/book/Octavo/seaweed.jpg  | Bin 0 -> 36616 bytes
 .../swingset3/demos/editorpane/book/ant.html  | 121 ++++++++++++
 .../swingset3/demos/editorpane/book/bug.html  | 128 ++++++++++++
 .../demos/editorpane/book/editorpane/back.jpg | Bin 0 -> 7801 bytes
 .../editorpane/book/editorpane/forward.jpg    | Bin 0 -> 8558 bytes
 .../editorpane/book/editorpane/header.jpg     | Bin 0 -> 22281 bytes
 .../demos/editorpane/book/index.html          |  41 ++++
 .../swingset3/demos/editorpane/book/king.html |  44 +++++
 .../demos/editorpane/book/preface.html        | 116 +++++++++++
 .../demos/editorpane/book/seaweed.html        |  62 ++++++
 .../demos/editorpane/book/title.html          |  37 ++++
 .../resources/EditorPaneDemo.properties       |   6 +
 .../resources/images/EditorPaneDemo.gif       | Bin 0 -> 194 bytes
 23 files changed, 891 insertions(+)
 create mode 100644 test/jdk/sanity/client/SwingSet/src/EditorPaneDemoTest.java
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/CREDITS
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/book.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/crest.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/king.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/micro.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/ant.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties
 create mode 100644 test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif

diff --git a/test/jdk/sanity/client/SwingSet/src/EditorPaneDemoTest.java b/test/jdk/sanity/client/SwingSet/src/EditorPaneDemoTest.java
new file mode 100644
index 00000000000..c9013a0bb23
--- /dev/null
+++ b/test/jdk/sanity/client/SwingSet/src/EditorPaneDemoTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import static com.sun.swingset3.demos.editorpane.EditorPaneDemo.DEMO_TITLE;
+import static com.sun.swingset3.demos.editorpane.EditorPaneDemo.SOURCE_FILES;
+import static org.jemmy2ext.JemmyExt.EXACT_STRING_COMPARATOR;
+
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeListener;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.swing.UIManager;
+
+import org.jemmy2ext.JemmyExt;
+import org.jtregext.GuiTestListener;
+import org.netbeans.jemmy.ClassReference;
+import org.netbeans.jemmy.image.ImageTool;
+import org.netbeans.jemmy.operators.JEditorPaneOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import com.sun.swingset3.demos.editorpane.EditorPaneDemo;
+
+/*
+ * @test
+ * @key headful
+ * @summary Verifies SwingSet3 EditorPaneDemo by navigating and and validating
+ *  the page contents in all pages
+ *
+ * @library /sanity/client/lib/jemmy/src
+ * @library /sanity/client/lib/Extensions/src
+ * @library /sanity/client/lib/SwingSet3/src
+ * @modules java.desktop
+ *          java.logging
+ * @build org.jemmy2ext.JemmyExt
+ * @build com.sun.swingset3.demos.editorpane.EditorPaneDemo
+ * @run testng/timeout=600 EditorPaneDemoTest
+ */
+@Listeners(GuiTestListener.class)
+public class EditorPaneDemoTest {
+
+    private final static String PROPERTY_NAME_PAGE = "page";
+    private final static String INDEX_PAGE_NAME = "index.html";
+    private final static String TEXT_IN_INDEX_PAGE = "Octavo Corporation";
+    private final static Dimension INDEX_IMAGE_DIMENSION = new Dimension(550, 428);
+    private final static Dimension imageDimensions[] = {new Dimension(320, 342),
+            new Dimension(420, 290), new Dimension(381, 384),
+            new Dimension(316, 498), new Dimension(481 ,325),
+            new Dimension(516, 445)};
+    private final static String REFERENCE_NAMES[] =
+        {"title", "king", "preface", "seaweed", "ant", "bug"};
+    private final static String TEXTS_IN_PAGES[] =
+        {"Physiological Descriptions", "ROBERT HOOKE",
+                "Mankind above other Creatures", "Area A B C D",
+                "Observ. XLIX", "Cylinder F F F"};
+    private final AtomicReference newPageURL = new AtomicReference<>();
+
+    /**
+     * Testing the navigation through all html pages in EditorPaneDemo by
+     * clicking on different references and validating the page contents.
+     *
+     * @throws Exception
+     */
+    @Test(dataProvider = "availableLookAndFeels", dataProviderClass = TestHelpers.class)
+    public void test(String lookAndFeel) throws Exception {
+        UIManager.setLookAndFeel(lookAndFeel);
+        new ClassReference(EditorPaneDemo.class.getCanonicalName()).startApplication();
+
+        JFrameOperator frameOperator = new JFrameOperator(DEMO_TITLE);
+        frameOperator.setComparator(EXACT_STRING_COMPARATOR);
+        PropertyChangeListener pageChangeListener =
+                event -> newPageURL.set((URL) event.getNewValue());
+        JEditorPaneOperator editorPaneOperator = new JEditorPaneOperator(frameOperator);
+
+        try {
+            editorPaneOperator.addPropertyChangeListener(
+                    PROPERTY_NAME_PAGE, pageChangeListener);
+            // Validation of initial or index page
+            URL indexURL = getPageURL(INDEX_PAGE_NAME);
+            editorPaneOperator.waitStateOnQueue(comp
+                    -> indexURL.equals(editorPaneOperator.getPage()));
+            checkImage(editorPaneOperator, INDEX_IMAGE_DIMENSION, INDEX_PAGE_NAME);
+            checkTextPresence(editorPaneOperator, TEXT_IN_INDEX_PAGE);
+
+            // Clicking on different references and validating pages by selecting
+            // unique texts in each page
+            for (int i = 0; i < REFERENCE_NAMES.length; i++) {
+                editorPaneOperator.clickOnReference(REFERENCE_NAMES[i]);
+                validatePage(editorPaneOperator, i);
+            }
+        } finally {
+            editorPaneOperator.removePropertyChangeListener(
+                    PROPERTY_NAME_PAGE, pageChangeListener);
+        }
+    }
+
+    private void checkTextPresence(
+            JEditorPaneOperator editorPaneOperator, String text) {
+        editorPaneOperator.selectText(text);
+        editorPaneOperator.waitStateOnQueue(comp
+                -> text.equals(editorPaneOperator.getSelectedText()));
+    }
+
+    private void validatePage(JEditorPaneOperator editorPaneOperator,
+            int i) throws Exception {
+        URL expectedPageURL = getPageURL(REFERENCE_NAMES[i] + ".html");
+        editorPaneOperator.waitStateOnQueue(comp
+                -> expectedPageURL.equals(newPageURL.get()));
+        checkImage(editorPaneOperator, imageDimensions[i], REFERENCE_NAMES[i]);
+        checkTextPresence(editorPaneOperator, TEXTS_IN_PAGES[i]);
+    }
+
+    private void checkImage(JEditorPaneOperator editorPaneOperator,
+            Dimension imageDim, String pageName) throws Exception {
+        // Captures image screen shot and checking some 10 pixels from inner
+        // area of the image are not default background color
+        Point compLoc = editorPaneOperator.getLocationOnScreen();
+        Insets insets = editorPaneOperator.getInsets();
+        Rectangle imageRect = new Rectangle(new Point(compLoc.x + insets.left,
+                compLoc.y + insets.top), imageDim);
+        final int xGap = 100, yGap = 40, columns = 2, rows = 5;
+        editorPaneOperator.waitState(comp -> {
+            BufferedImage capturedImage = ImageTool.getImage(imageRect);
+            int x = 0, y = 0, i = 0, j;
+            for (; i < columns; i++) {
+                x += xGap;
+                y = 0;
+                for (j = 0; j < rows; j++) {
+                    y += yGap;
+                    if(capturedImage.getRGB(x, y) ==
+                            editorPaneOperator.getBackground().getRGB()) {
+                        // saving image for failure case
+                        JemmyExt.save(capturedImage, "capturedimage_" + pageName + "_" +
+                                UIManager.getLookAndFeel().getClass().getSimpleName() + ".png");
+                        return false;
+                    }
+                }
+            }
+            return true;
+        });
+    }
+
+    /**
+     * Gets the URL corresponding to a page name
+     *
+     * @param pageName : name of the page
+     * @return : URL corresponding to page
+     */
+    private URL getPageURL(String pageName) {
+        String url = null;
+        for (String sourceFile : SOURCE_FILES) {
+            if(sourceFile.endsWith(pageName)) {
+                url = sourceFile;
+            }
+        }
+        return getClass().getResource(url);
+    }
+}
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java
new file mode 100644
index 00000000000..62703393075
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/EditorPaneDemo.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.swingset3.demos.editorpane;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLFrameHyperlinkEvent;
+
+import com.sun.swingset3.DemoProperties;
+
+/**
+ * EditorPane Demo (was HTMLDemo in SwingSet2)
+ */
+@DemoProperties(
+        value = "JEditorPane Demo",
+        category = "Text",
+        description = "Demonstrates JEditorPane, a text component which supports display and editing of rich text formats (such as HTML)",
+        sourceFiles = {
+                "com/sun/swingset3/demos/editorpane/EditorPaneDemo.java",
+                "com/sun/swingset3/demos/editorpane/book/ant.html",
+                "com/sun/swingset3/demos/editorpane/book/bug.html",
+                "com/sun/swingset3/demos/editorpane/book/index.html",
+                "com/sun/swingset3/demos/editorpane/book/king.html",
+                "com/sun/swingset3/demos/editorpane/book/preface.html",
+                "com/sun/swingset3/demos/editorpane/book/seaweed.html",
+                "com/sun/swingset3/demos/editorpane/book/title.html",
+                "com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg",
+                "com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg",
+                "com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/book.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/bug.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/COPYRIGHT",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/crest.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/king.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/micro.jpg",
+                "com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg",
+                "com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties",
+                "com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif"
+                }
+)
+public class EditorPaneDemo extends JPanel {
+
+    public static final String DEMO_TITLE = EditorPaneDemo.class.getAnnotation(DemoProperties.class).value();
+    public static final String[] SOURCE_FILES = EditorPaneDemo.class.getAnnotation(DemoProperties.class).sourceFiles();
+    private JEditorPane html;
+
+    /**
+     * main method allows us to run as a standalone demo.
+     */
+    public static void main(String[] args) {
+        JFrame frame = new JFrame(EditorPaneDemo.class.getAnnotation(DemoProperties.class).value());
+
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.getContentPane().add(new EditorPaneDemo());
+        frame.setPreferredSize(new Dimension(800, 600));
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    /**
+     * EditorPaneDemo Constructor
+     */
+    public EditorPaneDemo() {
+        setLayout(new BorderLayout());
+
+        try {
+            URL url;
+            // System.getProperty("user.dir") +
+            // System.getProperty("file.separator");
+            String path = null;
+            try {
+                path = "book/index.html";
+                url = getClass().getResource(path);
+            } catch (Exception e) {
+                System.err.println("Failed to open " + path);
+                url = null;
+            }
+
+            if (url != null) {
+                html = new JEditorPane(url);
+                html.setEditable(false);
+                html.addHyperlinkListener(createHyperLinkListener());
+
+                JScrollPane scroller = new JScrollPane();
+                JViewport vp = scroller.getViewport();
+                vp.add(html);
+                add(scroller, BorderLayout.CENTER);
+            }
+        } catch (MalformedURLException e) {
+            System.out.println("Malformed URL: " + e);
+        } catch (IOException e) {
+            System.out.println("IOException: " + e);
+        }
+    }
+
+    private HyperlinkListener createHyperLinkListener() {
+        return new HyperlinkListener() {
+            public void hyperlinkUpdate(HyperlinkEvent e) {
+                if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+                    if (e instanceof HTMLFrameHyperlinkEvent) {
+                        ((HTMLDocument) html.getDocument()).processHTMLFrameHyperlinkEvent(
+                                (HTMLFrameHyperlinkEvent) e);
+                    } else {
+                        try {
+                            html.setPage(e.getURL());
+                        } catch (IOException ioe) {
+                            System.out.println("IOE: " + ioe);
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/CREDITS b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/CREDITS
new file mode 100644
index 00000000000..a65454a93c5
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/CREDITS
@@ -0,0 +1,2 @@
+Images and text in the SwingSet3 EditorPane demo are used by permission of Octavo
+Corporation and are sourced from Rare Book Room (rarebookroom.org).
\ No newline at end of file
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/ant.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5ec735079fb340e68f97cb610cb9a0ddd3107766
GIT binary patch
literal 41161
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
    NaW!_=|Hq;njJ=0!?k)4
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�yoU%~NqN&yQR-ax@=GtdrOFu
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
    64v@oUn*{|G_@?1LSF>Bz+7)mKU~q2E
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
z
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

literal 0
HcmV?d00001

diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/bug2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..18adf731f643b237eace1dd497f55cea7159f1d8
GIT binary patch
literal 50942
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
    km
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≪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
    Yzy!g`!)kl)!eQSK2J
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	(mVV@)G?J$etY?b$)!7BfhCEh87?EY
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

literal 0
HcmV?d00001

diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/Octavo/seaweed.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..340bae3671b24524dd349c11fee91364661986ad
GIT binary patch
literal 36616
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
+
+Untitled Document
+
+
+
+
+
+

    
+  Observ. XLIX. Of an Ant or Pismire.
    
+
    
+
     
    
+
     
+  
    
+   
    This was a creature, more troublesom to be drawn, then any 
+      of the rest, for I could not, for a good while, think of a way to make it 
+      suffer its body to ly quiet in a natural posture; but whil'st it was alive,
+      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body, 
+      that I could not any wayes get a good view of it; and if I killed it, its 
+      body was so little, that I did often spoile the shape of it, before I could 
+      throughly view it: for this is the nature of these minute Bodies, that as 
+      soon, almost, as ever their life is destroy'd, their parts immediately shrivel, 
+      and lose their beauty; and so is it also with small Plants, as I instanced 
+      before, in the description of Moss. 
    
+    
    And thence also is the reason of the variations in the beards 
+      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding 
+      small, those small variations which are made in the surfaces of all bodies, 
+      almost upon every change of Air, especially if the body be porous, do here 
+      become sensible, where the whole body is so small, that it is almost nothing 
+      but surface; for as in vegetable substances, I see no great reason to think, 
+      that the moisture of the Aire (that, sticking to a wreath'd beard, does make 
+      it untwist) should evaporate, or exhale away, any faster then the moisture 
+      of other bodies, but rather that the avolation from, or access of moisture 
+      to, the surfaces of bodies being much the same, those bodies become most 
+      sensible of it, which have the least proportion of body to their surface. 
+      
    
+    
    So is it also with Animal substances; the dead body of an 
+      Ant, or such little creature, does almost instantly shrivel and dry, and 
+      your object shall be quite another thing, before you can half delineate 
+      it, which proceeds not from the extraordinary exhalation, but from the small 
+      proportion of body and juices, to the usual drying of bodies in the Air, 
+      especially if warm. 
    
+    
    For which inconvenience, where I could not otherwise remove 
+      it, I thought of this expedient. I took the creature, I had design'd to delineate, 
+      and put it into a drop of very well rectified spirit of Wine, this I found 
+      would presently dispatch, as it were, the Animal, and being taken out of 
+      it, and lay'd on a paper,the spirit of Wine would immediately fly away, 
+      and leave the Animal dry, in its natural posture, or at least, in a constitution, 
+      that it might easily with a pin be plac'd, in what posture you desired to 
+      draw it, and the limbs would so remain, without either moving, or shriveling. 
+      
    
+    
    And thus I dealt with this Ant, which I have here delineated, 
+      which was one of many, of a very large kind, that inhabited under the Roots 
+      of a Tree, from whence they would sally out in great parties, and make most 
+      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back 
+      again very expertly, by the same wayes and paths they went. 
    
+    
    It was more then half the bigness of an Earwig, of a dark 
+      brown, or reddish colour, with long legs, on the hinder of which it would 
+      stand up, and raise its head as high as it could above the ground, that it 
+      might stare the further about it, just after the same manner as I have also 
+      observ'd a hunting Spider to do: and putting my finger towards them, they 
+      have at first all run towards it, till almost at it; and then they would stand 
+      round about it, at a certain distance, and smell, as it were, and consider 
+      whether they should any of them venture any further, till one more bold then 
+      the rest venturing to climb it, all the rest, if I would have suffered them, 
+      would have immediately followed : much such other seemingly rational actions 
+      I have observ'd in this little Vermine with much pleasure, which would be 
+      too long to be here related; those that desire more of them may satisfie 
+      their curiosity in Ligons History of the Barbadoes. 
    
+    
    Having insnar'd several of these into a small Box, I made 
+      choice of the tallest grown among them, and separating it from the rest, 
+      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd 
+      him down dead drunk, so that he became moveless, though at first putting 
+      in he struggled for a pretty while very much, till at last, certain bubbles 
+      issuing out of his mouth, it ceased to move; this (because I had before found 
+      them quickly to recover again, if they were taken out presently) I suffered 
+      to lye above an hour in the Spirit; and after I had taken it out, and put 
+      its body and legs into a natural posture, remained moveless about an hour; 
+      but then, upon a sudden, as if it had been awaken out of a drunken sleep, 
+      it suddenly reviv'd and ran away; being caught, and serv'd as before, he 
+      for a while continued struggling and striving, till at last there issued 
+      several bubbles out of its mouth, and then, tanquam animam expirasset, he 
+      remained moveless for a good while ; but at length again recovering, it was 
+      again redipt, and suffered to lye some hours in the Spirit; notwithstanding 
+      which, after it had layen dry some three or four hours, it again recovered 
+      life and motion: Which kind of Experiments, if prosecuted, which they highly 
+      deserve, seem to me of no inconsiderable use towards the invention of the 
+      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture 
+      of Bodies. 
    
+    
    Of what Figure this Creature appear'd through the Microscope, 
+      the 32. Scheme (though not so carefully graven as it ought) will represent 
+      to the eye, namely, That it had a large head A A, at the upper end of which 
+      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B; 
+      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently 
+      differing from those of a blew Fly, though indeed they seem to be both the 
+      same kind of Organ, and to serve for a kind of smelling; beyond these were 
+      two indented jaws D D, which he open'd sideways, and was able to gape them 
+      asunder very wide; and the ends of them being armed with teeth, which meeting 
+      went between each other, it was able to grasp and hold a heavy body, three 
+      or four times the bulk and weight of its own body: It had only six legs, 
+      shap'd like those of a Fly, which, as I shewed before, is an Argument that 
+      it is a winged Insect, and though I could not perceive any sign of them in 
+      the middle part of its body (which seem'd to consist of three joints or pieces 
+      E F G, out of which sprung two legs, yet 'tis known that there are of them 
+      that have long wings, and fly up and down in the air. 
    
+    
    The third and last part of its body I I I was bigger and 
+      larger then the other two, unto which it was joyn'd by a very small middle, 
+      and had a kind of loose shell, or another distinct part of its body H, which 
+      seem'd to be interpos'd, and to keep the thorax and belly from touching. 
+      The whole body was cas'd over with a very strong armour, and the belly I 
+      I I was covered likewise with multitudes of small white shining brisles; 
+      the legs, horns, head, and middle parts of its body were bestruck with hairs 
+      also, but smaller and darker. 
    
+  
    
+  
     
    
+  
    
+  
     
    
+  
     
    
+
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html
new file mode 100644
index 00000000000..5ac05e9f3b6
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/bug.html
@@ -0,0 +1,128 @@
+
+
+Untitled Document
+
+
+
+
+
+
    
+
    Observ. LIV. Of a Louse.
    
+
    
+
     
    
+
     
+  
     
+    
    This is a Creature so officious, that 'twill be known to 
+      every one at one time or other, so busie, and so impudent, that it will 
+      be intruding it self in every ones company, and so proud and aspiring withall, 
+      that it fears not to trample on the best, and affects nothing so much as 
+      a Crown; feeds and lives very high, and that makes it so saucy, as to pull 
+      any one by the ears that comes in its way, and will never be quiet till 
+      it has drawn blood: it is troubled at nothing so much as at a man that scratches 
+      his head, as knowing that man is plotting and contriving some mischief against 
+      it, and that makes it oftentime sculk into some meaner and lower place, and 
+      run behind a mans back, though it go very much against the hair; which ill 
+      conditions of it having made it better known then trusted, would exempt me 
+      from making any further description of it, did not my faithful Mercury, my 
+      Microscope, bring me other information of it. 
    
+    
    For this has discovered to me, by means of a very bright light 
+      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd 
+      like that exprest in 35. Scheme marked with A, which seems almost Conical, 
+      but is a little flatted on the upper and under sides, at the biggest part 
+      of which, on either side behind the head (as it were, being the place where 
+      other Creatures ears stand) are placed its two black shining goggle eyes 
+      B B, looking backwards, and fenced round with several small cilia or hairs 
+      that incompass it, so that it seems this Creature has no very good foresight: 
+      It does not seem to have any eyelids, and therefore perhaps its eyes were 
+      so placed, that it might the better cleanse them with its forelegs; and perhaps 
+      this may be the reason, why they so much avoid and run from the light behind 
+      them, for being made to live in the shady and dark recesses of the hair, 
+      and thence probably their eye having a great aperture, the open and clear 
+      light, especially that of the Sun, must needs very much offend them; to secure 
+      these eyes from receiving any injury from the hairs through which it passes, 
+      it has two horns that grow before it, in the place where one would have thought 
+      the eyes should be; each of these C C have four joynts, which are fringed, 
+      as 'twere, with small brisles, from which to the tip of its snout D, the 
+      head seems very round and tapering, ending in a very sharp nose D, which 
+      seems to have a small hole, and to be the passage through which he sucks 
+      the blood. 
    
+    
     
    
+    
    
+    
    Now whereas it if be plac'd on its back, with its belly 
+      upwards, as it is in the 35. Scheme, it seems in several Positions to have 
+      a resemblance of chaps, or jaws, as is represented in the Figure by E E, 
+      yet in other postures those dark strokes disappear; and having kept several 
+      of them in a box for two or three dayes, so that for all that time they had 
+      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately 
+      fell to sucking, and did neither seem to thrust its nose very deep into the 
+      skin, nor to open any kind of mouth, but I could plainly perceive a small 
+      current of blood, which came directly from its snout, and past into its belly; 
+      and about A there seem'd a contrivance, somewhat resembling a Pump, pair 
+      of Bellows, or Heart, for by a very swift systole and diastole the blood 
+      seem'd drawn from the nose, and forced into the body. 
    
+    
    It did not seem at all, though I viewed it a good while as 
+      it was sucking, to thrust more of its nose into the skin then the very snout 
+      D, nor did it cause the least discernable pain, and yet the blood seem'd 
+      to run through its head very quick and freely, so that it seems there is 
+      no part of the skin but the blood is dispers'd into, nay, even into the 
+      cuticula; for had it thrust its whole nose in from D to C C, it would not 
+      have amounted to the supposed thickness of that tegument, the length of 
+      the nose being not more then a three hundredth part of an inch. 
    
+    
    It has six legs, covered with a very transparent shell, 
+      and joynted exactly like a Crab's, or Lobster's; each leg is divided into 
+      six parts by these joynts, and those have here and there several small hairs; 
+      and at the end of each leg it has two claws, very properly adapted for its 
+      peculiar use, being thereby inabled to walk very securely both on the skin 
+      and hair; and indeed this contrivance of the feet is very curious, and could 
+      not be made more commodiously and compendiously, for performing both these 
+      requisite motions, of walking and climbing up the hair of a mans head, then 
+      it is : for, by having the lesser claw (a) set so much short of the bigger 
+      (b) when it walks on the skin the shorter touches not, and then the feet 
+      are the same with those of a Mite, and several other small Insects, but by 
+      means of the small joynts of the longer claw it can bend it round, and so 
+      with both claws take hold of a hair, in the manner represented in the Figure, 
+      the long transparent Cylinder F F F, being a Man's hair held by it. 
    
+    
    The Thorax seem'd cas'd with another kind of substance then 
+      the belly, namely, with a thin transparent horny substance, which upon the fasting 
+      of the Creature did not grow flaccid; through this I could plainly see the 
+      blood, suck'd from my hand, to be variously distributed, and mov'd to and 
+      fro; and about G there seem'd a pretty big white substance, which seem'd 
+      to be moved within its thorax; besides, there appear'd very many small milk-white 
+      vessels, which crost over the breast between the legs, out of which, on 
+      either side, are many small branchings, these seem'd to be the veins and 
+      arteries, for that which is analogus to blood in all Insects is milk-white. 
+      
    
+    
    The belly is covered with a transparent substance likewise, 
+      but more resembling a skin then a shell, for 'tis grain'd all over the belly 
+      just like the skin in the palms of a man's hand, and when the belly is empty, 
+      grows very flaccid and wrinkled ; at the upper end of this is placed the 
+      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas, 
+      which by the peristaltick motion of the guts, is a little mov'd to and fro, 
+      not with a systole and diastole, but rather with a thronging or justling 
+      motion. 
    
+    
    Viewing one of these Creatures, after it had fasted two 
+      dayes, all the hinder part was lank and flaccid, and the white spot I I 
+      hardly mov'd, most of the white branchings disappear'd, and most also of 
+      the redness or sucked blood in the guts, the peristaltick motion of which 
+      was scarce discernable; but upon the suffering it to suck, it presently 
+      fill'd the skin of the belly, and of the six scolop'd embosments on either side, 
+      as full as it could be stuft ; the stomach and guts were as full as they 
+      could hold; the peristaltick motion of the gut grew quick, and the justling 
+      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly 
+      filled, and turgid, which were perhaps the veins and arteries, and the Creature 
+      was so greedy, that though it could not contain more, yet it continued sucking 
+      as fast as ever, and as fast emptying it self behind : the digestion of this 
+      Creature must needs be very quick, for though I perceiv'd the blood thicker 
+      and blacker when suck'd, yet, when in the guts, it was of a very lovely 
+      ruby colour, and that part of it, which was digested into the veins, seemed 
+      white; whence it appears, that a further digestion of blood may make it 
+      milk, at least of a resembling colour : What is else observable in the figure 
+      of this Creature, maybe seen by the 35. Scheme.
    
+    
    
+  
     
    
+  
    
+  
     
    
+  
     
    
+
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/back.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eb20ab7d6b152080554867774c11459a62ca0b5b
GIT binary patch
literal 7801
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

literal 0
HcmV?d00001

diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/forward.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..465b99672861f1786e924644bdabab73b456e36a
GIT binary patch
literal 8558
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
F_+MghlLP<&

literal 0
HcmV?d00001

diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/editorpane/header.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d69cc0f1f28baf7f017bd0d4c52815b9523f92cd
GIT binary patch
literal 22281
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

literal 0
HcmV?d00001

diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html
new file mode 100644
index 00000000000..72e2c1a85d7
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/index.html
@@ -0,0 +1,41 @@
+
+
+Untitled Document
+
+
+
+
+
     
    
+
    
+
     
    
+
     
    
+
    
+  
    Title Page
    
+  
    To The King
    
+  
    The Preface
    
+  
    Of the curious texture of Sea-weeds
    
+  
    Of an Ant or Pismire
    
+  
    Of a Louse 
    
+    
    
+    
    
+  
    
+  
    Images and text used by permission of Octavo 
+    Corporation (www.octavo.com),
    
+        (c) 1999 Octavo Corporation. All 
+    rights reserved. 
    
+    
    
+    
    
+    Octavo Corporation is a publisher of rare 
+    books and manuscripts with digital tools and formats through partnerships 
+    with libraries, museums, and individuals. Using high-resolution digital imaging 
+    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files 
+    which can be viewed on and printed from almost any computing platform. You 
+    can view each page and the binding on your computer screen, zoom in to view 
+    detail up to 800% in some cases, and search, copy and paste the "live" text 
+    placed invisibly behind the page images which is available for selected Editions. 
+    Also included in each edition is the work's collation and provenance, as well 
+    as commentary by a noted expert in its field. 
    
+
    
+
     
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html
new file mode 100644
index 00000000000..599606e0ce8
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/king.html
@@ -0,0 +1,44 @@
+
+
+Untitled Document
+
+
+
+
+ 
+
     
    
+
     Do here most humbly lay this small Present at Your 
+  Majesties Royal feet. And though it comes accompany'd with two disadvantages, 
+  the meanness of the Author, and of the Subject; yet in both I am incouraged 
+  by the greatness of your Mercy and your Knowledge. 
+
    By the one I am taught , that you can forgive the most presumptuous 
+    Offendors: And by the other, that you will not esteem the least work of Nature, 
+    or Art, unworthy your Observation. 
    
+  
    Amidst the many felicities that have accompani'd your Majesties 
+    happy Restauration and Government, it is none of the least considerable, that 
+    Philosophy and Experimental Learning have prosper'd under your Royal Patronage.
    
+  
    And as the calm prosperity of your Reign has given us the 
+    leisure to follow these Studies of quiet and retirement, so it is just, that 
+    the Fruits of them should, by way of acknowledgement, be return'd to your 
+    Majesty. There are, Sir, several other of your Subjects, of your Royal Society, 
+    now busie about Nobler matters: The Improvement of Manufactures and Agriculture, 
+    the Increase of Commerce, the Advantage of Navigation: In all which they are 
+    assisted by your Majesties Incouragement and Example. 
    
+  
    Amidst all those greater Designs, I here presume to bring 
+    in that which is more proportionable to the smalness of my Abilities, and 
+    to offer some of the least of all visible things, to that Mighty King, that 
+    has establisht an Empire over the best of all Invisible things of this World, 
+    the Minds o f Men.
    
+  
    
+    
     
    
+  
    
+  
    Your Majesties most humble
    
+  
     and most obedient
    
+  
     Subject and Servant,
    
+  
     
    
+  
    ROBERT HOOKE .
    
+  
     
    
+  
    
+
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html
new file mode 100644
index 00000000000..6318c113b2d
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/preface.html
@@ -0,0 +1,116 @@
+
+
+Untitled Document
+
+
+
+
+
+
    
+  
     
    
+  
    THE PREFACE
    
+ 
    
+
     
+  
     
    
+  
     
    
+
    
+
     
+  
    
+    
     It is the great prerogative of Mankind above 
+      other Creatures, that we are not only able to behold the works of Nature, 
+      or barely to sustein our lives by them, but we have also the power of considering, 
+      comparing, altering, assisting, and improving them to various uses. 
    
+    
    And as this is the peculiar priviledge of humane Nature 
+      in general, so is it capable of being so far advanced by the helps of Art, 
+      and Experience, as to make some Men excel others in their Observations, 
+      and Deductions, almost as much as they do Beasts. 
    
+    
    By the addition of such artificial Instruments and methods, 
+      there may be, in some manner, a reparation made for the mischiefs, and imperfection, 
+      mankind has drawn upon itself, by negligence, and intemperance, and a wilful 
+      and superstitious deserting the Prescripts and Rules of Nature, whereby 
+      every man, both from a deriv'd corruption, innate and born with him, and 
+      from his breeding and converse with men, is very subject to slip into all 
+      sorts of errors. 
    
+    
    The only way which now remains for us to recover some degree 
+      of those former perfections, seems to be, by rectifying the operations of 
+      the Sense, the Memory, and Reason, since upon the evidence, the strength, 
+      the integrity, and the right correspondence of all these, all the light, 
+      by which our actions are to be guided, is to be renewed, and all our command 
+      over things is to be establisht.
    
+    
     It is therefore most worthy of our consideration, to recollect 
+      their several defects, that so we may the better understand how to supply 
+      them, and by what assistances we may inlarge their power, and secure them 
+      in performing their particular duties.
    
+    
    As for the actions of our Senses, we cannot but observe 
+      them to be in many particulars much outdone by those of other Creatures, 
+      and when at best, to be far short of the perfection they seem capable of 
+      : And these infirmities of the Senses arise from a double cause, either 
+      from the disproportion of the Object to the Organ, whereby an infinite number 
+      of things can never enter into them, or else from error in the Perception, 
+      that many things, which come within their reach, are not received in a right 
+      manner. 
    
+    
    The like frailties are to be found in the Memory; we often 
+      let many things slip away from us, which deserve to be retain'd; and of 
+      those which we treasure up, a great part is either frivolous or false ; 
+      and if good, and substantial, either in tract of time obliterated, or at 
+      best so overwhelmed and buried under more frothy notions, that when there 
+      is need of them, they are in vain sought for. 
    
+    
    The two main foundations being so deceivable, it is no wonder, 
+      that all the succeeding works which we build upon them, of arguing, concluding, 
+      defining, judging, and all the other degrees of Reason, are lyable to the 
+      same imperfection, being, at best, either vain, or uncertain: So that the 
+      errors of the understanding are answerable to the two other, being defective 
+      both in the quantity and goodness of its knowledge; for the limits, to which 
+      our thoughts are confind, are small in respect of the vast extent of Nature 
+      it self; some parts of it are too large to be comprehended, and some too 
+      little to be perceived. 
    
+    
    And from thence it must follow, that not having a full sensation 
+      of the Object, we must be very lame and imperfect in our conceptions about 
+      it, and in all the propositions which we build upon it; hence we often take 
+      the shadow of things for the substance, small appearances for good similitudes, 
+      similitudes for definitions; and even many of those, which we think to be 
+      the most solid definitions, are rather expressions of our own misguided 
+      apprehensions then of the true nature of the things themselves. 
    
+    
    The effects of these imperfections are manifested in different 
+      ways, according to the temper and disposition of the several minds of men, 
+      some they incline to gross ignorance and stupidity, and others to a presumptuous 
+      imposing on other mens Opinions, and a confident dogmatizing on matters, 
+      whereof there is no assurance to be given. 
    
+    
    Thus all the uncertainty, and mistakes of humane actions, 
+      proceed either from the narrowness and wandring of our Senses, from the 
+      slipperiness or delusion of our Memory, from the confinement or rashness 
+      of our Understanding, so that 'tis no wonder, that our power over natural 
+      causes and effects is so slowly improvd, seeing we are not only to contend 
+      with the obscurity and difficulty of the things whereon we work and think, 
+      but even the forces of our own minds conspire to betray us. 
    
+    
    These being the dangers in the process of humane Reason, 
+      the remedies of them all can only proceed from the real, the mechanical, 
+      the experimental Philosophy, which has this advantage over the Philosophy 
+      of discourse and disputation, that whereas that chiefly aims at the subtilty 
+      of its Deductions and Conclusions, without much regard to the first groundwork, 
+      which ought to be well laid on the Sense and Memory ; so this intends the 
+      right ordering of them all, and the making them serviceable to each other. 
+      
    
+    
    The first thing to be undertaken in this weighty work, is 
+      a watchfulness over the failings and an inlargement of the dominion, of 
+      the Senses. To which end it is requisite, first, That there should be a 
+      scrupulous choice, and a strict examination, of the reality, constancy, 
+      and certainty of the Particulars that we admit: This is the first rise whereon 
+      truth is to begin, and here the most severe, and most impartial diligence, 
+      must be imployed ; the storing up of all, without any regard to evidence 
+      or use, will only tend to darkness and confusion. 
    
+    
    We must not therefore esteem the riches of our Philosophical 
+      treasure by the number only, but chiefly by the weight; the most vulgar 
+      Instances are not to be neglected, but above all, the most instructive are 
+      to be entertain'd: the footsteps of Nature are to be trac'd, not only in 
+      her ordinary course,but when she seems to be put to her shifts, to make 
+      many doublings and turnings, and to use some kind of art in indeavouring 
+      to avoid our discovery. 
    
+    
     
    
+    
    
+    
     
    
+    
     
    
+  
    
+
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html
new file mode 100644
index 00000000000..1aeaeadaf6f
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/seaweed.html
@@ -0,0 +1,62 @@
+
+
+Untitled Document
+
+
+
+
+
+

    
+  Observ. XXIII. Of the curious texture of Sea-weeds.
    
+
    
+
     
    
+
    
+  
    For curiosity and beauty, I have not among all the Plants 
+    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed 
+    I have here describ'd, of which I am able to say very little more then what 
+    is represented by the second Figure of the ninth Scheme: Namely, that it is 
+    a Plant which grows upon the Rocks under the water, and increases and spreads 
+    it self into a great tuft, which is not onely handsomely branch'd into several 
+    leaves, but the whole surface of the Plant is cover'd over with a most curious 
+    kind of carv'd work, which consists of a texture much resembling a Honeycomb; 
+    for the whole surface on both sides is cover'd over with a multitude of very 
+    small holes, being no bigger then so many holes made with the point of a small 
+    Pinn, and rang'd in the neatest and most delicate order imaginable, they being 
+    plac'd in the manner of a Quincunx, or very much like the rows of the eyes 
+    of a Fly, the rows or orders being very regular, which way soever they are 
+    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying 
+    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which 
+    round Area A B C D represents a part of the surface about one eighth part 
+    of an Inch in Diameter: Those little holes, which to the eye look'd round, 
+    like so many little spots, here appear'd very regularly shap'd holes, representing 
+    almost the shape of the sole of a round toed shoe, the hinder part of which, 
+    is, as it were, trod on or cover'd by the toe of that next below it; these 
+    holes seem'd wall'd about with a very thin and transparent substance, looking 
+    of a pale straw-colour; from the edge of which, against the middle of each 
+    hole, were sprouted out four small transparent straw-colour'd Thorns, which 
+    seem'd to protect and cover those cavities, from either side two; neer the 
+    root of this Plant, were sprouted out several small branches of a kind of 
+    bastard Coralline, curiously branch'd, though small. 
    
+  
    And to confirm this, having lately the opportunity of viewing 
+    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made 
+    mention in the last Observation, I found, that each of the Branches or Figures 
+    of it, did, by the range of its pores, exhibit just such a texture, the rows 
+    of pores crossing one another, much after the manner as the rows of eyes do 
+    which are describ'd in the 26. Scheme : Coralline also, and several sorts of 
+    white Coral, I have with a Microscope observ'd very curiously shap'd. And 
+    I doubt not, but that he that shall observe these several kinds of Plants that 
+    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others 
+    which are vomited out of it upon the shore, may find multitudes of little 
+    Plants, and other bodies, which like this will afford very beautifull objects 
+    for the Microscope ; and this Specimen here is adjoin'd onely to excite their 
+    curiosities who have opportunity of observing to examine and collect what 
+    they find worthy their notice; for the Sea, among terrestrial bodies, is also 
+    a prolifick mother, and affords as many Instances of spontaneous generations 
+    as either the Air or Earth.
    
+  
     
    
+  
    
+  
     
    
+  
     
    
+
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html
new file mode 100644
index 00000000000..b83e4d3813f
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/book/title.html
@@ -0,0 +1,37 @@
+
+
+Untitled Document
+
+
+
+
+
+

    
+  MICROGRAPHIA:     
    
+
    OR SOME 
    
+
    Physiological Descriptions 
    
+
    O F
    
+
     MINUTE BODIES
    
+
     MADE BY 
    
+
    MAGNIFYING GLASSES. 
    
+
    WITH 
    
+
    OBSERVATIONS and INQUIRIES 
+  thereupon.
    
+
     By R. HOOKE 
+  , Fellow of the ROYAL SOCIETY .
    
+
     
+  
     
+    
     
+      
    LONDON, Printed by Jo. 
+        Martyn, and Ja. Allestry, 
+        Printers to the ROYAL SOCIETY , and are to 
+        be sold at their Shop at the Bell in S. Paul's Church-yard. M 
+        D C L X V.
    
+      

    
+        
    
+    
    
+    
    
+  
    
+
    
+
+
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties
new file mode 100644
index 00000000000..fa2a38f64fe
--- /dev/null
+++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/EditorPaneDemo.properties
@@ -0,0 +1,6 @@
+### Html Demo ###
+
+EditorPaneDemo.accessible_description=This demo shows how to display html text using the JEditorPane component.
+EditorPaneDemo.tooltip=JEditorPane HTML demo
+EditorPaneDemo.name=JEditorPane HTML Demo
+EditorPaneDemo.filename=swing.html
diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/editorpane/resources/images/EditorPaneDemo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ce007e2e5816832cf9b47ee665cf3373c1d0a3b0
GIT binary patch
literal 194
zcmZ?wbhEHbRA5kGSoELa|NsAI&YVe0o0*oD#=yXE;J^VO2?UBiSr{1@7#Vax9FSTE
z=5~o)cmCxyXs%%0dhg`ZNiiCIOO`jJteVBRYMdeO27l`c_f$^#kFonzI!*7rw7LVq2WkmC$!l!T9s?bMu~GSehVT
uS0r7oT3A}y)!h}_k>%YqVWRJ3;kc|B$+P0;#2D$iELyCSzKoxf!5RSQ>QVOq

literal 0
HcmV?d00001


From d7c7ce19f196c9c3d3042ab955231cd64239215a Mon Sep 17 00:00:00 2001
From: Jean Christophe Beyler 
Date: Mon, 15 Oct 2018 14:16:35 -0700
Subject: [PATCH 120/124] 8211980: Remove ThreadHeapSampler
 enable/disable/enabled methods

Remove methods from ThreadHeapSampler

Reviewed-by: dholmes, phh
---
 src/hotspot/share/gc/shared/memAllocator.cpp  |  4 +-
 src/hotspot/share/prims/jvmtiEnv.cpp          |  7 ---
 src/hotspot/share/runtime/mutexLocker.cpp     |  4 --
 src/hotspot/share/runtime/mutexLocker.hpp     |  1 -
 .../share/runtime/threadHeapSampler.cpp       | 61 ++++++-------------
 .../share/runtime/threadHeapSampler.hpp       | 18 +++---
 6 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/src/hotspot/share/gc/shared/memAllocator.cpp b/src/hotspot/share/gc/shared/memAllocator.cpp
index 08ab85a6119..6835ebaa907 100644
--- a/src/hotspot/share/gc/shared/memAllocator.cpp
+++ b/src/hotspot/share/gc/shared/memAllocator.cpp
@@ -187,7 +187,7 @@ void MemAllocator::Allocation::notify_allocation_jvmti_sampler() {
   // support for JVMTI VMObjectAlloc event (no-op if not enabled)
   JvmtiExport::vm_object_alloc_event_collector(obj());
 
-  if (!ThreadHeapSampler::enabled()) {
+  if (!JvmtiExport::should_post_sampled_object_alloc()) {
     // Sampling disabled
     return;
   }
@@ -282,7 +282,7 @@ HeapWord* MemAllocator::allocate_inside_tlab_slow(Allocation& allocation) const
   HeapWord* mem = NULL;
   ThreadLocalAllocBuffer& tlab = _thread->tlab();
 
-  if (ThreadHeapSampler::enabled()) {
+  if (JvmtiExport::should_post_sampled_object_alloc()) {
     // Try to allocate the sampled object from TLAB, it is possible a sample
     // point was put and the TLAB still has space.
     tlab.set_back_allocation_end();
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 5a4c02c0367..73be60f1d66 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -540,13 +540,6 @@ JvmtiEnv::SetEventNotificationMode(jvmtiEventMode mode, jvmtiEvent event_type, j
       record_class_file_load_hook_enabled();
     }
 
-    if (event_type == JVMTI_EVENT_SAMPLED_OBJECT_ALLOC) {
-      if (enabled) {
-        ThreadHeapSampler::enable();
-      } else {
-        ThreadHeapSampler::disable();
-      }
-    }
     JvmtiEventController::set_user_enabled(this, (JavaThread*) NULL, event_type, enabled);
   } else {
     // We have a specified event_thread.
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index f43113f21c1..59c524a8076 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -133,8 +133,6 @@ Monitor* Service_lock                 = NULL;
 Monitor* PeriodicTask_lock            = NULL;
 Monitor* RedefineClasses_lock         = NULL;
 
-Mutex*   ThreadHeapSampler_lock       = NULL;
-
 #if INCLUDE_JFR
 Mutex*   JfrStacktrace_lock           = NULL;
 Monitor* JfrMsg_lock                  = NULL;
@@ -301,8 +299,6 @@ void mutex_init() {
   def(PeriodicTask_lock            , PaddedMonitor, nonleaf+5,   true,  Monitor::_safepoint_check_sometimes);
   def(RedefineClasses_lock         , PaddedMonitor, nonleaf+5,   true,  Monitor::_safepoint_check_always);
 
-  def(ThreadHeapSampler_lock       , PaddedMutex,   nonleaf,     false, Monitor::_safepoint_check_never);
-
   if (WhiteBoxAPI) {
     def(Compilation_lock           , PaddedMonitor, leaf,        false, Monitor::_safepoint_check_never);
   }
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 9de409391e8..9a589b8179f 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -132,7 +132,6 @@ extern Mutex*   Management_lock;                 // a lock used to serialize JVM
 extern Monitor* Service_lock;                    // a lock used for service thread operation
 extern Monitor* PeriodicTask_lock;               // protects the periodic task structure
 extern Monitor* RedefineClasses_lock;            // locks classes from parallel redefinition
-extern Mutex*   ThreadHeapSampler_lock;          // protects the static data for initialization.
 
 #if INCLUDE_JFR
 extern Mutex*   JfrStacktrace_lock;              // used to guard access to the JFR stacktrace table
diff --git a/src/hotspot/share/runtime/threadHeapSampler.cpp b/src/hotspot/share/runtime/threadHeapSampler.cpp
index ac398fecaec..330223d48dc 100644
--- a/src/hotspot/share/runtime/threadHeapSampler.cpp
+++ b/src/hotspot/share/runtime/threadHeapSampler.cpp
@@ -29,22 +29,29 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/threadHeapSampler.hpp"
 
-// Cheap random number generator
+// Cheap random number generator.
 uint64_t ThreadHeapSampler::_rnd;
 // Default is 512kb.
-int ThreadHeapSampler::_sampling_interval = 512 * 1024;
-int ThreadHeapSampler::_enabled;
+volatile int ThreadHeapSampler::_sampling_interval = 512 * 1024;
 
-// Statics for the fast log
-static const int FastLogNumBits = 10;
-static const int FastLogMask = (1 << FastLogNumBits) - 1;
-static double log_table[1<(i+0.5) / (1 << FastLogNumBits))
+                    / log(2.0));
+  }
+  return true;
+}
 
 // Returns the next prng value.
 // pRNG is: aX+b mod c with a = 0x5DEECE66D, b =  0xB, c = 1<<48
 // This is the lrand64 generator.
-static uint64_t next_random(uint64_t rnd) {
+uint64_t ThreadHeapSampler::next_random(uint64_t rnd) {
   const uint64_t PrngMult = 0x5DEECE66DLL;
   const uint64_t PrngAdd = 0xB;
   const uint64_t PrngModPower = 48;
@@ -54,7 +61,7 @@ static uint64_t next_random(uint64_t rnd) {
   return (PrngMult * rnd + PrngAdd) & PrngModMask;
 }
 
-static double fast_log2(const double & d) {
+double ThreadHeapSampler::fast_log2(const double& d) {
   assert(d>0, "bad value passed to assert");
   uint64_t x = 0;
   assert(sizeof(d) == sizeof(x),
@@ -64,7 +71,9 @@ static double fast_log2(const double & d) {
   assert(FastLogNumBits <= 20, "FastLogNumBits should be less than 20.");
   const uint32_t y = x_high >> (20 - FastLogNumBits) & FastLogMask;
   const int32_t exponent = ((x_high >> 20) & 0x7FF) - 1023;
-  return exponent + log_table[y];
+
+  assert(_log_table_initialized, "log table should be initialized");
+  return exponent + _log_table[y];
 }
 
 // Generates a geometric variable with the specified mean (512K by default).
@@ -134,36 +143,6 @@ void ThreadHeapSampler::check_for_sampling(oop obj, size_t allocation_size, size
   pick_next_sample(overflow_bytes);
 }
 
-void ThreadHeapSampler::init_log_table() {
-  MutexLockerEx mu(ThreadHeapSampler_lock, Mutex::_no_safepoint_check_flag);
-
-  if (log_table_initialized) {
-    return;
-  }
-
-  for (int i = 0; i < (1 << FastLogNumBits); i++) {
-    log_table[i] = (log(1.0 + static_cast(i+0.5) / (1 << FastLogNumBits))
-                    / log(2.0));
-  }
-
-  log_table_initialized = true;
-}
-
-void ThreadHeapSampler::enable() {
-  // Done here to be done when things have settled. This adds a mutex lock but
-  // presumably, users won't be enabling and disabling all the time.
-  init_log_table();
-  OrderAccess::release_store(&_enabled, 1);
-}
-
-int ThreadHeapSampler::enabled() {
-  return OrderAccess::load_acquire(&_enabled);
-}
-
-void ThreadHeapSampler::disable() {
-  OrderAccess::release_store(&_enabled, 0);
-}
-
 int ThreadHeapSampler::get_sampling_interval() {
   return OrderAccess::load_acquire(&_sampling_interval);
 }
diff --git a/src/hotspot/share/runtime/threadHeapSampler.hpp b/src/hotspot/share/runtime/threadHeapSampler.hpp
index 2b89ffab567..d48c0d21e2c 100644
--- a/src/hotspot/share/runtime/threadHeapSampler.hpp
+++ b/src/hotspot/share/runtime/threadHeapSampler.hpp
@@ -30,16 +30,24 @@
 
 class ThreadHeapSampler {
  private:
+  // Statics for the fast log
+  static const int FastLogNumBits = 10;
+  static const int FastLogMask = (1 << FastLogNumBits) - 1;
+
   size_t _bytes_until_sample;
   // Cheap random number generator
   static uint64_t _rnd;
+  static bool _log_table_initialized;
+
+  static double _log_table[1<
Date: Mon, 15 Oct 2018 14:55:17 -0700
Subject: [PATCH 121/124] 8212083: Handle remaining gc/lock native code and fix
 two strings

Migrate code to using wrapping JNI for exceptions

Reviewed-by: phh, tschatzl
---
 .../lock/jni/BooleanArrayCriticalLocker.cpp   | 18 ++----
 .../gc/lock/jni/ByteArrayCriticalLocker.cpp   | 18 ++----
 .../gc/lock/jni/CharArrayCriticalLocker.cpp   | 18 ++----
 .../gc/lock/jni/DoubleArrayCriticalLocker.cpp | 18 ++----
 .../gc/lock/jni/FloatArrayCriticalLocker.cpp  | 18 ++----
 .../gc/lock/jni/IntArrayCriticalLocker.cpp    | 18 ++----
 .../gc/lock/jni/LongArrayCriticalLocker.cpp   | 18 ++----
 .../gc/lock/jni/ShortArrayCriticalLocker.cpp  | 18 ++----
 .../gc/lock/jni/StringCriticalLocker.cpp      | 18 ++----
 .../jni/libBooleanArrayCriticalLocker.cpp     |  1 +
 .../lock/jni/libByteArrayCriticalLocker.cpp   |  1 +
 .../lock/jni/libCharArrayCriticalLocker.cpp   |  1 +
 .../lock/jni/libDoubleArrayCriticalLocker.cpp |  1 +
 .../lock/jni/libFloatArrayCriticalLocker.cpp  |  1 +
 .../gc/lock/jni/libIntArrayCriticalLocker.cpp |  1 +
 .../lock/jni/libLongArrayCriticalLocker.cpp   |  1 +
 .../lock/jni/libShortArrayCriticalLocker.cpp  |  1 +
 .../gc/lock/jni/libStringCriticalLocker.cpp   |  1 +
 .../gc/lock/jniref/JNIGlobalRefLocker.cpp     |  2 +-
 .../gc/lock/jniref/JNILocalRefLocker.cpp      | 17 ++----
 .../nsk/share/gc/lock/jniref/JNIRefLocker.cpp | 19 ++-----
 .../gc/lock/jniref/JNIWeakGlobalRefLocker.cpp | 18 ++----
 .../gc/lock/jniref/libJNIGlobalRefLocker.cpp  |  2 +-
 .../gc/lock/jniref/libJNILocalRefLocker.cpp   |  1 +
 .../share/gc/lock/jniref/libJNIRefLocker.cpp  |  1 +
 .../lock/jniref/libJNIWeakGlobalRefLocker.cpp |  1 +
 .../nsk/share/jni/ExceptionCheckingJniEnv.cpp | 56 ++++++++++++++++++-
 .../nsk/share/jni/ExceptionCheckingJniEnv.hpp | 12 ++++
 28 files changed, 140 insertions(+), 160 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp
index 4623bb428e9..e3b247e0401 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jboolean JNICALL Java_nsk_share_gc_lock_jni_BooleanArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jbooleanArray arr;
         jboolean *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jboolean JNICALL Java_nsk_share_gc_lock_jni_BooleanArrayCriticalLocker
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return JNI_FALSE;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return JNI_FALSE;
-                }
         }
         arr = (jbooleanArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp
index b198dd43c22..21ec0a782d8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -34,7 +35,9 @@ static jfieldID objFieldId = NULL;
  * Method:    criticalNative
  */
 JNIEXPORT jbyte JNICALL Java_nsk_share_gc_lock_jni_ByteArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jbyteArray arr;
         jbyte *pa;
@@ -43,22 +46,11 @@ JNIEXPORT jbyte JNICALL Java_nsk_share_gc_lock_jni_ByteArrayCriticalLocker_criti
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jbyteArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return 0;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp
index 0ba7db227d9..51cf50fdcac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jchar JNICALL Java_nsk_share_gc_lock_jni_CharArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jcharArray arr;
         jchar *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jchar JNICALL Java_nsk_share_gc_lock_jni_CharArrayCriticalLocker_criti
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jcharArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         current_time = 0;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp
index cced91b8032..043d859e181 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jdouble JNICALL Java_nsk_share_gc_lock_jni_DoubleArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jdoubleArray arr;
         jdouble *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jdouble JNICALL Java_nsk_share_gc_lock_jni_DoubleArrayCriticalLocker_c
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jdoubleArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp
index 036185c4088..6254a5d1984 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jfloat JNICALL Java_nsk_share_gc_lock_jni_FloatArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jfloatArray arr;
         jfloat *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jfloat JNICALL Java_nsk_share_gc_lock_jni_FloatArrayCriticalLocker_cri
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jfloatArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp
index 55d7501697c..f4b891af9ee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jint JNICALL Java_nsk_share_gc_lock_jni_IntArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jintArray arr;
         jint *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jint JNICALL Java_nsk_share_gc_lock_jni_IntArrayCriticalLocker_critica
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jintArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp
index 6ca374e73c6..a35af071398 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jlong JNICALL Java_nsk_share_gc_lock_jni_LongArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jlongArray arr;
         jlong *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jlong JNICALL Java_nsk_share_gc_lock_jni_LongArrayCriticalLocker_criti
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jlongArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp
index 6346a15796b..8cac2a45f8b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jshort JNICALL Java_nsk_share_gc_lock_jni_ShortArrayCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jshortArray arr;
         jshort *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jshort JNICALL Java_nsk_share_gc_lock_jni_ShortArrayCriticalLocker_cri
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return 0;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return 0;
-                }
         }
         arr = (jshortArray) env->GetObjectField(o, objFieldId);
-        if (arr == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetArrayLength(arr);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp
index 7912692714e..c37bebf44cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,7 +36,9 @@ static jfieldID objFieldId = NULL;
  * Signature: ([Z)Z
  */
 JNIEXPORT jchar JNICALL Java_nsk_share_gc_lock_jni_StringCriticalLocker_criticalNative
-(JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+(JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jsize size, i;
         jstring str;
         const jchar *pa;
@@ -44,22 +47,11 @@ JNIEXPORT jchar JNICALL Java_nsk_share_gc_lock_jni_StringCriticalLocker_critical
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return JNI_FALSE;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return JNI_FALSE;
-                }
         }
         str = (jstring) env->GetObjectField(o, objFieldId);
-        if (str == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return JNI_FALSE;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         size = env->GetStringLength(str);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libBooleanArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libBooleanArrayCriticalLocker.cpp
index 76d22beac45..8a24440056f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libBooleanArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libBooleanArrayCriticalLocker.cpp
@@ -22,5 +22,6 @@
  */
 
 #include "BooleanArrayCriticalLocker.cpp"
+#include "ExceptionCheckingJniEnv.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libByteArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libByteArrayCriticalLocker.cpp
index 8af310a3e90..3b9fbb88f8e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libByteArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libByteArrayCriticalLocker.cpp
@@ -22,5 +22,6 @@
  */
 
 #include "ByteArrayCriticalLocker.cpp"
+#include "ExceptionCheckingJniEnv.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libCharArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libCharArrayCriticalLocker.cpp
index 9f38546e957..7dd8ce21cf9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libCharArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libCharArrayCriticalLocker.cpp
@@ -22,5 +22,6 @@
  */
 
 #include "CharArrayCriticalLocker.cpp"
+#include "ExceptionCheckingJniEnv.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libDoubleArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libDoubleArrayCriticalLocker.cpp
index 9377164bccc..02ab98d4c84 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libDoubleArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libDoubleArrayCriticalLocker.cpp
@@ -22,5 +22,6 @@
  */
 
 #include "DoubleArrayCriticalLocker.cpp"
+#include "ExceptionCheckingJniEnv.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libFloatArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libFloatArrayCriticalLocker.cpp
index 0db5d1eeccd..e7fc5920b3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libFloatArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libFloatArrayCriticalLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "FloatArrayCriticalLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libIntArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libIntArrayCriticalLocker.cpp
index ac8f5049e67..4df0687cbc4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libIntArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libIntArrayCriticalLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "IntArrayCriticalLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libLongArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libLongArrayCriticalLocker.cpp
index e790517159d..c7a8c5b5087 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libLongArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libLongArrayCriticalLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "LongArrayCriticalLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libShortArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libShortArrayCriticalLocker.cpp
index b17f0d1f6d1..541b11174a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libShortArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libShortArrayCriticalLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "ShortArrayCriticalLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libStringCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libStringCriticalLocker.cpp
index 80d120648b1..5cbea6e59c8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libStringCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/libStringCriticalLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "StringCriticalLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
index 8e7ab509c94..ead0f2139ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
@@ -24,8 +24,8 @@
 #include 
 #include 
 #include 
-#include "jni_tools.h"
 #include "ExceptionCheckingJniEnv.hpp"
+#include "jni_tools.h"
 
 extern "C" {
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp
index 85173d97bd1..9de1449fb77 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,28 +36,18 @@ static jfieldID objFieldId = NULL;
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNILocalRefLocker_criticalNative
-  (JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+  (JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jobject obj;
         jobject gref;
         time_t start_time, current_time;
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return;
-                }
         }
         obj = env->GetObjectField(o, objFieldId);
-        if (obj == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return;
-        }
         env->SetObjectField(o, objFieldId, NULL);
         start_time = time(NULL);
         enterTime /= 1000;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp
index 4ec63a5cffa..e0e483e4ba2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,29 +36,21 @@ static jfieldID objFieldId = NULL;
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNIRefLocker_criticalNative
-  (JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+  (JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jobject obj;
         jobject gref, lref, gwref;
         time_t start_time, current_time;
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return;
-                }
         }
+
         obj = env->GetObjectField(o, objFieldId);
-        if (obj == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         start_time = time(NULL);
         enterTime /= 1000;
         current_time = 0;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp
index 5b2457c682a..ff6c66bc1da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include "ExceptionCheckingJniEnv.hpp"
 #include "jni_tools.h"
 
 extern "C" {
@@ -35,29 +36,20 @@ static jfieldID objFieldId = NULL;
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNIWeakGlobalRefLocker_criticalNative
-  (JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
+  (JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
+        ExceptionCheckingJniEnvPtr env(jni_env);
+
         jobject obj;
         jobject gref;
         time_t start_time, current_time;
 
         if (objFieldId == NULL) {
                 jclass klass = env->GetObjectClass(o);
-                if (klass == NULL) {
-                        printf("Error: GetObjectClass returned NULL\n");
-                        return;
-                }
                 objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                if (objFieldId == NULL) {
-                        printf("Error: GetFieldID returned NULL\n");
-                        return;
-                }
         }
         obj = env->GetObjectField(o, objFieldId);
-        if (obj == NULL) {
-                printf("Error: GetObjectField returned NULL\n");
-                return;
-        }
         env->SetObjectField(o, objFieldId, NULL);
+
         start_time = time(NULL);
         enterTime /= 1000;
         current_time = 0;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp
index 2e02b2d395a..dc1b88320eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIGlobalRefLocker.cpp
@@ -21,7 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "JNIGlobalRefLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
-#include "ExceptionCheckingJniEnv.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNILocalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNILocalRefLocker.cpp
index 615e25924d4..c10eabbf67b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNILocalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNILocalRefLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "JNILocalRefLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIRefLocker.cpp
index 9856147ca28..b6f02e2c892 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIRefLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "JNIRefLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIWeakGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIWeakGlobalRefLocker.cpp
index 7cc53e8b2ec..a0318dd07da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIWeakGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/libJNIWeakGlobalRefLocker.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "ExceptionCheckingJniEnv.cpp"
 #include "JNIWeakGlobalRefLocker.cpp"
 #include "jni_tools.cpp"
 #include "nsk_tools.cpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
index 87a752d4f5e..8b37274eb8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
@@ -22,6 +22,8 @@
  * questions.
  */
 
+#include 
+
 #include "ExceptionCheckingJniEnv.hpp"
 
 namespace {
@@ -86,7 +88,7 @@ jclass ExceptionCheckingJniEnv::GetObjectClass(jobject obj) {
 }
 
 jfieldID ExceptionCheckingJniEnv::GetFieldID(jclass klass, const char *name, const char* type) {
-  JNIVerifier marker(this, "GetObjectClass");
+  JNIVerifier marker(this, "GetFieldID");
   return marker.ResultNotNull(_jni_env->GetFieldID(klass, name, type));
 }
 
@@ -101,7 +103,7 @@ void ExceptionCheckingJniEnv::SetObjectField(jobject obj, jfieldID field, jobjec
 }
 
 jobject ExceptionCheckingJniEnv::NewGlobalRef(jobject obj) {
-  JNIVerifier marker(this, "GetObjectField");
+  JNIVerifier marker(this, "NewGlobalRef");
   return marker.ResultNotNull(_jni_env->NewGlobalRef(obj));
 }
 
@@ -109,3 +111,53 @@ void ExceptionCheckingJniEnv::DeleteGlobalRef(jobject obj) {
   JNIVerifier<> marker(this, "DeleteGlobalRef");
   _jni_env->DeleteGlobalRef(obj);
 }
+
+jobject ExceptionCheckingJniEnv::NewLocalRef(jobject obj) {
+  JNIVerifier marker(this, "NewLocalRef");
+  return marker.ResultNotNull(_jni_env->NewLocalRef(obj));
+}
+
+void ExceptionCheckingJniEnv::DeleteLocalRef(jobject obj) {
+  JNIVerifier<> marker(this, "DeleteLocalRef");
+  _jni_env->DeleteLocalRef(obj);
+}
+
+jweak ExceptionCheckingJniEnv::NewWeakGlobalRef(jobject obj) {
+  JNIVerifier marker(this, "NewWeakGlobalRef");
+  return marker.ResultNotNull(_jni_env->NewWeakGlobalRef(obj));
+}
+
+void ExceptionCheckingJniEnv::DeleteWeakGlobalRef(jweak weak_ref) {
+  JNIVerifier<> marker(this, "DeleteWeakGlobalRef");
+  _jni_env->DeleteWeakGlobalRef(weak_ref);
+}
+
+jsize ExceptionCheckingJniEnv::GetArrayLength(jarray array) {
+  JNIVerifier<> marker(this, "GetArrayLength");
+  return _jni_env->GetArrayLength(array);
+}
+
+jsize ExceptionCheckingJniEnv::GetStringLength(jstring str) {
+  JNIVerifier<> marker(this, "GetStringLength");
+  return _jni_env->GetStringLength(str);
+}
+
+void* ExceptionCheckingJniEnv::GetPrimitiveArrayCritical(jarray array, jboolean* isCopy) {
+  JNIVerifier<> marker(this, "GetPrimitiveArrayCritical");
+  return marker.ResultNotNull(_jni_env->GetPrimitiveArrayCritical(array, isCopy));
+}
+
+void ExceptionCheckingJniEnv::ReleasePrimitiveArrayCritical(jarray array, void* carray, jint mode) {
+  JNIVerifier<> marker(this, "ReleasePrimitiveArrayCritical");
+  _jni_env->ReleasePrimitiveArrayCritical(array, carray, mode);
+}
+
+const jchar* ExceptionCheckingJniEnv::GetStringCritical(jstring str, jboolean* isCopy) {
+  JNIVerifier marker(this, "GetPrimitiveArrayCritical");
+  return marker.ResultNotNull(_jni_env->GetStringCritical(str, isCopy));
+}
+
+void ExceptionCheckingJniEnv::ReleaseStringCritical(jstring str, const jchar* carray) {
+  JNIVerifier<> marker(this, "ReleaseStringCritical");
+  _jni_env->ReleaseStringCritical(str, carray);
+}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp
index 5345ce7d419..14bdf14126a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.hpp
@@ -66,8 +66,20 @@ class ExceptionCheckingJniEnv {
   jobject GetObjectField(jobject obj, jfieldID field);
   void SetObjectField(jobject obj, jfieldID field, jobject value);
 
+  jsize GetArrayLength(jarray array);
+  jsize GetStringLength(jstring str);
+
+  void* GetPrimitiveArrayCritical(jarray array, jboolean* isCopy);
+  void ReleasePrimitiveArrayCritical(jarray array, void* carray, jint mode);
+  const jchar* GetStringCritical(jstring str, jboolean* isCopy);
+  void ReleaseStringCritical(jstring str, const jchar* carray);
+
   jobject NewGlobalRef(jobject obj);
   void DeleteGlobalRef(jobject obj);
+  jobject NewLocalRef(jobject ref);
+  void DeleteLocalRef(jobject ref);
+  jweak NewWeakGlobalRef(jobject obj);
+  void DeleteWeakGlobalRef(jweak obj);
 
   // ExceptionCheckingJniEnv methods.
   JNIEnv* GetJNIEnv() {

From ffc26adbea513c71baf2c308a36313973cf3d069 Mon Sep 17 00:00:00 2001
From: David Holmes 
Date: Mon, 15 Oct 2018 21:02:17 -0400
Subject: [PATCH 122/124] 8048215: [TESTBUG]
 java/lang/management/ManagementFactory/ThreadMXBeanProxy.java Expected
 non-null LockInfo

Ensure the target thread has reached wait() before inspecting it

Reviewed-by: mchung, dfuchs, jcbeyler
---
 .../ManagementFactory/ThreadMXBeanProxy.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/jdk/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java b/test/jdk/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java
index 3d46963be39..a39ba94ff9a 100644
--- a/test/jdk/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java
+++ b/test/jdk/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 
 /*
  * @test
- * @bug     5086470 6358247 7193302
+ * @bug     5086470 6358247 7193302 8048215
  * @summary Test type conversion when invoking ThreadMXBean.dumpAllThreads
  *          through proxy.
  * @author  Mandy Chung
@@ -45,6 +45,7 @@ public class ThreadMXBeanProxy {
     private static ThreadMXBean mbean;
     static Mutex mutex = new Mutex();
     static Object lock = new Object();
+    static Object waiter = new Object();
     static MyThread thread = new MyThread();
     public static void main(String[] argv) throws Exception {
         mbean = newPlatformMXBeanProxy(server,
@@ -68,6 +69,12 @@ public class ThreadMXBeanProxy {
            }
         }
 
+        // 'thread' holds the mutex, which means it must also have the monitor of
+        // 'waiter' at least until it does the wait(). So we acquire the monitor of
+        // 'waiter' here, which ensures that 'thread' must be in wait()
+        synchronized(waiter) {
+        }
+
         long[] ids = new long[] { thread.getId() };
 
         // validate the local access
@@ -108,11 +115,10 @@ public class ThreadMXBeanProxy {
         }
         public void run() {
             synchronized (lock) {
-                mutex.lock();
-                Object o = new Object();
-                synchronized(o) {
+                synchronized(waiter) {
+                    mutex.lock();
                     try {
-                        o.wait();
+                        waiter.wait();
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }

From 2a105069423ca7bcd82e8e8453be1f7686616008 Mon Sep 17 00:00:00 2001
From: Viktor Dukhovni 
Date: Tue, 16 Oct 2018 09:19:32 +0800
Subject: [PATCH 123/124] 8212165: JGSS: Fix cut/paste error in NativeUtil.c

Reviewed-by: alanb, weijun
---
 src/java.security.jgss/share/native/libj2gss/NativeUtil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.security.jgss/share/native/libj2gss/NativeUtil.c b/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
index 8e40177babf..3fba9fcdbfa 100644
--- a/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
+++ b/src/java.security.jgss/share/native/libj2gss/NativeUtil.c
@@ -145,7 +145,7 @@ DEF_JNI_OnLoad(JavaVM *jvm, void *reserved) {
     return JNI_ERR;
   }
   CLS_GSSNameElement = (*env)->NewGlobalRef(env, cls);
-  if (CLS_GSSException == NULL) {
+  if (CLS_GSSNameElement == NULL) {
     return JNI_ERR;
   }
   cls = (*env)->FindClass(env, "sun/security/jgss/wrapper/GSSCredElement");

From f507e3c9d1a30cc6d89c8ac47b8bf605d8d203f6 Mon Sep 17 00:00:00 2001
From: John Jiang 
Date: Tue, 16 Oct 2018 10:16:04 +0800
Subject: [PATCH 124/124] 8211971: Move security/cacerts/VerifyCACerts.java and
 security/CheckBlacklistedCerts.java

Move lib/security tests to sun/security/lib

Reviewed-by: weijun
---
 .../security => sun/security/lib}/CheckBlacklistedCerts.java    | 2 +-
 .../security => sun/security/lib}/cacerts/VerifyCACerts.java    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/jdk/{lib/security => sun/security/lib}/CheckBlacklistedCerts.java (97%)
 rename test/jdk/{lib/security => sun/security/lib}/cacerts/VerifyCACerts.java (100%)

diff --git a/test/jdk/lib/security/CheckBlacklistedCerts.java b/test/jdk/sun/security/lib/CheckBlacklistedCerts.java
similarity index 97%
rename from test/jdk/lib/security/CheckBlacklistedCerts.java
rename to test/jdk/sun/security/lib/CheckBlacklistedCerts.java
index ef3cfb4d6ce..15f89cfa5ff 100644
--- a/test/jdk/lib/security/CheckBlacklistedCerts.java
+++ b/test/jdk/sun/security/lib/CheckBlacklistedCerts.java
@@ -61,7 +61,7 @@ public class CheckBlacklistedCerts {
 
         // Assumes the full src is available
         File blacklist = new File(System.getProperty("test.src"),
-                "../../../../make/data/blacklistedcertsconverter/blacklisted.certs.pem");
+                "../../../../../make/data/blacklistedcertsconverter/blacklisted.certs.pem");
 
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         try (FileInputStream fis = new FileInputStream(blacklist)) {
diff --git a/test/jdk/lib/security/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
similarity index 100%
rename from test/jdk/lib/security/cacerts/VerifyCACerts.java
rename to test/jdk/sun/security/lib/cacerts/VerifyCACerts.java