<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/89577c32af7ea21d0466874ff07dfd40ed3ca4b5">https://github.com/macports/macports-ports/commit/89577c32af7ea21d0466874ff07dfd40ed3ca4b5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 89577c32af7 openjdk8: Refresh patchfiles
</span>89577c32af7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 89577c32af7ea21d0466874ff07dfd40ed3ca4b5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 5 12:09:51 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> openjdk8: Refresh patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67344
</span>---
java/openjdk8/Portfile | 1 -
java/openjdk8/files/0002-Support-XCode-3-14.patch | 14 +-
.../0003-Ignore-__NSAutoreleaseNoPool-errors.patch | 101 ++++-----
...nge-the-solaris-DTrace-implementation-to-.patch | 234 ++++++++++-----------
4 files changed, 161 insertions(+), 189 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/Portfile b/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dda438959cf..b3219aac72a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,6 @@ set build 07
</span> version ${major}u${update}
revision 0
categories java devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> supported_archs ppc x86_64 arm64
license GPL-2+
maintainers {outlook.com:usersword123 @usersxx} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/files/0002-Support-XCode-3-14.patch b/java/openjdk8/files/0002-Support-XCode-3-14.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9398b676b0b..468edee11da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/files/0002-Support-XCode-3-14.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/files/0002-Support-XCode-3-14.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,16 +4,9 @@ Date: Wed, 28 Sep 2022 18:00:50 +0200
</span> Subject: [PATCH] Support XCode 3-14
Co-authored-by: usersxx <97012123+usersxx@users.noreply.github.com>
<span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/autoconf/generated-configure.sh | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/autoconf/toolchain.m4 | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/autoconf/generated-configure.sh common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 71fabf4dbb3..7f97eb5a0b2 100644
</span> --- common/autoconf/generated-configure.sh
+++ common/autoconf/generated-configure.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27063,8 +27063,8 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27373,8 +27373,8 @@
</span> # Fail-fast: verify we're building on a supported Xcode version
XCODE_VERSION=`$XCODEBUILD -version | grep '^Xcode ' | sed 's/Xcode //'`
XC_VERSION_PARTS=( ${XCODE_VERSION//./ } )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +17,6 @@ index 71fabf4dbb3..7f97eb5a0b2 100644
</span> fi
# Some versions of Xcode command line tools install gcc and g++ as symlinks to
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/autoconf/toolchain.m4 common/autoconf/toolchain.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ab0167a6191..7dd7ff6d78e 100644
</span> --- common/autoconf/toolchain.m4
+++ common/autoconf/toolchain.m4
@@ -290,8 +290,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +30,3 @@ index ab0167a6191..7dd7ff6d78e 100644
</span> fi
# Some versions of Xcode command line tools install gcc and g++ as symlinks to
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/files/0003-Ignore-__NSAutoreleaseNoPool-errors.patch b/java/openjdk8/files/0003-Ignore-__NSAutoreleaseNoPool-errors.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index a2de758b42a..d9c93e54300 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/files/0003-Ignore-__NSAutoreleaseNoPool-errors.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/files/0003-Ignore-__NSAutoreleaseNoPool-errors.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,6 @@ From c9806a9d61fcac79f4795c1e93a21036382ab4d4 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 28 Sep 2022 18:03:12 +0200
Subject: [PATCH] Ignore `__NSAutoreleaseNoPool` errors
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/autoconf/boot-jdk.m4 | 4 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- common/autoconf/generated-configure.sh | 88 +++++++++++++-------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 46 insertions(+), 46 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/autoconf/boot-jdk.m4 common/autoconf/boot-jdk.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5be15b86967..3b32c19a42c 100644
</span> --- common/autoconf/boot-jdk.m4
+++ common/autoconf/boot-jdk.m4
@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +22,9 @@ index 5be15b86967..3b32c19a42c 100644
</span> AC_MSG_RESULT([$BOOT_JDK_VERSION])
fi # end check jdk version
fi # end check rt.jar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/autoconf/generated-configure.sh common/autoconf/generated-configure.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> --- common/autoconf/generated-configure.sh
+++ common/autoconf/generated-configure.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20305,7 +20305,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20360,7 +20360,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +33,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20446,7 +20446,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20512,7 +20512,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +42,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20637,7 +20637,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20703,7 +20703,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +51,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20778,7 +20778,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20855,7 +20855,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +60,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20955,7 +20955,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21043,7 +21043,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +69,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21096,7 +21096,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21195,7 +21195,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +78,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21143,7 +21143,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21242,7 +21242,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +87,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21284,7 +21284,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21394,7 +21394,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +96,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21471,7 +21471,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21581,7 +21581,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,7 +105,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21612,7 +21612,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21733,7 +21733,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +114,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21686,7 +21686,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21807,7 +21807,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +123,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21827,7 +21827,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21959,7 +21959,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +132,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21866,7 +21866,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21998,7 +21998,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,7 +141,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22007,7 +22007,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22150,7 +22150,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,7 +150,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22074,7 +22074,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22217,7 +22217,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +159,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22215,7 +22215,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22369,7 +22369,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +168,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22254,7 +22254,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22408,7 +22408,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +177,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22395,7 +22395,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22560,7 +22560,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,7 +186,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22462,7 +22462,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22627,7 +22627,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,7 +195,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22603,7 +22603,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22779,7 +22779,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,7 +204,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22642,7 +22642,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22818,7 +22818,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,7 +213,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22783,7 +22783,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22970,7 +22970,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -232,7 +222,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22850,7 +22850,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23037,7 +23037,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,7 +231,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22991,7 +22991,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23189,7 +23189,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,7 +240,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23030,7 +23030,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23228,7 +23228,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,7 +249,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23171,7 +23171,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23380,7 +23380,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +258,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23225,7 +23225,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23434,7 +23434,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -277,7 +267,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23366,7 +23366,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23586,7 +23586,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,7 +276,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23403,7 +23403,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23623,7 +23623,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -295,7 +285,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23544,7 +23544,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23775,7 +23775,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,7 +294,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23599,7 +23599,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23830,7 +23830,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,7 +303,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23740,7 +23740,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23982,7 +23982,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -322,7 +312,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23777,7 +23777,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24019,7 +24019,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +321,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23918,7 +23918,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24171,7 +24171,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,7 +330,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23972,7 +23972,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24225,7 +24225,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,7 +339,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24113,7 +24113,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24377,7 +24377,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -358,7 +348,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24150,7 +24150,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24414,7 +24414,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -367,7 +357,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24291,7 +24291,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24566,7 +24566,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -376,7 +366,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24346,7 +24346,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24621,7 +24621,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -385,7 +375,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24487,7 +24487,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24773,7 +24773,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,7 +384,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24524,7 +24524,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24810,7 +24810,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,7 +393,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24665,7 +24665,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24962,7 +24962,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -412,7 +402,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24701,7 +24701,7 @@ $as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK did not contain an rt.ja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24998,7 +24998,7 @@
</span> BOOT_JDK_FOUND=no
else
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,7 +411,7 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span>
# Extra M4 quote needed to protect [] in grep expression.
FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24842,7 +24842,7 @@ $as_echo_n "checking for Boot JDK... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25150,7 +25150,7 @@
</span> $as_echo "$BOOT_JDK" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Boot JDK version" >&5
$as_echo_n "checking Boot JDK version... " >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,6 +420,3 @@ index 7f97eb5a0b2..db4a2f9cbd8 100644
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_VERSION" >&5
$as_echo "$BOOT_JDK_VERSION" >&6; }
fi # end check jdk version
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk8/files/0004-8030812-Change-the-solaris-DTrace-implementation-to-.patch b/java/openjdk8/files/0004-8030812-Change-the-solaris-DTrace-implementation-to-.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index fb8070fc28d..25f6ece81ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk8/files/0004-8030812-Change-the-solaris-DTrace-implementation-to-.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk8/files/0004-8030812-Change-the-solaris-DTrace-implementation-to-.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,11 +366,9 @@ index d60f751af9c..6c9f9b219ce 100644
</span> #endif /* USDT2 */
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git hotspot/src/share/vm/prims/jni.cpp hotspot/src/share/vm/prims/jni.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dde3975677d..e6c42b6eea4 100644
</span> --- hotspot/src/share/vm/prims/jni.cpp
+++ hotspot/src/share/vm/prims/jni.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -428,8 +428,7 @@ JNI_ENTRY(jclass, jni_FindClass(JNIEnv *env, const char *name))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,8 +426,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FindClass__entry, env, name);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -380,7 +378,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jclass result = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -506,8 +505,7 @@ JNI_ENTRY(jmethodID, jni_FromReflectedMethod(JNIEnv *env, jobject method))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -504,8 +503,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FromReflectedMethod__entry, env, method);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -390,7 +388,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jmethodID ret = NULL;
DT_RETURN_MARK(FromReflectedMethod, jmethodID, (const jmethodID&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -547,8 +545,7 @@ JNI_ENTRY(jfieldID, jni_FromReflectedField(JNIEnv *env, jobject field))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -545,8 +543,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FromReflectedField__entry, env, field);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -400,7 +398,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jfieldID ret = NULL;
DT_RETURN_MARK(FromReflectedField, jfieldID, (const jfieldID&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -596,8 +593,7 @@ JNI_ENTRY(jobject, jni_ToReflectedMethod(JNIEnv *env, jclass cls, jmethodID meth
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -594,8 +591,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, ToReflectedMethod__entry, env, cls, method_id, isStatic);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -410,7 +408,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(ToReflectedMethod, jobject, (const jobject&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -626,8 +622,7 @@ JNI_ENTRY(jclass, jni_GetSuperclass(JNIEnv *env, jclass sub))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -624,8 +620,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetSuperclass__entry, env, sub);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -420,7 +418,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jclass obj = NULL;
DT_RETURN_MARK(GetSuperclass, jclass, (const jclass&)obj);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -660,8 +655,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -658,8 +653,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, IsAssignableFrom__entry, env, sub, super);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -430,7 +428,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
oop sub_mirror = JNIHandles::resolve_non_null(sub);
oop super_mirror = JNIHandles::resolve_non_null(super);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -671,8 +665,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -669,8 +663,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsAssignableFrom__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -440,7 +438,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -684,8 +677,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsAssignableFrom(JNIEnv *env, jclass sub, jclass s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -682,8 +675,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsAssignableFrom__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,7 +448,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,8 +694,7 @@ JNI_ENTRY(jint, jni_Throw(JNIEnv *env, jthrowable obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -700,8 +692,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, Throw__entry, env, obj);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -460,7 +458,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret = JNI_OK;
DT_RETURN_MARK(Throw, jint, (const jint&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -725,8 +716,7 @@ JNI_ENTRY(jint, jni_ThrowNew(JNIEnv *env, jclass clazz, const char *message))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -723,8 +714,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ThrowNew__entry, env, clazz, message);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,7 +468,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret = JNI_OK;
DT_RETURN_MARK(ThrowNew, jint, (const jint&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -760,8 +750,7 @@ JNI_ENTRY_NO_PRESERVE(jthrowable, jni_ExceptionOccurred(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,8 +748,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionOccurred__entry, env);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -480,7 +478,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jni_check_async_exceptions(thread);
oop exception = thread->pending_exception();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -769,8 +758,7 @@ JNI_ENTRY_NO_PRESERVE(jthrowable, jni_ExceptionOccurred(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -767,8 +756,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionOccurred__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -490,7 +488,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -781,8 +769,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_ExceptionDescribe(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -779,8 +767,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionDescribe__entry, env);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -500,7 +498,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
if (thread->has_pending_exception()) {
Handle ex(thread, thread->pending_exception());
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -822,8 +809,7 @@ JNI_ENTRY_NO_PRESERVE(void, jni_ExceptionDescribe(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -820,8 +807,7 @@
</span> #ifndef USDT2
DTRACE_PROBE(hotspot_jni, ExceptionDescribe__return);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -510,7 +508,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -833,8 +819,7 @@ JNI_QUICK_ENTRY(void, jni_ExceptionClear(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -831,8 +817,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionClear__entry, env);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -520,7 +518,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
// The jni code might be using this API to clear java thrown exception.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -847,8 +832,7 @@ JNI_QUICK_ENTRY(void, jni_ExceptionClear(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -845,8 +830,7 @@
</span> #ifndef USDT2
DTRACE_PROBE(hotspot_jni, ExceptionClear__return);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -530,7 +528,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -858,8 +842,7 @@ JNI_ENTRY(void, jni_FatalError(JNIEnv *env, const char *msg))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -856,8 +840,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, FatalError__entry, env, msg);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -540,7 +538,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
tty->print_cr("FATAL ERROR in native method: %s", msg);
thread->print_stack();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -872,8 +855,7 @@ JNI_ENTRY(jint, jni_PushLocalFrame(JNIEnv *env, jint capacity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -870,8 +853,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, PushLocalFrame__entry, env, capacity);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -550,7 +548,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
//%note jni_11
if (capacity < 0 ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -881,8 +863,7 @@ JNI_ENTRY(jint, jni_PushLocalFrame(JNIEnv *env, jint capacity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -879,8 +861,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, PushLocalFrame__return, JNI_ERR);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -560,7 +558,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_ERR;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -895,8 +876,7 @@ JNI_ENTRY(jint, jni_PushLocalFrame(JNIEnv *env, jint capacity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -893,8 +874,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, PushLocalFrame__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -570,7 +568,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -907,8 +887,7 @@ JNI_ENTRY(jobject, jni_PopLocalFrame(JNIEnv *env, jobject result))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -905,8 +885,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, PopLocalFrame__entry, env, result);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -580,7 +578,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
//%note jni_11
Handle result_handle(thread, JNIHandles::resolve(result));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -927,8 +906,7 @@ JNI_ENTRY(jobject, jni_PopLocalFrame(JNIEnv *env, jobject result))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -925,8 +904,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, PopLocalFrame__return, result);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -590,7 +588,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return result;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -939,16 +917,14 @@ JNI_ENTRY(jobject, jni_NewGlobalRef(JNIEnv *env, jobject ref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -937,16 +915,14 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewGlobalRef__entry, env, ref);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,7 +607,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -959,15 +935,13 @@ JNI_ENTRY_NO_PRESERVE(void, jni_DeleteGlobalRef(JNIEnv *env, jobject ref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -957,15 +933,13 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, DeleteGlobalRef__entry, env, ref);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -627,7 +625,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -976,15 +950,13 @@ JNI_QUICK_ENTRY(void, jni_DeleteLocalRef(JNIEnv *env, jobject obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -974,15 +948,13 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, DeleteLocalRef__entry, env, obj);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -645,7 +643,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -993,8 +965,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsSameObject(JNIEnv *env, jobject r1, jobject r2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -991,8 +963,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, IsSameObject__entry, env, r1, r2);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -655,7 +653,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
oop a = JNIHandles::resolve(r1);
oop b = JNIHandles::resolve(r2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1002,8 +973,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsSameObject(JNIEnv *env, jobject r1, jobject r2))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1000,8 +971,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsSameObject__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -665,7 +663,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1014,15 +984,13 @@ JNI_ENTRY(jobject, jni_NewLocalRef(JNIEnv *env, jobject ref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1012,15 +982,13 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewLocalRef__entry, env, ref);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -683,7 +681,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1032,8 +1000,7 @@ JNI_LEAF(jint, jni_EnsureLocalCapacity(JNIEnv *env, jint capacity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1030,8 +998,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, EnsureLocalCapacity__entry, env, capacity);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -693,7 +691,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret;
if (capacity >= 0 &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1045,8 +1012,7 @@ JNI_LEAF(jint, jni_EnsureLocalCapacity(JNIEnv *env, jint capacity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1043,8 +1010,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, EnsureLocalCapacity__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -703,7 +701,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1057,8 +1023,7 @@ JNI_LEAF(jobjectRefType, jni_GetObjectRefType(JNIEnv *env, jobject obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1055,8 +1021,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetObjectRefType__entry, env, obj);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -713,7 +711,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobjectRefType ret;
if (JNIHandles::is_local_handle(thread, obj) ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1073,8 +1038,7 @@ JNI_LEAF(jobjectRefType, jni_GetObjectRefType(JNIEnv *env, jobject obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1071,8 +1036,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectRefType__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -723,7 +721,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1427,8 +1391,7 @@ JNI_ENTRY(jobject, jni_AllocObject(JNIEnv *env, jclass clazz))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1425,8 +1389,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, AllocObject__entry, env, clazz);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -733,7 +731,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(AllocObject, jobject, (const jobject&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1450,8 +1413,7 @@ JNI_ENTRY(jobject, jni_NewObjectA(JNIEnv *env, jclass clazz, jmethodID methodID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1448,8 +1411,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewObjectA__entry, env, clazz, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -743,7 +741,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject obj = NULL;
DT_RETURN_MARK(NewObjectA, jobject, (const jobject&)obj);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1476,8 +1438,7 @@ JNI_ENTRY(jobject, jni_NewObjectV(JNIEnv *env, jclass clazz, jmethodID methodID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1474,8 +1436,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewObjectV__entry, env, clazz, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -753,7 +751,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject obj = NULL;
DT_RETURN_MARK(NewObjectV, jobject, (const jobject&)obj);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1502,8 +1463,7 @@ JNI_ENTRY(jobject, jni_NewObject(JNIEnv *env, jclass clazz, jmethodID methodID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1500,8 +1461,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewObject__entry, env, clazz, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -763,7 +761,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject obj = NULL;
DT_RETURN_MARK(NewObject, jobject, (const jobject&)obj);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1525,8 +1485,7 @@ JNI_ENTRY(jclass, jni_GetObjectClass(JNIEnv *env, jobject obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1523,8 +1483,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetObjectClass__entry, env, obj);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -773,7 +771,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
Klass* k = JNIHandles::resolve_non_null(obj)->klass();
jclass ret =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1534,8 +1493,7 @@ JNI_ENTRY(jclass, jni_GetObjectClass(JNIEnv *env, jobject obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1532,8 +1491,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectClass__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -783,7 +781,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1545,8 +1503,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsInstanceOf(JNIEnv *env, jobject obj, jclass claz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1543,8 +1501,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, IsInstanceOf__entry, env, obj, clazz);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -793,7 +791,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jboolean ret = JNI_TRUE;
if (obj != NULL) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1560,8 +1517,7 @@ JNI_QUICK_ENTRY(jboolean, jni_IsInstanceOf(JNIEnv *env, jobject obj, jclass claz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1558,8 +1515,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, IsInstanceOf__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -803,7 +801,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1625,15 +1581,13 @@ JNI_ENTRY(jmethodID, jni_GetMethodID(JNIEnv *env, jclass clazz,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1623,15 +1579,13 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetMethodID__entry, env, clazz, name, sig);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -821,7 +819,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1645,15 +1599,13 @@ JNI_ENTRY(jmethodID, jni_GetStaticMethodID(JNIEnv *env, jclass clazz,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1643,15 +1597,13 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetStaticMethodID__entry, env, clazz, name, sig);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -839,7 +837,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1913,8 +1865,7 @@ JNI_ENTRY(void, jni_CallVoidMethod(JNIEnv *env, jobject obj, jmethodID methodID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1911,8 +1863,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallVoidMethod__entry, env, obj, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -849,7 +847,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallVoidMethod);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1932,8 +1883,7 @@ JNI_ENTRY(void, jni_CallVoidMethodV(JNIEnv *env, jobject obj, jmethodID methodID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1930,8 +1881,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallVoidMethodV__entry, env, obj, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -859,7 +857,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallVoidMethodV);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1948,8 +1898,7 @@ JNI_ENTRY(void, jni_CallVoidMethodA(JNIEnv *env, jobject obj, jmethodID methodID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1946,8 +1896,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallVoidMethodA__entry, env, obj, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -869,7 +867,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallVoidMethodA);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2211,8 +2160,7 @@ JNI_ENTRY(void, jni_CallNonvirtualVoidMethod(JNIEnv *env, jobject obj, jclass cl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2209,8 +2158,7 @@
</span> DTRACE_PROBE4(hotspot_jni, CallNonvirtualVoidMethod__entry,
env, obj, cls, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -879,7 +877,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallNonvirtualVoidMethod);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2513,8 +2461,7 @@ JNI_ENTRY(void, jni_CallStaticVoidMethod(JNIEnv *env, jclass cls, jmethodID meth
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2511,8 +2459,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallStaticVoidMethod__entry, env, cls, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -889,7 +887,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallStaticVoidMethod);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2532,8 +2479,7 @@ JNI_ENTRY(void, jni_CallStaticVoidMethodV(JNIEnv *env, jclass cls, jmethodID met
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2530,8 +2477,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallStaticVoidMethodV__entry, env, cls, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -899,7 +897,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallStaticVoidMethodV);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2548,8 +2494,7 @@ JNI_ENTRY(void, jni_CallStaticVoidMethodA(JNIEnv *env, jclass cls, jmethodID met
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2546,8 +2492,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, CallStaticVoidMethodA__entry, env, cls, methodID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -909,7 +907,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(CallStaticVoidMethodA);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2577,8 +2522,7 @@ JNI_ENTRY(jfieldID, jni_GetFieldID(JNIEnv *env, jclass clazz,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2575,8 +2520,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetFieldID__entry, env, clazz, name, sig);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -919,7 +917,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jfieldID ret = 0;
DT_RETURN_MARK(GetFieldID, jfieldID, (const jfieldID&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2614,8 +2558,7 @@ JNI_ENTRY(jobject, jni_GetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2612,8 +2556,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetObjectField__entry, env, obj, fieldID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -929,7 +927,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
oop o = JNIHandles::resolve_non_null(obj);
Klass* k = o->klass();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2649,8 +2592,7 @@ JNI_ENTRY(jobject, jni_GetObjectField(JNIEnv *env, jobject obj, jfieldID fieldID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2647,8 +2590,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetObjectField__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -939,7 +937,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2775,8 +2717,7 @@ JNI_QUICK_ENTRY(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fiel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2773,8 +2715,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, SetObjectField__entry, env, obj, fieldID, value);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -949,7 +947,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
oop o = JNIHandles::resolve_non_null(obj);
Klass* k = o->klass();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2793,8 +2734,7 @@ JNI_QUICK_ENTRY(void, jni_SetObjectField(JNIEnv *env, jobject obj, jfieldID fiel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2791,8 +2732,7 @@
</span> #ifndef USDT2
DTRACE_PROBE(hotspot_jni, SetObjectField__return);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -959,7 +957,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2898,8 +2838,7 @@ JNI_ENTRY(jobject, jni_ToReflectedField(JNIEnv *env, jclass cls, jfieldID fieldI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2896,8 +2836,7 @@
</span> DTRACE_PROBE4(hotspot_jni, ToReflectedField__entry,
env, cls, fieldID, isStatic);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -969,7 +967,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(ToReflectedField, jobject, (const jobject&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2943,8 +2882,7 @@ JNI_ENTRY(jfieldID, jni_GetStaticFieldID(JNIEnv *env, jclass clazz,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2941,8 +2880,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, GetStaticFieldID__entry, env, clazz, name, sig);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -979,7 +977,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jfieldID ret = NULL;
DT_RETURN_MARK(GetStaticFieldID, jfieldID, (const jfieldID&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2984,8 +2922,7 @@ JNI_ENTRY(jobject, jni_GetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2982,8 +2920,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStaticObjectField__entry, env, clazz, fieldID);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -989,7 +987,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
#if INCLUDE_JNI_CHECK
DEBUG_ONLY(Klass* param_k = jniCheck::validate_class(thread, clazz);)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3001,8 +2938,7 @@ JNI_ENTRY(jobject, jni_GetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2999,8 +2936,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStaticObjectField__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -999,7 +997,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3087,8 +3023,7 @@ JNI_ENTRY(void, jni_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3085,8 +3021,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, SetStaticObjectField__entry, env, clazz, fieldID, value);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1009,7 +1007,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNIid* id = jfieldIDWorkaround::from_static_jfieldID(fieldID);
assert(id->is_static_field_id(), "invalid static field id");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3103,8 +3038,7 @@ JNI_ENTRY(void, jni_SetStaticObjectField(JNIEnv *env, jclass clazz, jfieldID fie
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3101,8 +3036,7 @@
</span> #ifndef USDT2
DTRACE_PROBE(hotspot_jni, SetStaticObjectField__return);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1019,7 +1017,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3208,8 +3142,7 @@ JNI_ENTRY(jstring, jni_NewString(JNIEnv *env, const jchar *unicodeChars, jsize l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3206,8 +3140,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewString__entry, env, unicodeChars, len);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1029,7 +1027,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jstring ret = NULL;
DT_RETURN_MARK(NewString, jstring, (const jstring&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3224,8 +3157,7 @@ JNI_QUICK_ENTRY(jsize, jni_GetStringLength(JNIEnv *env, jstring string))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3222,8 +3155,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetStringLength__entry, env, string);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1039,7 +1037,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jsize ret = 0;
oop s = JNIHandles::resolve_non_null(string);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3235,8 +3167,7 @@ JNI_QUICK_ENTRY(jsize, jni_GetStringLength(JNIEnv *env, jstring string))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3233,8 +3165,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringLength__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1049,7 +1047,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3248,8 +3179,7 @@ JNI_QUICK_ENTRY(const jchar*, jni_GetStringChars(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3246,8 +3177,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStringChars__entry, env, string, isCopy);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1059,7 +1057,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jchar* buf = NULL;
oop s = JNIHandles::resolve_non_null(string);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3273,8 +3203,7 @@ JNI_QUICK_ENTRY(const jchar*, jni_GetStringChars(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3271,8 +3201,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringChars__return, buf);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1069,7 +1067,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return buf;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3285,8 +3214,7 @@ JNI_QUICK_ENTRY(void, jni_ReleaseStringChars(JNIEnv *env, jstring str, const jch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3283,8 +3212,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ReleaseStringChars__entry, env, str, chars);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1079,7 +1077,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
//%note jni_6
if (chars != NULL) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3297,8 +3225,7 @@ JNI_QUICK_ENTRY(void, jni_ReleaseStringChars(JNIEnv *env, jstring str, const jch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3295,8 +3223,7 @@
</span> #ifndef USDT2
DTRACE_PROBE(hotspot_jni, ReleaseStringChars__return);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1089,7 +1087,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3317,8 +3244,7 @@ JNI_ENTRY(jstring, jni_NewStringUTF(JNIEnv *env, const char *bytes))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3315,8 +3242,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewStringUTF__entry, env, bytes);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1099,7 +1097,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jstring ret;
DT_RETURN_MARK(NewStringUTF, jstring, (const jstring&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3334,8 +3260,7 @@ JNI_ENTRY(jsize, jni_GetStringUTFLength(JNIEnv *env, jstring string))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3332,8 +3258,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetStringUTFLength__entry, env, string);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1109,7 +1107,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jsize ret = 0;
oop java_string = JNIHandles::resolve_non_null(string);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3345,8 +3270,7 @@ JNI_ENTRY(jsize, jni_GetStringUTFLength(JNIEnv *env, jstring string))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3343,8 +3268,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringUTFLength__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1119,7 +1117,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3357,8 +3281,7 @@ JNI_ENTRY(const char*, jni_GetStringUTFChars(JNIEnv *env, jstring string, jboole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3355,8 +3279,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStringUTFChars__entry, env, string, isCopy);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1129,7 +1127,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
char* result = NULL;
oop java_string = JNIHandles::resolve_non_null(string);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3376,8 +3299,7 @@ JNI_ENTRY(const char*, jni_GetStringUTFChars(JNIEnv *env, jstring string, jboole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3374,8 +3297,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringUTFChars__return, result);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1139,7 +1137,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return result;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3388,8 +3310,7 @@ JNI_LEAF(void, jni_ReleaseStringUTFChars(JNIEnv *env, jstring str, const char *c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3386,8 +3308,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ReleaseStringUTFChars__entry, env, str, chars);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1149,7 +1147,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
if (chars != NULL) {
FreeHeap((char*) chars);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3397,8 +3318,7 @@ JNI_LEAF(void, jni_ReleaseStringUTFChars(JNIEnv *env, jstring str, const char *c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3395,8 +3316,7 @@
</span> #ifndef USDT2
DTRACE_PROBE(hotspot_jni, ReleaseStringUTFChars__return);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1159,7 +1157,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3408,8 +3328,7 @@ JNI_QUICK_ENTRY(jsize, jni_GetArrayLength(JNIEnv *env, jarray array))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3406,8 +3326,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetArrayLength__entry, env, array);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1169,7 +1167,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
arrayOop a = arrayOop(JNIHandles::resolve_non_null(array));
assert(a->is_array(), "must be array");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3417,8 +3336,7 @@ JNI_QUICK_ENTRY(jsize, jni_GetArrayLength(JNIEnv *env, jarray array))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3415,8 +3334,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetArrayLength__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1179,7 +1177,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3440,8 +3358,7 @@ JNI_ENTRY(jobjectArray, jni_NewObjectArray(JNIEnv *env, jsize length, jclass ele
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3438,8 +3356,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, NewObjectArray__entry, env, length, elementClass, initialElement);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1189,7 +1187,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobjectArray ret = NULL;
DT_RETURN_MARK(NewObjectArray, jobjectArray, (const jobjectArray&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3472,8 +3389,7 @@ JNI_ENTRY(jobject, jni_GetObjectArrayElement(JNIEnv *env, jobjectArray array, js
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3470,8 +3387,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetObjectArrayElement__entry, env, array, index);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1199,7 +1197,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jobject ret = NULL;
DT_RETURN_MARK(GetObjectArrayElement, jobject, (const jobject&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3500,8 +3416,7 @@ JNI_ENTRY(void, jni_SetObjectArrayElement(JNIEnv *env, jobjectArray array, jsize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3498,8 +3414,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, SetObjectArrayElement__entry, env, array, index, value);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1209,7 +1207,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(SetObjectArrayElement);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4054,8 +3969,7 @@ JNI_ENTRY(jint, jni_RegisterNatives(JNIEnv *env, jclass clazz,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4052,8 +3967,7 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, RegisterNatives__entry, env, clazz, methods, nMethods);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1219,7 +1217,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret = 0;
DT_RETURN_MARK(RegisterNatives, jint, (const jint&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4097,8 +4011,7 @@ JNI_ENTRY(jint, jni_UnregisterNatives(JNIEnv *env, jclass clazz))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4095,8 +4009,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, UnregisterNatives__entry, env, clazz);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1229,7 +1227,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz));
//%note jni_2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4114,8 +4027,7 @@ JNI_ENTRY(jint, jni_UnregisterNatives(JNIEnv *env, jclass clazz))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4112,8 +4025,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, UnregisterNatives__return, 0);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1239,7 +1237,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return 0;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4135,8 +4047,7 @@ JNI_ENTRY(jint, jni_MonitorEnter(JNIEnv *env, jobject jobj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4133,8 +4045,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, MonitorEnter__entry, env, jobj);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1249,7 +1247,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret = JNI_ERR;
DT_RETURN_MARK(MonitorEnter, jint, (const jint&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4163,8 +4074,7 @@ JNI_ENTRY(jint, jni_MonitorExit(JNIEnv *env, jobject jobj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4161,8 +4072,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, MonitorExit__entry, env, jobj);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1259,7 +1257,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret = JNI_ERR;
DT_RETURN_MARK(MonitorExit, jint, (const jint&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4197,8 +4107,7 @@ JNI_ENTRY(void, jni_GetStringRegion(JNIEnv *env, jstring string, jsize start, js
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4195,8 +4105,7 @@
</span> #ifndef USDT2
DTRACE_PROBE5(hotspot_jni, GetStringRegion__entry, env, string, start, len, buf);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1269,7 +1267,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(GetStringRegion);
oop s = JNIHandles::resolve_non_null(string);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4226,8 +4135,7 @@ JNI_ENTRY(void, jni_GetStringUTFRegion(JNIEnv *env, jstring string, jsize start,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4224,8 +4133,7 @@
</span> #ifndef USDT2
DTRACE_PROBE5(hotspot_jni, GetStringUTFRegion__entry, env, string, start, len, buf);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1279,7 +1277,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
DT_VOID_RETURN_MARK(GetStringUTFRegion);
oop s = JNIHandles::resolve_non_null(string);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4257,8 +4165,7 @@ JNI_ENTRY(void*, jni_GetPrimitiveArrayCritical(JNIEnv *env, jarray array, jboole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4255,8 +4163,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetPrimitiveArrayCritical__entry, env, array, isCopy);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1289,7 +1287,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
GC_locker::lock_critical(thread);
if (isCopy != NULL) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4276,8 +4183,7 @@ JNI_ENTRY(void*, jni_GetPrimitiveArrayCritical(JNIEnv *env, jarray array, jboole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4274,8 +4181,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetPrimitiveArrayCritical__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1299,7 +1297,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4288,16 +4194,14 @@ JNI_ENTRY(void, jni_ReleasePrimitiveArrayCritical(JNIEnv *env, jarray array, voi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4286,16 +4192,14 @@
</span> #ifndef USDT2
DTRACE_PROBE4(hotspot_jni, ReleasePrimitiveArrayCritical__entry, env, array, carray, mode);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1318,7 +1316,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4307,8 +4211,7 @@ JNI_ENTRY(const jchar*, jni_GetStringCritical(JNIEnv *env, jstring string, jbool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4305,8 +4209,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetStringCritical__entry, env, string, isCopy);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1328,7 +1326,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
GC_locker::lock_critical(thread);
if (isCopy != NULL) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4327,8 +4230,7 @@ JNI_ENTRY(const jchar*, jni_GetStringCritical(JNIEnv *env, jstring string, jbool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4325,8 +4228,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetStringCritical__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1338,7 +1336,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4339,16 +4241,14 @@ JNI_ENTRY(void, jni_ReleaseStringCritical(JNIEnv *env, jstring str, const jchar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4337,16 +4239,14 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, ReleaseStringCritical__entry, env, str, chars);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1357,7 +1355,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4358,16 +4258,14 @@ JNI_ENTRY(jweak, jni_NewWeakGlobalRef(JNIEnv *env, jobject ref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4356,16 +4256,14 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, NewWeakGlobalRef__entry, env, ref);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1376,7 +1374,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4378,15 +4276,13 @@ JNI_ENTRY(void, jni_DeleteWeakGlobalRef(JNIEnv *env, jweak ref))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4376,15 +4274,13 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, DeleteWeakGlobalRef__entry, env, ref);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1394,7 +1392,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4396,16 +4292,14 @@ JNI_QUICK_ENTRY(jboolean, jni_ExceptionCheck(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4394,16 +4290,14 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, ExceptionCheck__entry, env);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1413,7 +1411,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4516,8 +4410,7 @@ extern "C" jobject JNICALL jni_NewDirectByteBuffer(JNIEnv *env, void* address, j
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4514,8 +4408,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, NewDirectByteBuffer__entry, env, address, capacity);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1423,7 +1421,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
if (!directBufferSupportInitializeEnded) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4525,8 +4418,7 @@ extern "C" jobject JNICALL jni_NewDirectByteBuffer(JNIEnv *env, void* address, j
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4523,8 +4416,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, NULL);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1433,7 +1431,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4541,8 +4433,7 @@ extern "C" jobject JNICALL jni_NewDirectByteBuffer(JNIEnv *env, void* address, j
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4539,8 +4431,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, NewDirectByteBuffer__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1443,7 +1441,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4563,8 +4454,7 @@ extern "C" void* JNICALL jni_GetDirectBufferAddress(JNIEnv *env, jobject buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4561,8 +4452,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetDirectBufferAddress__entry, env, buf);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1453,7 +1451,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
void* ret = NULL;
DT_RETURN_MARK(GetDirectBufferAddress, void*, (const void*&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4599,8 +4489,7 @@ extern "C" jlong JNICALL jni_GetDirectBufferCapacity(JNIEnv *env, jobject buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4597,8 +4487,7 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetDirectBufferCapacity__entry, env, buf);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1463,7 +1461,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jlong ret = -1;
DT_RETURN_MARK(GetDirectBufferCapacity, jlong, (const jlong&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4631,14 +4520,12 @@ JNI_LEAF(jint, jni_GetVersion(JNIEnv *env))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4629,14 +4518,12 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, GetVersion__entry, env);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1480,7 +1478,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return CurrentVersion;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4650,15 +4537,13 @@ JNI_LEAF(jint, jni_GetJavaVM(JNIEnv *env, JavaVM **vm))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4648,15 +4535,13 @@
</span> #ifndef USDT2
DTRACE_PROBE2(hotspot_jni, GetJavaVM__entry, env, vm);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1498,7 +1496,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_OK;
JNI_END
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5067,8 +4952,7 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetDefaultJavaVMInitArgs(void *args_) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5065,8 +4950,7 @@
</span> #ifndef USDT2
HS_DTRACE_PROBE1(hotspot_jni, GetDefaultJavaVMInitArgs__entry, args_);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1508,7 +1506,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
JDK1_1InitArgs *args = (JDK1_1InitArgs *)args_;
jint ret = JNI_ERR;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5192,8 +5076,7 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_CreateJavaVM(JavaVM **vm, void **penv, v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5190,8 +5074,7 @@
</span> #ifndef USDT2
HS_DTRACE_PROBE3(hotspot_jni, CreateJavaVM__entry, vm, penv, args);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1518,7 +1516,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint result = JNI_ERR;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5311,8 +5194,7 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetCreatedJavaVMs(JavaVM **vm_buf, jsize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5309,8 +5192,7 @@
</span> HS_DTRACE_PROBE3(hotspot_jni, GetCreatedJavaVMs__entry, \
vm_buf, bufLen, numVMs);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1528,7 +1526,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
if (vm_created) {
if (numVMs != NULL) *numVMs = 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5323,8 +5205,7 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetCreatedJavaVMs(JavaVM **vm_buf, jsize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5321,8 +5203,7 @@
</span> #ifndef USDT2
HS_DTRACE_PROBE1(hotspot_jni, GetCreatedJavaVMs__return, JNI_OK);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1538,7 +1536,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_OK;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5342,8 +5223,7 @@ jint JNICALL jni_DestroyJavaVM(JavaVM *vm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5340,8 +5221,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DestroyJavaVM__entry, vm);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1548,7 +1546,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint res = JNI_ERR;
DT_RETURN_MARK(DestroyJavaVM, jint, (const jint&)res);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5495,15 +5375,13 @@ jint JNICALL jni_AttachCurrentThread(JavaVM *vm, void **penv, void *_args) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5493,15 +5373,13 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, AttachCurrentThread__entry, vm, penv, _args);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1566,7 +1564,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_ERR;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5513,8 +5391,7 @@ jint JNICALL jni_AttachCurrentThread(JavaVM *vm, void **penv, void *_args) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5511,8 +5389,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, AttachCurrentThread__return, ret);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1576,7 +1574,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5524,8 +5401,7 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5522,8 +5399,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__entry, vm);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1586,7 +1584,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
VM_Exit::block_if_vm_exited();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5536,8 +5412,7 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5534,8 +5410,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__return, JNI_OK);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1596,7 +1594,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_OK;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5547,8 +5422,7 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5545,8 +5420,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__return, JNI_ERR);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1606,7 +1604,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
// Can't detach a thread that's running java, that can't work.
return JNI_ERR;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5573,8 +5447,7 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5571,8 +5445,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, DetachCurrentThread__return, JNI_OK);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1616,7 +1614,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_OK;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5590,8 +5463,7 @@ jint JNICALL jni_GetEnv(JavaVM *vm, void **penv, jint version) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5588,8 +5461,7 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, GetEnv__entry, vm, penv, version);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1626,7 +1624,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
jint ret = JNI_ERR;
DT_RETURN_MARK(GetEnv, jint, (const jint&)ret);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5649,15 +5521,13 @@ jint JNICALL jni_AttachCurrentThreadAsDaemon(JavaVM *vm, void **penv, void *_arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5647,15 +5519,13 @@
</span> #ifndef USDT2
DTRACE_PROBE3(hotspot_jni, AttachCurrentThreadAsDaemon__entry, vm, penv, _args);
#else /* USDT2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1644,7 +1642,7 @@ index dde3975677d..e6c42b6eea4 100644
</span> #endif /* USDT2 */
return JNI_ERR;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5667,8 +5537,7 @@ jint JNICALL jni_AttachCurrentThreadAsDaemon(JavaVM *vm, void **penv, void *_arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5665,8 +5535,7 @@
</span> #ifndef USDT2
DTRACE_PROBE1(hotspot_jni, AttachCurrentThreadAsDaemon__return, ret);
#else /* USDT2 */
</pre><pre style='margin:0'>
</pre>