changeset 4620:aa9a5e33e823 jdk7u14-b22

Merge
author amurillo
date Tue, 23 Apr 2013 13:58:02 -0700
parents c11b058d4170 6e999fc47427
children e0f1aa072185
files .hgtags make/hotspot_version
diffstat 2 files changed, 24 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 18 13:42:01 2013 -0700
+++ b/.hgtags	Tue Apr 23 13:58:02 2013 -0700
@@ -334,6 +334,8 @@
 ca6943c94e6075fc28353d52ac6ea52c80aef9bb jdk7u9-b02
 ed42837374ac730ddaf2fd28814017c665634a8b jdk7u9-b04
 da4aa289ac100017f850ed4d492e8054db6a1e28 jdk7u9-b05
+8eaa45ed5f804199c0823b409dc37f72e808926f jdk7u9-b31
+ea83168282c8c3a9f4a8ca723cc86972a3188d58 jdk7u9-b32
 d2e25680db9d4209b3f0f51e5c848284cedea508 jdk7u10-b10
 d37fd995683ab5bc2d941648ce7bf8bd194732f2 jdk7u10-b11
 f26f3d92e6d9ef7842b2d785f92439dbb15e670e jdk7u10-b12
@@ -344,8 +346,11 @@
 5c154a591de987d515f5b102a988bcf96d439f53 jdk7u10-b17
 78c7e1b4a006342230e04fbb73f637834207abef jdk7u10-b18
 c6b78bbaf6976197ead9d5aa3f65e0224cd13541 jdk7u10-b30
+07f7daeb261073a4a2946d988979ee65ba8ed753 jdk7u10-b31
 25a92b94ad538963d009bf8a53ce548e13f55c82 jdk7u11-b20
 7a2cf85fc36e845db9ccb2a22af195c70af33bdf jdk7u11-b21
+06b5c3f663b81f11da2080a91d215a96ae431f84 jdk7u11-b32
+abb5b690122caabf09f93958c747358cc22f8a59 jdk7u11-b33
 db7028c8a953f46225fceb6148f97de87c784dda jdk7u11-b03
 4d418a1b8be04220f504cf414b47877821a22a26 jdk7u11-b04
 f71032f398a3baea567710ba7161c64b94495cac jdk7u11-b05
@@ -447,10 +452,27 @@
 5fbe0cae3a2a78a73946cfd08c56a64860f1afd9 jdk7u15-b01
 30d72c9abb560bc424d16d96bfd396ccd3c62cbc jdk7u15-b02
 221c64550c5b4411d78b63820835de1a8cd0c118 jdk7u15-b30
+0b905a04f573565515aa8614085099abd73dcac4 jdk7u15-b31
+8b349f332a66ebe5982b5680c85f903efb03da8e jdk7u15-b33
 5b55cef461b034766f05a46640caa123aa4247d4 jdk7u15-b03
 34a7b6dda06e2ff6f7e9ad563e3fc3ecd8993579 jdk7u15-b32
 a4dfda7a2655209abb170b2fa4914dbbba89bcd3 jdk7u17-b01
 0d82bf449a610602b6e9ddcc9e076839d5351449 jdk7u17-b02
+7b357c079370e2fd324c229f2e24c982915c80a0 jdk7u17-b30
+22b6fd616cfe61774525a944f162bf5e7c418f03 jdk7u17-b31
+be57a8d7a1a75971c3b1e7777dcacd20f3d33264 jdk7u21-b01
+5119d89c7cc844190c0799dca85710e7592d42e7 jdk7u21-b02
+ad14169fb640ca532193cca0fd6e14910f226075 jdk7u21-b03
+c954aab38a7f8f62e33ae5103494576f67fc36d9 jdk7u21-b04
+0e8e9d990d91dc0f8b8807bb82c090de3264c809 jdk7u21-b05
+beeb3d6b76f06d9f60c31d6c5b9e04d82f01ad79 jdk7u21-b06
+663b5c744e82d1c884048cd9b38f625e52004773 jdk7u21-b07
+87e9bb582938552180b024dd99bc5166816f3921 jdk7u21-b08
+1f195ee7856aecb6527bc5c957f66e1960e51a12 jdk7u21-b09
+d4a4c2bd389abcd80c25d20e0ffb7d5cee356715 jdk7u21-b10
+d07dafb51e1d75f110a3c506c250d995235acca6 jdk7u21-b11
+a977dedec81c346247631ead6f3364c76949d67a jdk7u21-b30
+c5e4585a045fe165d067ec0e98af42eace20c5f8 jdk7u21-b12
 e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14
 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34
 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15
--- a/src/share/vm/opto/library_call.cpp	Thu Apr 18 13:42:01 2013 -0700
+++ b/src/share/vm/opto/library_call.cpp	Tue Apr 23 13:58:02 2013 -0700
@@ -3970,7 +3970,8 @@
       }
     }
   }
-  else if (method->is_method_handle_intrinsic() ||
+
+  if (method->is_method_handle_intrinsic() ||
            method->is_compiled_lambda_form()) {
     // This is an internal adapter frame from the MethodHandleCompiler -- skip it
     return true;