From e95e6b90701a0b9d396be8aa4cb7f3facf6bf71c Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Tue, 26 Feb 2013 16:16:54 -0800 Subject: [PATCH 1/4] 8004336: Better handling of method handle intrinsic frames Reviewed-by: kvn, jrose, ahgross --- hotspot/src/share/vm/opto/library_call.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp index cdcb9417760..fd5027eaad2 100644 --- a/hotspot/src/share/vm/opto/library_call.cpp +++ b/hotspot/src/share/vm/opto/library_call.cpp @@ -4005,8 +4005,9 @@ bool LibraryCallKit::is_method_invoke_or_aux_frame(JVMState* jvms) { } } } - else if (method->is_method_handle_intrinsic() || - method->is_compiled_lambda_form()) { + + if (method->is_method_handle_intrinsic() || + method->is_compiled_lambda_form()) { // This is an internal adapter frame from the MethodHandleCompiler -- skip it return true; } From 2c3899554fa3d45c2c366c29e8fbfbeb404f31ba Mon Sep 17 00:00:00 2001 From: Jim Gish Date: Tue, 16 Apr 2013 13:25:39 -0400 Subject: [PATCH 2/4] 8011347: JKD-8009824 has broken webrev with some ksh versions Reviewed-by: mduigou --- make/scripts/webrev.ksh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/make/scripts/webrev.ksh b/make/scripts/webrev.ksh index c95bce74523..9fef47fa69e 100644 --- a/make/scripts/webrev.ksh +++ b/make/scripts/webrev.ksh @@ -27,7 +27,7 @@ # Documentation is available via 'webrev -h'. # -WEBREV_UPDATED=23.18-hg+jbs +WEBREV_UPDATED=24.0-hg+jbs HTML=' &2 + echo "Created changeset: $CHANGESETPATH" 1>&2 # Use it in place of the jdk.patch created above rm -f $WDIR/$WNAME.patch fi From af106dbe5629ed324f9296d25c43979e40a46d6d Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 18 Apr 2013 10:30:04 -0700 Subject: [PATCH 3/4] Added tag jdk8-b86 for changeset 02ed1673d56f --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 79dfea39159..ab78580039e 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -207,3 +207,4 @@ fd1a5574cf68af24bfd52decc37ac6361afb278a jdk8-b78 466685ba01bfb7bc1e1ac61490fd8c0f3cc18763 jdk8-b83 01f631f89fa392b4e484d0812c40ea8f9d2353aa jdk8-b84 7fc358f5943676b82f1dccd3152b1ac07d92e38b jdk8-b85 +df9b5240f0a76c91cfe1a5b39da4d08df56e05be jdk8-b86 From 28c4fc4666e548e0e18b616bc8fadcf290890e05 Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 18 Apr 2013 10:30:11 -0700 Subject: [PATCH 4/4] Added tag jdk8-b86 for changeset b1cf5aefa461 --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index f22b56692f1..6a4db95d041 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -333,3 +333,4 @@ a947f40fb536e5b9e0aa210cf26abb430f80887a hs25-b26 42fe530cd478744a4d12a0cbf803f0fc804bab1a jdk8-b85 09b0d3e9ba6cdf7da07d4010d2d1df14596f6864 hs25-b27 6d88a566d369f6a1f86912cad7d0912686b2fda1 hs25-b28 +86db4847f195c0ecceea646431f1ff22d56282e8 jdk8-b86