--- a/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
dbb955b1ee59b876dd1f133952b557b48b1d7732 jdk7-b61
6107cbff3130c747d243c25a7874cd59db5744a8 jdk7-b62
dfd8506f74c3731bb169ce93c72612d78ee0413b jdk7-b63
+d22867c5f1b295a0a2b3b4bc8999a2676f6e20c3 jdk7-b64
+7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
+62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
--- a/.hgtags-top-repo Wed Jul 22 15:52:41 2009 +0200
+++ b/.hgtags-top-repo Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63
+269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
+e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
+6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
--- a/README-builds.html Wed Jul 22 15:52:41 2009 +0200
+++ b/README-builds.html Thu Jul 30 12:25:39 2009 -0700
@@ -120,6 +120,7 @@
<th>Base OS and Architecture</th>
<th>OS</th>
<th>C/C++ Compiler</th>
+ <th>BOOT JDK</th>
</tr>
</thead>
<tbody>
@@ -127,57 +128,65 @@
<td>Linux X86 (32-bit)</td>
<td>Fedora 9</td>
<td>gcc 4 </td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Linux X64 (64-bit)</td>
<td>Fedora 9</td>
<td>gcc 4 </td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Solaris SPARC (32-bit)</td>
- <td>Solaris 10 + patches
+ <td>Solaris 10u2 + patches
<br>
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
SunSolve</a> for patch downloads.
</td>
<td>Sun Studio 12</td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Solaris SPARCV9 (64-bit)</td>
- <td>Solaris 10 + patches
+ <td>Solaris 10u2 + patches
<br>
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
SunSolve</a> for patch downloads.
</td>
<td>Sun Studio 12</td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Solaris X86 (32-bit)</td>
- <td>Solaris 10 + patches
+ <td>Solaris 10u2 + patches
<br>
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
SunSolve</a> for patch downloads.
</td>
<td>Sun Studio 12</td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Solaris X64 (64-bit)</td>
- <td>Solaris 10 + patches
+ <td>Solaris 10u2 + patches
<br>
See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank">
SunSolve</a> for patch downloads.
</td>
<td>Sun Studio 12</td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Windows X86 (32-bit)</td>
<td>Windows XP</td>
<td>Microsoft Visual Studio C++ 2008 Standard Edition</td>
+ <td>JDK 6u14 FCS </td>
</tr>
<tr>
<td>Windows X64 (64-bit)</td>
<td>Windows Server 2003 - Enterprise x64 Edition</td>
<td>Microsoft Platform SDK - April 2005</td>
+ <td>JDK 6u14 FCS </td>
</tr>
</tbody>
</table>
--- a/corba/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
e906b16a12a9a63b615898afa5d9673cbd1c5ab8 jdk7-b61
65b66117dbd70a493e9644aeb4033cf95a4e3c99 jdk7-b62
d20e45cd539f20405ff843652069cfd7550c5ab3 jdk7-b63
+047dd27fddb607f8135296b3754131f6e13cb8c7 jdk7-b64
+97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
+a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
--- a/corba/make/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/common/Library.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/common/Library.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/common/Rules.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/common/Rules.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/common/shared/Compiler-gcc.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/common/shared/Compiler-gcc.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/common/shared/Defs-java.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/common/shared/Defs-java.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/common/shared/Defs-windows.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/common/shared/Defs-windows.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/common/shared/Platform.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/common/shared/Platform.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/jprt.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/jprt.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/org/omg/idl/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/org/omg/idl/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/make/tools/logutil/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/make/tools/logutil/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc Thu Jul 30 12:25:39 2009 -0700
@@ -1,6 +1,6 @@
;
-; Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+; Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
;
; This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/share/classes/org/omg/CORBA/ORB.java Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/share/classes/org/omg/CORBA/ORB.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/corba/src/windows/resource/version.rc Wed Jul 22 15:52:41 2009 +0200
+++ b/corba/src/windows/resource/version.rc Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
//
-// Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+// Copyright 2004-2009 Sun Microsystems, Inc. All Rights Reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
--- a/hotspot/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
27b728fd1281ab62e9d7e4424f8bbb6ca438d803 jdk7-b61
a88386380bdaaa5ab4ffbedf22c57bac5dbec034 jdk7-b62
32c83fb84370a35344676991a48440378e6b6c8a jdk7-b63
+ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64
+ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
+57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
--- a/hotspot/agent/src/os/linux/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/os/linux/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,23 +24,64 @@
package sun.jvm.hotspot.code;
+import java.util.*;
+
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.runtime.VM;
+import sun.jvm.hotspot.utilities.*;
public class DebugInfoReadStream extends CompressedReadStream {
private NMethod code;
private int InvocationEntryBCI;
+ private List objectPool; // ArrayList<ObjectValue>
public DebugInfoReadStream(NMethod code, int offset) {
super(code.scopesDataBegin(), offset);
InvocationEntryBCI = VM.getVM().getInvocationEntryBCI();
this.code = code;
+ this.objectPool = null;
+ }
+
+ public DebugInfoReadStream(NMethod code, int offset, List objectPool) {
+ super(code.scopesDataBegin(), offset);
+ InvocationEntryBCI = VM.getVM().getInvocationEntryBCI();
+ this.code = code;
+ this.objectPool = objectPool;
}
public OopHandle readOopHandle() {
return code.getOopAt(readInt());
}
+ ScopeValue readObjectValue() {
+ int id = readInt();
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(objectPool != null, "object pool does not exist");
+ for (Iterator itr = objectPool.iterator(); itr.hasNext();) {
+ ObjectValue ov = (ObjectValue) itr.next();
+ Assert.that(ov.id() != id, "should not be read twice");
+ }
+ }
+ ObjectValue result = new ObjectValue(id);
+ // Cache the object since an object field could reference it.
+ objectPool.add(result);
+ result.readObject(this);
+ return result;
+ }
+
+ ScopeValue getCachedObject() {
+ int id = readInt();
+ Assert.that(objectPool != null, "object pool does not exist");
+ for (Iterator itr = objectPool.iterator(); itr.hasNext();) {
+ ObjectValue ov = (ObjectValue) itr.next();
+ if (ov.id() == id) {
+ return ov;
+ }
+ }
+ Assert.that(false, "should not reach here");
+ return null;
+ }
+
public int readBCI() {
return readInt() + InvocationEntryBCI;
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/MonitorValue.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/MonitorValue.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
public class MonitorValue {
private ScopeValue owner;
private Location basicLock;
+ private boolean eliminated;
// FIXME: not useful yet
// MonitorValue(ScopeValue* owner, Location basic_lock);
@@ -36,10 +37,12 @@
public MonitorValue(DebugInfoReadStream stream) {
basicLock = new Location(stream);
owner = ScopeValue.readFrom(stream);
+ eliminated= stream.readBoolean();
}
public ScopeValue owner() { return owner; }
public Location basicLock() { return basicLock; }
+ public boolean eliminated() { return eliminated; }
// FIXME: not yet implementable
// void write_on(DebugInfoWriteStream* stream);
@@ -50,5 +53,8 @@
tty.print(",");
basicLock().printOn(tty);
tty.print("}");
+ if (eliminated) {
+ tty.print(" (eliminated)");
+ }
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ObjectValue.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.code;
+
+import java.io.*;
+import java.util.*;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.utilities.*;
+
+/** An ObjectValue describes an object eliminated by escape analysis. */
+
+public class ObjectValue extends ScopeValue {
+ private int id;
+ private ScopeValue klass;
+ private List fieldsValue; // ArrayList<ScopeValue>
+
+ // Field "boolean visited" is not implemented here since
+ // it is used only a during debug info creation.
+
+ public ObjectValue(int id) {
+ this.id = id;
+ klass = null;
+ fieldsValue = new ArrayList();
+ }
+
+ public boolean isObject() { return true; }
+ public int id() { return id; }
+ public ScopeValue getKlass() { return klass; }
+ public List getFieldsValue() { return fieldsValue; }
+ public ScopeValue getFieldAt(int i) { return (ScopeValue)fieldsValue.get(i); }
+ public int fieldsSize() { return fieldsValue.size(); }
+
+ // Field "value" is always NULL here since it is used
+ // only during deoptimization of a compiled frame
+ // pointing to reallocated object.
+ public OopHandle getValue() { return null; }
+
+ /** Serialization of debugging information */
+
+ void readObject(DebugInfoReadStream stream) {
+ klass = readFrom(stream);
+ Assert.that(klass.isConstantOop(), "should be constant klass oop");
+ int length = stream.readInt();
+ for (int i = 0; i < length; i++) {
+ ScopeValue val = readFrom(stream);
+ fieldsValue.add(val);
+ }
+ }
+
+ // Printing
+
+ public void print() {
+ printOn(System.out);
+ }
+
+ public void printOn(PrintStream tty) {
+ tty.print("scalarObj[" + id + "]");
+ }
+
+ void printFieldsOn(PrintStream tty) {
+ if (fieldsValue.size() > 0) {
+ ((ScopeValue)fieldsValue.get(0)).printOn(tty);
+ }
+ for (int i = 1; i < fieldsValue.size(); i++) {
+ tty.print(", ");
+ ((ScopeValue)fieldsValue.get(i)).printOn(tty);
+ }
+ }
+
+};
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,10 @@
import java.io.*;
import java.util.*;
+import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.utilities.*;
/** ScopeDescs contain the information that makes source-level
debugging of nmethods possible; each scopeDesc describes a method
@@ -45,10 +47,31 @@
private int localsDecodeOffset;
private int expressionsDecodeOffset;
private int monitorsDecodeOffset;
+ /** Scalar replaced bjects pool */
+ private List objects; // ArrayList<ScopeValue>
+
public ScopeDesc(NMethod code, int decodeOffset) {
this.code = code;
this.decodeOffset = decodeOffset;
+ this.objects = decodeObjectValues(DebugInformationRecorder.SERIALIZED_NULL);
+
+ // Decode header
+ DebugInfoReadStream stream = streamAt(decodeOffset);
+
+ senderDecodeOffset = stream.readInt();
+ method = (Method) VM.getVM().getObjectHeap().newOop(stream.readOopHandle());
+ bci = stream.readBCI();
+ // Decode offsets for body and sender
+ localsDecodeOffset = stream.readInt();
+ expressionsDecodeOffset = stream.readInt();
+ monitorsDecodeOffset = stream.readInt();
+ }
+
+ public ScopeDesc(NMethod code, int decodeOffset, int objectDecodeOffset) {
+ this.code = code;
+ this.decodeOffset = decodeOffset;
+ this.objects = decodeObjectValues(objectDecodeOffset);
// Decode header
DebugInfoReadStream stream = streamAt(decodeOffset);
@@ -81,6 +104,11 @@
return decodeMonitorValues(monitorsDecodeOffset);
}
+ /** Returns a List<MonitorValue> */
+ public List getObjects() {
+ return objects;
+ }
+
/** Stack walking. Returns null if this is the outermost scope. */
public ScopeDesc sender() {
if (isTop()) {
@@ -131,7 +159,7 @@
//
private DebugInfoReadStream streamAt(int decodeOffset) {
- return new DebugInfoReadStream(code, decodeOffset);
+ return new DebugInfoReadStream(code, decodeOffset, objects);
}
/** Returns a List<ScopeValue> or null if no values were present */
@@ -161,4 +189,22 @@
}
return res;
}
+
+ /** Returns a List<ObjectValue> or null if no values were present */
+ private List decodeObjectValues(int decodeOffset) {
+ if (decodeOffset == DebugInformationRecorder.SERIALIZED_NULL) {
+ return null;
+ }
+ List res = new ArrayList();
+ DebugInfoReadStream stream = new DebugInfoReadStream(code, decodeOffset, res);
+ int length = stream.readInt();
+ for (int i = 0; i < length; i++) {
+ // Objects values are pushed to 'res' array during read so that
+ // object's fields could reference it (OBJECT_ID_CODE).
+ ScopeValue.readFrom(stream);
+ // res.add(ScopeValue.readFrom(stream));
+ }
+ Assert.that(res.size() == length, "inconsistent debug information");
+ return res;
+ }
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeValue.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeValue.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,12 +49,15 @@
static final int CONSTANT_OOP_CODE = 2;
static final int CONSTANT_LONG_CODE = 3;
static final int CONSTANT_DOUBLE_CODE = 4;
+ static final int CONSTANT_OBJECT_CODE = 5;
+ static final int CONSTANT_OBJECT_ID_CODE = 6;
public boolean isLocation() { return false; }
public boolean isConstantInt() { return false; }
public boolean isConstantDouble() { return false; }
public boolean isConstantLong() { return false; }
public boolean isConstantOop() { return false; }
+ public boolean isObject() { return false; }
public static ScopeValue readFrom(DebugInfoReadStream stream) {
switch (stream.readInt()) {
@@ -68,6 +71,10 @@
return new ConstantLongValue(stream);
case CONSTANT_DOUBLE_CODE:
return new ConstantDoubleValue(stream);
+ case CONSTANT_OBJECT_CODE:
+ return stream.readObjectValue();
+ case CONSTANT_OBJECT_ID_CODE:
+ return stream.getCachedObject();
default:
Assert.that(false, "should not reach here");
return null;
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/Debugger.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/Debugger.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -249,6 +249,7 @@
OopHandle givenHandle = obj.getHandle();
for (Iterator itr = monitors.iterator(); itr.hasNext();) {
MonitorInfo mi = (MonitorInfo) itr.next();
+ if (mi.eliminated() && frame.isCompiledFrame()) continue; // skip eliminated monitor
if (givenHandle.equals(mi.owner())) {
res++;
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -301,6 +301,9 @@
List frameMonitors = frame.getMonitors(); // List<MonitorInfo>
for (Iterator miItr = frameMonitors.iterator(); miItr.hasNext(); ) {
sun.jvm.hotspot.runtime.MonitorInfo mi = (sun.jvm.hotspot.runtime.MonitorInfo) miItr.next();
+ if (mi.eliminated() && frame.isCompiledFrame()) {
+ continue; // skip eliminated monitor
+ }
OopHandle obj = mi.owner();
if (obj == null) {
// this monitor doesn't have an owning object so skip it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -131,8 +131,18 @@
List result = new ArrayList(monitors.size());
for (int i = 0; i < monitors.size(); i++) {
MonitorValue mv = (MonitorValue) monitors.get(i);
- StackValue ownerSV = createStackValue(mv.owner()); // it is an oop
- result.add(new MonitorInfo(ownerSV.getObject(), resolveMonitorLock(mv.basicLock())));
+ ScopeValue ov = mv.owner();
+ StackValue ownerSV = createStackValue(ov); // it is an oop
+ if (ov.isObject()) { // The owner object was scalar replaced
+ Assert.that(mv.eliminated() && ownerSV.objIsScalarReplaced(), "monitor should be eliminated for scalar replaced object");
+ // Put klass for scalar replaced object.
+ ScopeValue kv = ((ObjectValue)ov).getKlass();
+ Assert.that(kv.isConstantOop(), "klass should be oop constant for scalar replaced object");
+ OopHandle k = ((ConstantOopReadValue)kv).getValue();
+ result.add(new MonitorInfo(k, resolveMonitorLock(mv.basicLock()), mv.eliminated(), true));
+ } else {
+ result.add(new MonitorInfo(ownerSV.getObject(), resolveMonitorLock(mv.basicLock()), mv.eliminated(), false));
+ }
}
return result;
}
@@ -212,12 +222,12 @@
// long or is unused. He always saves a long. Here we know
// a long was saved, but we only want an narrow oop back. Narrow the
// saved long to the narrow oop that the JVM wants.
- return new StackValue(valueAddr.getCompOopHandleAt(VM.getVM().getIntSize()));
+ return new StackValue(valueAddr.getCompOopHandleAt(VM.getVM().getIntSize()), 0);
} else {
- return new StackValue(valueAddr.getCompOopHandleAt(0));
+ return new StackValue(valueAddr.getCompOopHandleAt(0), 0);
}
} else if( loc.holdsOop() ) { // Holds an oop?
- return new StackValue(valueAddr.getOopHandleAt(0));
+ return new StackValue(valueAddr.getOopHandleAt(0), 0);
} else if( loc.holdsDouble() ) {
// Double value in a single stack slot
return new StackValue(valueAddr.getJIntAt(0) & 0xFFFFFFFF);
@@ -277,7 +287,7 @@
return new StackValue(((ConstantIntValue) sv).getValue() & 0xFFFFFFFF);
} else if (sv.isConstantOop()) {
// constant oop
- return new StackValue(((ConstantOopReadValue) sv).getValue());
+ return new StackValue(((ConstantOopReadValue) sv).getValue(), 0);
} else if (sv.isConstantDouble()) {
// Constant double in a single stack slot
double d = ((ConstantDoubleValue) sv).getValue();
@@ -285,6 +295,9 @@
} else if (VM.getVM().isLP64() && sv.isConstantLong()) {
// Constant long in a single stack slot
return new StackValue(((ConstantLongValue) sv).getValue() & 0xFFFFFFFF);
+ } else if (sv.isObject()) {
+ // Scalar replaced object in compiled frame
+ return new StackValue(((ObjectValue)sv).getValue(), 1);
}
// Unknown ScopeValue type
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@
StackValue sv;
if (oopMask.isOop(i)) {
// oop value
- sv = new StackValue(addr.getOopHandleAt(0));
+ sv = new StackValue(addr.getOopHandleAt(0), 0);
} else {
// integer
// Fetch a signed integer the size of a stack slot
@@ -95,7 +95,7 @@
StackValue sv;
if (oopMask.isOop(i + nofLocals)) {
// oop value
- sv = new StackValue(addr.getOopHandleAt(0));
+ sv = new StackValue(addr.getOopHandleAt(0), 0);
} else {
// integer
// Fetch a signed integer the size of a stack slot
@@ -113,7 +113,7 @@
for (BasicObjectLock current = getFrame().interpreterFrameMonitorEnd();
current.address().lessThan(getFrame().interpreterFrameMonitorBegin().address());
current = getFrame().nextMonitorInInterpreterFrame(current)) {
- result.add(new MonitorInfo(current.obj(), current.lock()));
+ result.add(new MonitorInfo(current.obj(), current.lock(), false, false));
}
return result;
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,39 @@
package sun.jvm.hotspot.runtime;
import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.utilities.*;
public class MonitorInfo {
private OopHandle owner;
private BasicLock lock;
+ private OopHandle ownerKlass;
+ private boolean eliminated;
+ private boolean ownerIsScalarReplaced;
- public MonitorInfo(OopHandle owner, BasicLock lock) {
- this.owner = owner;
- this.lock = lock;
+ public MonitorInfo(OopHandle owner, BasicLock lock, boolean eliminated, boolean ownerIsScalarReplaced) {
+ if (!ownerIsScalarReplaced) {
+ this.owner = owner;
+ this.ownerKlass = null;
+ } else {
+ Assert.that(eliminated, "monitor should be eliminated for scalar replaced object");
+ this.owner = null;
+ this.ownerKlass = owner;
+ }
+ this.eliminated = eliminated;
+ this.ownerIsScalarReplaced = ownerIsScalarReplaced;
}
- public OopHandle owner() { return owner; }
+ public OopHandle owner() {
+ Assert.that(!ownerIsScalarReplaced, "should not be called for scalar replaced object");
+ return owner;
+ }
+
+ public OopHandle ownerKlass() {
+ Assert.that(ownerIsScalarReplaced, "should not be called for not scalar replaced object");
+ return ownerKlass;
+ }
+
public BasicLock lock() { return lock; }
+ public boolean eliminated() { return eliminated; }
+ public boolean ownerIsScalarReplaced() { return ownerIsScalarReplaced; }
}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,11 @@
type = BasicType.getTConflict();
}
- public StackValue(OopHandle h) {
+ public StackValue(OopHandle h, long scalar_replaced) {
handleValue = h;
type = BasicType.getTObject();
+ integerValue = scalar_replaced;
+ Assert.that(integerValue == 0 || handleValue == null, "not null object should not be marked as scalar replaced");
}
public StackValue(long i) {
@@ -59,6 +61,13 @@
return handleValue;
}
+ boolean objIsScalarReplaced() {
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(type == BasicType.getTObject(), "type check");
+ }
+ return integerValue != 0;
+ }
+
public long getInteger() {
if (Assert.ASSERTS_ENABLED) {
Assert.that(type == BasicType.getTInt(), "type check");
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -161,6 +161,8 @@
child = new OopTreeNodeAdapter(field.getValue(getObj()), field.getID(), getTreeTableMode());
} catch (AddressException e) {
child = new BadOopTreeNodeAdapter(field.getValueAsOopHandle(getObj()), field.getID(), getTreeTableMode());
+ } catch (UnknownOopException e) {
+ child = new BadOopTreeNodeAdapter(field.getValueAsOopHandle(getObj()), field.getID(), getTreeTableMode());
}
}
++curField;
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaThread.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -135,6 +135,10 @@
List frameMonitors = frame.getMonitors(); // List<MonitorInfo>
for (Iterator miItr = frameMonitors.iterator(); miItr.hasNext(); ) {
MonitorInfo mi = (MonitorInfo) miItr.next();
+
+ if (mi.eliminated() && frame.isCompiledFrame()) {
+ continue; // skip eliminated monitor
+ }
OopHandle obj = mi.owner();
if (obj == null) {
// this monitor doesn't have an owning object so skip it
--- a/hotspot/make/hotspot_version Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/hotspot_version Thu Jul 30 12:25:39 2009 -0700
@@ -35,7 +35,7 @@
HS_MAJOR_VER=16
HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=07
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
--- a/hotspot/make/jprt.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/jprt.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/linux/makefiles/jsig.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/linux/makefiles/jsig.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/linux/makefiles/saproc.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/linux/makefiles/saproc.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/solaris/makefiles/adlc.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/solaris/makefiles/adlc.make Thu Jul 30 12:25:39 2009 -0700
@@ -68,7 +68,9 @@
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
-CFLAGS_WARN = +w -errwarn
+ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
+ CFLAGS_WARN = +w -errwarn
+endif
CFLAGS += $(CFLAGS_WARN)
ifeq ("${Platform_compiler}", "sparcWorks")
--- a/hotspot/make/solaris/makefiles/optimized.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/solaris/makefiles/optimized.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
endif
# Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)
-ifeq ($(COMPILER_REV_NUMERIC),508))
+ifeq ($(COMPILER_REV_NUMERIC),508)
OPT_CFLAGS/ciTypeFlow.o = $(OPT_CFLAGS/O2)
endif # COMPILER_REV_NUMERIC == 508
--- a/hotspot/make/solaris/makefiles/sparcWorks.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/build_vm_def.sh Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/build_vm_def.sh Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/create.bat Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/create.bat Thu Jul 30 12:25:39 2009 -0700
@@ -1,6 +1,6 @@
@echo off
REM
-REM Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+REM Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
REM
REM This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/get_msc_ver.sh Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/get_msc_ver.sh Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/adlc.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/adlc.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/compile.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/compile.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/makedeps.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/makedeps.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/rules.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/rules.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/sa.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/sa.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/sanity.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/sanity.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/make/windows/makefiles/vm.make Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/make/windows/makefiles/vm.make Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -4208,6 +4208,7 @@
PtrQueue::byte_offset_of_active()),
tmp);
}
+
// Check on whether to annul.
br_on_reg_cond(rc_z, /*annul*/false, Assembler::pt, tmp, filtered);
delayed() -> nop();
@@ -4215,13 +4216,13 @@
// satb_log_barrier_work1(tmp, offset);
if (index == noreg) {
if (Assembler::is_simm13(offset)) {
- ld_ptr(obj, offset, tmp);
+ load_heap_oop(obj, offset, tmp);
} else {
set(offset, tmp);
- ld_ptr(obj, tmp, tmp);
+ load_heap_oop(obj, tmp, tmp);
}
} else {
- ld_ptr(obj, index, tmp);
+ load_heap_oop(obj, index, tmp);
}
// satb_log_barrier_work2(obj, tmp, offset);
--- a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -371,7 +371,7 @@
}
__ move(value.result(), array_addr, null_check_info);
if (obj_store) {
- // Is this precise?
+ // Precise card mark
post_barrier(LIR_OprFact::address(array_addr), value.result());
}
}
@@ -685,11 +685,8 @@
LIR_Opr result = rlock_result(x);
__ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0), result);
if (type == objectType) { // Write-barrier needed for Object fields.
-#ifdef PRECISE_CARDMARK
+ // Precise card mark since could either be object or array
post_barrier(addr, val.result());
-#else
- post_barrier(obj.result(), val.result());
-#endif // PRECISE_CARDMARK
}
}
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/sparc/vm/sparc.ad Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad Thu Jul 30 12:25:39 2009 -0700
@@ -1891,17 +1891,17 @@
// The intptr_t operand types, defined by textual substitution.
// (Cf. opto/type.hpp. This lets us avoid many, many other ifdefs.)
#ifdef _LP64
-#define immX immL
-#define immX13 immL13
-#define immX13m7 immL13m7
-#define iRegX iRegL
-#define g1RegX g1RegL
+#define immX immL
+#define immX13 immL13
+#define immX13m7 immL13m7
+#define iRegX iRegL
+#define g1RegX g1RegL
#else
-#define immX immI
-#define immX13 immI13
-#define immX13m7 immI13m7
-#define iRegX iRegI
-#define g1RegX g1RegI
+#define immX immI
+#define immX13 immI13
+#define immX13m7 immI13m7
+#define iRegX iRegI
+#define g1RegX g1RegI
#endif
//----------ENCODING BLOCK-----------------------------------------------------
@@ -3446,6 +3446,15 @@
interface(CONST_INTER);
%}
+// Integer Immediate: 8-bit
+operand immI8() %{
+ predicate(Assembler::is_simm(n->get_int(), 8));
+ match(ConI);
+ op_cost(0);
+ format %{ %}
+ interface(CONST_INTER);
+%}
+
// Integer Immediate: 13-bit
operand immI13() %{
predicate(Assembler::is_simm13(n->get_int()));
@@ -3466,6 +3475,15 @@
interface(CONST_INTER);
%}
+// Integer Immediate: 16-bit
+operand immI16() %{
+ predicate(Assembler::is_simm(n->get_int(), 16));
+ match(ConI);
+ op_cost(0);
+ format %{ %}
+ interface(CONST_INTER);
+%}
+
// Unsigned (positive) Integer Immediate: 13-bit
operand immU13() %{
predicate((0 <= n->get_int()) && Assembler::is_simm13(n->get_int()));
@@ -5544,7 +5562,7 @@
ins_encode %{
__ ldub($mem$$Address, $dst$$Register);
%}
- ins_pipe(iload_mask_mem);
+ ins_pipe(iload_mem);
%}
// Load Unsigned Byte (8bit UNsigned) into a Long Register
@@ -5557,7 +5575,22 @@
ins_encode %{
__ ldub($mem$$Address, $dst$$Register);
%}
- ins_pipe(iload_mask_mem);
+ ins_pipe(iload_mem);
+%}
+
+// Load Unsigned Byte (8 bit UNsigned) with 8-bit mask into Long Register
+instruct loadUB2L_immI8(iRegL dst, memory mem, immI8 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadUB mem) mask)));
+ ins_cost(MEMORY_REF_COST + DEFAULT_COST);
+
+ size(2*4);
+ format %{ "LDUB $mem,$dst\t# ubyte & 8-bit mask -> long\n\t"
+ "AND $dst,$mask,$dst" %}
+ ins_encode %{
+ __ ldub($mem$$Address, $dst$$Register);
+ __ and3($dst$$Register, $mask$$constant, $dst$$Register);
+ %}
+ ins_pipe(iload_mem);
%}
// Load Short (16bit signed)
@@ -5610,7 +5643,7 @@
ins_encode %{
__ lduh($mem$$Address, $dst$$Register);
%}
- ins_pipe(iload_mask_mem);
+ ins_pipe(iload_mem);
%}
// Load Unsigned Short/Char (16 bit UNsigned) to Byte (8 bit signed)
@@ -5636,7 +5669,56 @@
ins_encode %{
__ lduh($mem$$Address, $dst$$Register);
%}
- ins_pipe(iload_mask_mem);
+ ins_pipe(iload_mem);
+%}
+
+// Load Unsigned Short/Char (16bit UNsigned) with mask 0xFF into a Long Register
+instruct loadUS2L_immI_255(iRegL dst, indOffset13m7 mem, immI_255 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+ ins_cost(MEMORY_REF_COST);
+
+ size(4);
+ format %{ "LDUB $mem+1,$dst\t! ushort/char & 0xFF -> long" %}
+ ins_encode %{
+ __ ldub($mem$$Address, $dst$$Register, 1); // LSB is index+1 on BE
+ %}
+ ins_pipe(iload_mem);
+%}
+
+// Load Unsigned Short/Char (16bit UNsigned) with a 13-bit mask into a Long Register
+instruct loadUS2L_immI13(iRegL dst, memory mem, immI13 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+ ins_cost(MEMORY_REF_COST + DEFAULT_COST);
+
+ size(2*4);
+ format %{ "LDUH $mem,$dst\t! ushort/char & 13-bit mask -> long\n\t"
+ "AND $dst,$mask,$dst" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ lduh($mem$$Address, Rdst);
+ __ and3(Rdst, $mask$$constant, Rdst);
+ %}
+ ins_pipe(iload_mem);
+%}
+
+// Load Unsigned Short/Char (16bit UNsigned) with a 16-bit mask into a Long Register
+instruct loadUS2L_immI16(iRegL dst, memory mem, immI16 mask, iRegL tmp) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+ effect(TEMP dst, TEMP tmp);
+ ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
+
+ size(3*4);
+ format %{ "LDUH $mem,$dst\t! ushort/char & 16-bit mask -> long\n\t"
+ "SET $mask,$tmp\n\t"
+ "AND $dst,$tmp,$dst" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ Register Rtmp = $tmp$$Register;
+ __ lduh($mem$$Address, Rdst);
+ __ set($mask$$constant, Rtmp);
+ __ and3(Rdst, Rtmp, Rdst);
+ %}
+ ins_pipe(iload_mem);
%}
// Load Integer
@@ -5718,6 +5800,68 @@
ins_encode %{
__ ldsw($mem$$Address, $dst$$Register);
%}
+ ins_pipe(iload_mask_mem);
+%}
+
+// Load Integer with mask 0xFF into a Long Register
+instruct loadI2L_immI_255(iRegL dst, indOffset13m7 mem, immI_255 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ ins_cost(MEMORY_REF_COST);
+
+ size(4);
+ format %{ "LDUB $mem+3,$dst\t! int & 0xFF -> long" %}
+ ins_encode %{
+ __ ldub($mem$$Address, $dst$$Register, 3); // LSB is index+3 on BE
+ %}
+ ins_pipe(iload_mem);
+%}
+
+// Load Integer with mask 0xFFFF into a Long Register
+instruct loadI2L_immI_65535(iRegL dst, indOffset13m7 mem, immI_65535 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ ins_cost(MEMORY_REF_COST);
+
+ size(4);
+ format %{ "LDUH $mem+2,$dst\t! int & 0xFFFF -> long" %}
+ ins_encode %{
+ __ lduh($mem$$Address, $dst$$Register, 2); // LSW is index+2 on BE
+ %}
+ ins_pipe(iload_mem);
+%}
+
+// Load Integer with a 13-bit mask into a Long Register
+instruct loadI2L_immI13(iRegL dst, memory mem, immI13 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ ins_cost(MEMORY_REF_COST + DEFAULT_COST);
+
+ size(2*4);
+ format %{ "LDUW $mem,$dst\t! int & 13-bit mask -> long\n\t"
+ "AND $dst,$mask,$dst" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ lduw($mem$$Address, Rdst);
+ __ and3(Rdst, $mask$$constant, Rdst);
+ %}
+ ins_pipe(iload_mem);
+%}
+
+// Load Integer with a 32-bit mask into a Long Register
+instruct loadI2L_immI(iRegL dst, memory mem, immI mask, iRegL tmp) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(TEMP dst, TEMP tmp);
+ ins_cost(MEMORY_REF_COST + 2*DEFAULT_COST);
+
+ size(3*4);
+ format %{ "LDUW $mem,$dst\t! int & 32-bit mask -> long\n\t"
+ "SET $mask,$tmp\n\t"
+ "AND $dst,$tmp,$dst" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ Register Rtmp = $tmp$$Register;
+ __ lduw($mem$$Address, Rdst);
+ __ set($mask$$constant, Rtmp);
+ __ and3(Rdst, Rtmp, Rdst);
+ %}
ins_pipe(iload_mem);
%}
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -6805,14 +6805,18 @@
jcc(Assembler::equal, done);
// if (x.f == NULL) goto done;
- cmpptr(Address(obj, 0), NULL_WORD);
+#ifdef _LP64
+ load_heap_oop(tmp2, Address(obj, 0));
+#else
+ movptr(tmp2, Address(obj, 0));
+#endif
+ cmpptr(tmp2, (int32_t) NULL_WORD);
jcc(Assembler::equal, done);
// Can we store original value in the thread's buffer?
- LP64_ONLY(movslq(tmp, index);)
- movptr(tmp2, Address(obj, 0));
#ifdef _LP64
+ movslq(tmp, index);
cmpq(tmp, 0);
#else
cmpl(index, 0);
@@ -6834,8 +6838,7 @@
if(tosca_live) push(rax);
push(obj);
#ifdef _LP64
- movq(c_rarg0, Address(obj, 0));
- call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), c_rarg0, r15_thread);
+ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), tmp2, r15_thread);
#else
push(thread);
call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), tmp2, thread);
--- a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1372,6 +1372,8 @@
// If no method data exists, go to profile_continue.
test_method_data_pointer(mdp, profile_continue);
+ set_mdp_flag_at(mdp, BitData::null_seen_byte_constant());
+
// The method data pointer needs to be updated.
int mdp_delta = in_bytes(BitData::bit_data_size());
if (TypeProfileCasts) {
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1409,6 +1409,8 @@
// If no method data exists, go to profile_continue.
test_method_data_pointer(mdp, profile_continue);
+ set_mdp_flag_at(mdp, BitData::null_seen_byte_constant());
+
// The method data pointer needs to be updated.
int mdp_delta = in_bytes(BitData::bit_data_size());
if (TypeProfileCasts) {
--- a/hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -269,11 +269,11 @@
#ifndef PRODUCT
void trace_method_handle_stub(const char* adaptername,
- oop mh,
+ oopDesc* mh,
intptr_t* entry_sp,
intptr_t* saved_sp) {
// called as a leaf from native code: do not block the JVM!
- printf("MH %s "PTR_FORMAT" "PTR_FORMAT" "INTX_FORMAT"\n", adaptername, mh, entry_sp, entry_sp - saved_sp);
+ printf("MH %s "PTR_FORMAT" "PTR_FORMAT" "INTX_FORMAT"\n", adaptername, (void*)mh, entry_sp, entry_sp - saved_sp);
}
#endif //PRODUCT
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1302,22 +1302,19 @@
const Register ic_reg = rax;
const Register receiver = j_rarg0;
- const Register tmp = rdx;
Label ok;
Label exception_pending;
+ assert_different_registers(ic_reg, receiver, rscratch1);
__ verify_oop(receiver);
- __ push(tmp); // spill (any other registers free here???)
- __ load_klass(tmp, receiver);
- __ cmpq(ic_reg, tmp);
+ __ load_klass(rscratch1, receiver);
+ __ cmpq(ic_reg, rscratch1);
__ jcc(Assembler::equal, ok);
- __ pop(tmp);
__ jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
__ bind(ok);
- __ pop(tmp);
// Verified entry point must be aligned
__ align(8);
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -709,7 +709,7 @@
//
// Input:
// start - starting address
- // end - element count
+ // count - element count
void gen_write_ref_array_pre_barrier(Register start, Register count) {
assert_different_registers(start, count);
BarrierSet* bs = Universe::heap()->barrier_set();
@@ -757,7 +757,6 @@
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post)));
__ addptr(rsp, 2*wordSize);
__ popa();
-
}
break;
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1207,9 +1207,9 @@
__ pusha(); // push registers (overkill)
// must compute element count unless barrier set interface is changed (other platforms supply count)
assert_different_registers(start, end, scratch);
- __ lea(scratch, Address(end, wordSize));
- __ subptr(scratch, start);
- __ shrptr(scratch, LogBytesPerWord);
+ __ lea(scratch, Address(end, BytesPerHeapOop));
+ __ subptr(scratch, start); // subtract start to get #bytes
+ __ shrptr(scratch, LogBytesPerHeapOop); // convert to element count
__ mov(c_rarg0, start);
__ mov(c_rarg1, scratch);
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post)));
@@ -1225,6 +1225,7 @@
Label L_loop;
__ shrptr(start, CardTableModRefBS::card_shift);
+ __ addptr(end, BytesPerHeapOop);
__ shrptr(end, CardTableModRefBS::card_shift);
__ subptr(end, start); // number of bytes to copy
@@ -2251,6 +2252,7 @@
// and report their number to the caller.
assert_different_registers(rax, r14_length, count, to, end_to, rcx);
__ lea(end_to, to_element_addr);
+ __ addptr(end_to, -heapOopSize); // make an inclusive end pointer
gen_write_ref_array_post_barrier(to, end_to, rscratch1);
__ movptr(rax, r14_length); // original oops
__ addptr(rax, count); // K = (original - remaining) oops
@@ -2259,7 +2261,7 @@
// Come here on success only.
__ BIND(L_do_card_marks);
- __ addptr(end_to, -wordSize); // make an inclusive end pointer
+ __ addptr(end_to, -heapOopSize); // make an inclusive end pointer
gen_write_ref_array_post_barrier(to, end_to, rscratch1);
__ xorptr(rax, rax); // return 0 on success
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/vtableStubs_x86_32.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/vtableStubs_x86_32.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/vtableStubs_x86_64.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/cpu/x86/vm/x86_32.ad Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad Thu Jul 30 12:25:39 2009 -0700
@@ -6885,8 +6885,9 @@
%}
// Load Byte (8bit signed) into Long Register
-instruct loadB2L(eRegL dst, memory mem) %{
+instruct loadB2L(eRegL dst, memory mem, eFlagsReg cr) %{
match(Set dst (ConvI2L (LoadB mem)));
+ effect(KILL cr);
ins_cost(375);
format %{ "MOVSX8 $dst.lo,$mem\t# byte -> long\n\t"
@@ -6917,19 +6918,37 @@
%}
// Load Unsigned Byte (8 bit UNsigned) into Long Register
-instruct loadUB2L(eRegL dst, memory mem)
-%{
+instruct loadUB2L(eRegL dst, memory mem, eFlagsReg cr) %{
match(Set dst (ConvI2L (LoadUB mem)));
+ effect(KILL cr);
ins_cost(250);
format %{ "MOVZX8 $dst.lo,$mem\t# ubyte -> long\n\t"
"XOR $dst.hi,$dst.hi" %}
ins_encode %{
- __ movzbl($dst$$Register, $mem$$Address);
- __ xorl(HIGH_FROM_LOW($dst$$Register), HIGH_FROM_LOW($dst$$Register));
- %}
-
+ Register Rdst = $dst$$Register;
+ __ movzbl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ %}
+
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Unsigned Byte (8 bit UNsigned) with mask into Long Register
+instruct loadUB2L_immI8(eRegL dst, memory mem, immI8 mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadUB mem) mask)));
+ effect(KILL cr);
+
+ format %{ "MOVZX8 $dst.lo,$mem\t# ubyte & 8-bit mask -> long\n\t"
+ "XOR $dst.hi,$dst.hi\n\t"
+ "AND $dst.lo,$mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzbl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ __ andl(Rdst, $mask$$constant);
+ %}
ins_pipe(ialu_reg_mem);
%}
@@ -6960,8 +6979,9 @@
%}
// Load Short (16bit signed) into Long Register
-instruct loadS2L(eRegL dst, memory mem) %{
+instruct loadS2L(eRegL dst, memory mem, eFlagsReg cr) %{
match(Set dst (ConvI2L (LoadS mem)));
+ effect(KILL cr);
ins_cost(375);
format %{ "MOVSX $dst.lo,$mem\t# short -> long\n\t"
@@ -7004,8 +7024,9 @@
%}
// Load Unsigned Short/Char (16 bit UNsigned) into Long Register
-instruct loadUS2L(eRegL dst, memory mem) %{
+instruct loadUS2L(eRegL dst, memory mem, eFlagsReg cr) %{
match(Set dst (ConvI2L (LoadUS mem)));
+ effect(KILL cr);
ins_cost(250);
format %{ "MOVZX $dst.lo,$mem\t# ushort/char -> long\n\t"
@@ -7019,6 +7040,38 @@
ins_pipe(ialu_reg_mem);
%}
+// Load Unsigned Short/Char (16 bit UNsigned) with mask 0xFF into Long Register
+instruct loadUS2L_immI_255(eRegL dst, memory mem, immI_255 mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+ effect(KILL cr);
+
+ format %{ "MOVZX8 $dst.lo,$mem\t# ushort/char & 0xFF -> long\n\t"
+ "XOR $dst.hi,$dst.hi" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzbl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Unsigned Short/Char (16 bit UNsigned) with a 16-bit mask into Long Register
+instruct loadUS2L_immI16(eRegL dst, memory mem, immI16 mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+ effect(KILL cr);
+
+ format %{ "MOVZX $dst.lo, $mem\t# ushort/char & 16-bit mask -> long\n\t"
+ "XOR $dst.hi,$dst.hi\n\t"
+ "AND $dst.lo,$mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzwl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ __ andl(Rdst, $mask$$constant);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
// Load Integer
instruct loadI(eRegI dst, memory mem) %{
match(Set dst (LoadI mem));
@@ -7082,8 +7135,9 @@
%}
// Load Integer into Long Register
-instruct loadI2L(eRegL dst, memory mem) %{
+instruct loadI2L(eRegL dst, memory mem, eFlagsReg cr) %{
match(Set dst (ConvI2L (LoadI mem)));
+ effect(KILL cr);
ins_cost(375);
format %{ "MOV $dst.lo,$mem\t# int -> long\n\t"
@@ -7099,9 +7153,57 @@
ins_pipe(ialu_reg_mem);
%}
+// Load Integer with mask 0xFF into Long Register
+instruct loadI2L_immI_255(eRegL dst, memory mem, immI_255 mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(KILL cr);
+
+ format %{ "MOVZX8 $dst.lo,$mem\t# int & 0xFF -> long\n\t"
+ "XOR $dst.hi,$dst.hi" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzbl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Integer with mask 0xFFFF into Long Register
+instruct loadI2L_immI_65535(eRegL dst, memory mem, immI_65535 mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(KILL cr);
+
+ format %{ "MOVZX $dst.lo,$mem\t# int & 0xFFFF -> long\n\t"
+ "XOR $dst.hi,$dst.hi" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzwl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Integer with 32-bit mask into Long Register
+instruct loadI2L_immI(eRegL dst, memory mem, immI mask, eFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(KILL cr);
+
+ format %{ "MOV $dst.lo,$mem\t# int & 32-bit mask -> long\n\t"
+ "XOR $dst.hi,$dst.hi\n\t"
+ "AND $dst.lo,$mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movl(Rdst, $mem$$Address);
+ __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
+ __ andl(Rdst, $mask$$constant);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
// Load Unsigned Integer into Long Register
-instruct loadUI2L(eRegL dst, memory mem) %{
+instruct loadUI2L(eRegL dst, memory mem, eFlagsReg cr) %{
match(Set dst (LoadUI2L mem));
+ effect(KILL cr);
ins_cost(250);
format %{ "MOV $dst.lo,$mem\t# uint -> long\n\t"
@@ -7695,6 +7797,17 @@
ins_pipe( ialu_mem_long_reg );
%}
+// Store Long to Integer
+instruct storeL2I(memory mem, eRegL src) %{
+ match(Set mem (StoreI mem (ConvL2I src)));
+
+ format %{ "MOV $mem,$src.lo\t# long -> int" %}
+ ins_encode %{
+ __ movl($mem$$Address, $src$$Register);
+ %}
+ ins_pipe(ialu_mem_reg);
+%}
+
// Volatile Store Long. Must be atomic, so move it into
// the FP TOS and then do a 64-bit FIST. Has to probe the
// target address before the store (for null-ptr checks)
--- a/hotspot/src/cpu/x86/vm/x86_64.ad Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad Thu Jul 30 12:25:39 2009 -0700
@@ -6444,6 +6444,21 @@
ins_pipe(ialu_reg_mem);
%}
+// Load Unsigned Byte (8 bit UNsigned) with a 8-bit mask into Long Register
+instruct loadUB2L_immI8(rRegL dst, memory mem, immI8 mask, rFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadUB mem) mask)));
+ effect(KILL cr);
+
+ format %{ "movzbq $dst, $mem\t# ubyte & 8-bit mask -> long\n\t"
+ "andl $dst, $mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzbq(Rdst, $mem$$Address);
+ __ andl(Rdst, $mask$$constant);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
// Load Short (16 bit signed)
instruct loadS(rRegI dst, memory mem)
%{
@@ -6528,6 +6543,32 @@
ins_pipe(ialu_reg_mem);
%}
+// Load Unsigned Short/Char (16 bit UNsigned) with mask 0xFF into Long Register
+instruct loadUS2L_immI_255(rRegL dst, memory mem, immI_255 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+
+ format %{ "movzbq $dst, $mem\t# ushort/char & 0xFF -> long" %}
+ ins_encode %{
+ __ movzbq($dst$$Register, $mem$$Address);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Unsigned Short/Char (16 bit UNsigned) with mask into Long Register
+instruct loadUS2L_immI16(rRegL dst, memory mem, immI16 mask, rFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
+ effect(KILL cr);
+
+ format %{ "movzwq $dst, $mem\t# ushort/char & 16-bit mask -> long\n\t"
+ "andl $dst, $mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movzwq(Rdst, $mem$$Address);
+ __ andl(Rdst, $mask$$constant);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
// Load Integer
instruct loadI(rRegI dst, memory mem)
%{
@@ -6606,6 +6647,43 @@
ins_pipe(ialu_reg_mem);
%}
+// Load Integer with mask 0xFF into Long Register
+instruct loadI2L_immI_255(rRegL dst, memory mem, immI_255 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+
+ format %{ "movzbq $dst, $mem\t# int & 0xFF -> long" %}
+ ins_encode %{
+ __ movzbq($dst$$Register, $mem$$Address);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Integer with mask 0xFFFF into Long Register
+instruct loadI2L_immI_65535(rRegL dst, memory mem, immI_65535 mask) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+
+ format %{ "movzwq $dst, $mem\t# int & 0xFFFF -> long" %}
+ ins_encode %{
+ __ movzwq($dst$$Register, $mem$$Address);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
+// Load Integer with a 32-bit mask into Long Register
+instruct loadI2L_immI(rRegL dst, memory mem, immI mask, rFlagsReg cr) %{
+ match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
+ effect(KILL cr);
+
+ format %{ "movl $dst, $mem\t# int & 32-bit mask -> long\n\t"
+ "andl $dst, $mask" %}
+ ins_encode %{
+ Register Rdst = $dst$$Register;
+ __ movl(Rdst, $mem$$Address);
+ __ andl(Rdst, $mask$$constant);
+ %}
+ ins_pipe(ialu_reg_mem);
+%}
+
// Load Unsigned Integer into Long Register
instruct loadUI2L(rRegL dst, memory mem)
%{
@@ -11673,8 +11751,9 @@
ins_cost(125);
format %{ "movslq $dst, $src\t# i2l" %}
- opcode(0x63); // needs REX.W
- ins_encode(REX_reg_reg_wide(dst, src), OpcP, reg_reg(dst,src));
+ ins_encode %{
+ __ movslq($dst$$Register, $src$$Register);
+ %}
ins_pipe(ialu_reg_reg);
%}
--- a/hotspot/src/os/linux/vm/os_linux.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os/linux/vm/os_linux.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os/solaris/dtrace/jhelper.d Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os/solaris/dtrace/jhelper.d Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os/solaris/dtrace/libjvm_db.c Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os/solaris/dtrace/libjvm_db.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/MakeDeps/BuildConfig.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/MakeDeps/BuildConfig.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/MakeDeps/Database.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/MakeDeps/Database.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@
private HashMap<String,String> platformDepFiles;
private long threshold;
private int nOuterFiles;
- private int nPrecompiledFiles;
private boolean missingOk;
private Platform plat;
/** These allow you to specify files not in the include database
@@ -62,7 +61,6 @@
threshold = t;
nOuterFiles = 0;
- nPrecompiledFiles = 0;
missingOk = false;
firstFile = null;
lastFile = null;
@@ -343,7 +341,6 @@
plat.getGIFileTemplate().getInvDir() +
list.getName() +
"\"");
- nPrecompiledFiles += 1;
}
}
inclFile.println();
@@ -408,22 +405,22 @@
gd.println();
}
- if (nPrecompiledFiles > 0) {
- // write Precompiled_Files = ...
- gd.println("Precompiled_Files = \\");
- for (Iterator iter = grandInclude.iterator(); iter.hasNext(); ) {
- FileList list = (FileList) iter.next();
+ // write Precompiled_Files = ...
+ gd.println("Precompiled_Files = \\");
+ for (Iterator iter = grandInclude.iterator(); iter.hasNext(); ) {
+ FileList list = (FileList) iter.next();
+ if (list.getCount() >= threshold) {
gd.println(list.getName() + " \\");
String platformDep = platformDepFiles.get(list.getName());
if (platformDep != null) {
- // make sure changes to the platform dependent file will
- // cause regeneration of the pch file.
- gd.println(platformDep + " \\");
+ // make sure changes to the platform dependent file will
+ // cause regeneration of the pch file.
+ gd.println(platformDep + " \\");
}
}
- gd.println();
- gd.println();
}
+ gd.println();
+ gd.println();
gd.println("DTraced_Files = \\");
for (Iterator iter = outerFiles.iterator(); iter.hasNext(); ) {
@@ -483,7 +480,6 @@
}
if (plat.includeGIDependencies()
- && nPrecompiledFiles > 0
&& anII.getUseGrandInclude()) {
gd.println(" $(Precompiled_Files) \\");
}
--- a/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC7.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC7.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC8.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC8.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC9.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/MakeDeps/WinGammaPlatformVC9.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/hsdis/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/hsdis/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/hsdis/hsdis-demo.c Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/hsdis/hsdis-demo.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/tools/hsdis/hsdis.c Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/tools/hsdis/hsdis.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/adlc/adlc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/adlc/adlc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/adlc/formssel.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/adlc/formssel.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -420,6 +420,13 @@
return _matrule->is_ideal_load();
}
+// Return 'true' if this instruction matches an ideal 'LoadKlass' node
+bool InstructForm::skip_antidep_check() const {
+ if( _matrule == NULL ) return false;
+
+ return _matrule->skip_antidep_check();
+}
+
// Return 'true' if this instruction matches an ideal 'Load?' node
Form::DataType InstructForm::is_ideal_store() const {
if( _matrule == NULL ) return Form::none;
@@ -567,6 +574,8 @@
// loads from memory, so must check for anti-dependence
bool InstructForm::needs_anti_dependence_check(FormDict &globals) const {
+ if ( skip_antidep_check() ) return false;
+
// Machine independent loads must be checked for anti-dependences
if( is_ideal_load() != Form::none ) return true;
@@ -3957,6 +3966,28 @@
}
+bool MatchRule::skip_antidep_check() const {
+ // Some loads operate on what is effectively immutable memory so we
+ // should skip the anti dep computations. For some of these nodes
+ // the rewritable field keeps the anti dep logic from triggering but
+ // for certain kinds of LoadKlass it does not since they are
+ // actually reading memory which could be rewritten by the runtime,
+ // though never by generated code. This disables it uniformly for
+ // the nodes that behave like this: LoadKlass, LoadNKlass and
+ // LoadRange.
+ if ( _opType && (strcmp(_opType,"Set") == 0) && _rChild ) {
+ const char *opType = _rChild->_opType;
+ if (strcmp("LoadKlass", opType) == 0 ||
+ strcmp("LoadNKlass", opType) == 0 ||
+ strcmp("LoadRange", opType) == 0) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
Form::DataType MatchRule::is_ideal_store() const {
Form::DataType ideal_store = Form::none;
--- a/hotspot/src/share/vm/adlc/formssel.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/adlc/formssel.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -158,6 +158,9 @@
virtual Form::CallType is_ideal_call() const; // matches ideal 'Call'
virtual Form::DataType is_ideal_load() const; // node matches ideal 'LoadXNode'
+ // Should antidep checks be disabled for this Instruct
+ // See definition of MatchRule::skip_antidep_check
+ bool skip_antidep_check() const;
virtual Form::DataType is_ideal_store() const;// node matches ideal 'StoreXNode'
bool is_ideal_mem() const { return is_ideal_load() != Form::none || is_ideal_store() != Form::none; }
virtual uint two_address(FormDict &globals); // output reg must match input reg
@@ -1003,6 +1006,9 @@
bool is_ideal_loopEnd() const; // node matches ideal 'LoopEnd'
bool is_ideal_bool() const; // node matches ideal 'Bool'
Form::DataType is_ideal_load() const;// node matches ideal 'LoadXNode'
+ // Should antidep checks be disabled for this rule
+ // See definition of MatchRule::skip_antidep_check
+ bool skip_antidep_check() const;
Form::DataType is_ideal_store() const;// node matches ideal 'StoreXNode'
// Check if 'mRule2' is a cisc-spill variant of this MatchRule
--- a/hotspot/src/share/vm/adlc/output_h.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/adlc/output_h.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1367,11 +1367,11 @@
else if (!strcmp(oper->ideal_type(_globalNames), "ConN")) {
// Access the locally stored constant
fprintf(fp," virtual intptr_t constant() const {");
- fprintf(fp, " return _c0->make_oopptr()->get_con();");
+ fprintf(fp, " return _c0->get_ptrtype()->get_con();");
fprintf(fp, " }\n");
// Generate query to determine if this pointer is an oop
fprintf(fp," virtual bool constant_is_oop() const {");
- fprintf(fp, " return _c0->make_oopptr()->isa_oop_ptr();");
+ fprintf(fp, " return _c0->get_ptrtype()->isa_oop_ptr();");
fprintf(fp, " }\n");
}
else if (!strcmp(oper->ideal_type(_globalNames), "ConL")) {
--- a/hotspot/src/share/vm/asm/assembler.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/asm/assembler.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/c1/c1_Compilation.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/c1/c1_Compilation.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1534,12 +1534,8 @@
}
if (is_oop) {
-#ifdef PRECISE_CARDMARK
- // Precise cardmarks don't work
- post_barrier(LIR_OprFact::address(address), value.result());
-#else
+ // Store to object so mark the card of the header
post_barrier(object.result(), value.result());
-#endif // PRECISE_CARDMARK
}
if (is_volatile && os::is_MP()) {
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/ciEnv.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/ciEnv.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/ciEnv.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/ciMethodBlocks.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/ciMethodBlocks.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/ciStreams.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/ciStreams.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/ciStreams.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/ciStreams.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -3231,6 +3231,16 @@
this_klass->set_minor_version(minor_version);
this_klass->set_major_version(major_version);
+ // Set up methodOop::intrinsic_id as soon as we know the names of methods.
+ // (We used to do this lazily, but now we query it in Rewriter,
+ // which is eagerly done for every method, so we might as well do it now,
+ // when everything is fresh in memory.)
+ if (methodOopDesc::klass_id_for_intrinsics(this_klass->as_klassOop()) != vmSymbols::NO_SID) {
+ for (int j = 0; j < methods->length(); j++) {
+ ((methodOop)methods->obj_at(j))->init_intrinsic_id();
+ }
+ }
+
if (cached_class_file_bytes != NULL) {
// JVMTI: we have an instanceKlass now, tell it about the cached bytes
this_klass->set_cached_class_file(cached_class_file_bytes,
--- a/hotspot/src/share/vm/classfile/classLoader.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/classfile/verifier.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/classfile/verifier.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -513,9 +513,6 @@
//
// for Emacs: (let ((c-backslash-column 120) (c-backslash-max-column 120)) (c-backslash-region (point) (point-max) nil t))
#define VM_INTRINSICS_DO(do_intrinsic, do_class, do_name, do_signature, do_alias) \
- do_intrinsic(_Object_init, java_lang_Object, object_initializer_name, void_method_signature, F_R) \
- /* (symbol object_initializer_name defined above) */ \
- \
do_intrinsic(_hashCode, java_lang_Object, hashCode_name, void_int_signature, F_R) \
do_name( hashCode_name, "hashCode") \
do_intrinsic(_getClass, java_lang_Object, getClass_name, void_class_signature, F_R) \
@@ -635,9 +632,6 @@
do_intrinsic(_equalsC, java_util_Arrays, equals_name, equalsC_signature, F_S) \
do_signature(equalsC_signature, "([C[C)Z") \
\
- do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_array_object_object_signature, F_R) \
- /* (symbols invoke_name and invoke_signature defined above) */ \
- \
do_intrinsic(_compareTo, java_lang_String, compareTo_name, string_int_signature, F_R) \
do_name( compareTo_name, "compareTo") \
do_intrinsic(_indexOf, java_lang_String, indexOf_name, string_int_signature, F_R) \
@@ -656,8 +650,6 @@
do_name( attemptUpdate_name, "attemptUpdate") \
do_signature(attemptUpdate_signature, "(JJ)Z") \
\
- do_intrinsic(_fillInStackTrace, java_lang_Throwable, fillInStackTrace_name, void_throwable_signature, F_RNY) \
- \
/* support for sun.misc.Unsafe */ \
do_class(sun_misc_Unsafe, "sun/misc/Unsafe") \
\
@@ -819,10 +811,22 @@
do_name( prefetchReadStatic_name, "prefetchReadStatic") \
do_intrinsic(_prefetchWriteStatic, sun_misc_Unsafe, prefetchWriteStatic_name, prefetch_signature, F_SN) \
do_name( prefetchWriteStatic_name, "prefetchWriteStatic") \
+ /*== LAST_COMPILER_INLINE*/ \
+ /*the compiler does have special inlining code for these; bytecode inline is just fine */ \
+ \
+ do_intrinsic(_fillInStackTrace, java_lang_Throwable, fillInStackTrace_name, void_throwable_signature, F_RNY) \
+ \
+ do_intrinsic(_Object_init, java_lang_Object, object_initializer_name, void_method_signature, F_R) \
+ /* (symbol object_initializer_name defined above) */ \
+ \
+ do_intrinsic(_invoke, java_lang_reflect_Method, invoke_name, object_array_object_object_signature, F_R) \
+ /* (symbols invoke_name and invoke_signature defined above) */ \
+ \
/*end*/
+
// Class vmSymbols
class vmSymbols: AllStatic {
@@ -935,6 +939,7 @@
#undef VM_INTRINSIC_ENUM
ID_LIMIT,
+ LAST_COMPILER_INLINE = _prefetchWriteStatic,
FIRST_ID = _none + 1
};
@@ -972,4 +977,7 @@
static Flags flags_for(ID id);
static const char* short_name_as_C_string(ID id, char* buf, int size);
+
+ // Access to intrinsic methods:
+ static methodOop method_for(ID id);
};
--- a/hotspot/src/share/vm/code/vtableStubs.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/code/vtableStubs.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/compiler/oopMap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/compiler/oopMap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -379,7 +379,15 @@
if ( loc != NULL ) {
oop *base_loc = fr->oopmapreg_to_location(omv.content_reg(), reg_map);
oop *derived_loc = loc;
- derived_oop_fn(base_loc, derived_loc);
+ oop val = *base_loc;
+ if (val == (oop)NULL || Universe::is_narrow_oop_base(val)) {
+ // Ignore NULL oops and decoded NULL narrow oops which
+ // equal to Universe::narrow_oop_base when a narrow oop
+ // implicit null check is used in compiled code.
+ // The narrow_oop_base could be NULL or be the address
+ // of the page below heap depending on compressed oops mode.
+ } else
+ derived_oop_fn(base_loc, derived_loc);
}
oms.next();
} while (!oms.is_done());
@@ -394,6 +402,15 @@
oop* loc = fr->oopmapreg_to_location(omv.reg(),reg_map);
if ( loc != NULL ) {
if ( omv.type() == OopMapValue::oop_value ) {
+ oop val = *loc;
+ if (val == (oop)NULL || Universe::is_narrow_oop_base(val)) {
+ // Ignore NULL oops and decoded NULL narrow oops which
+ // equal to Universe::narrow_oop_base when a narrow oop
+ // implicit null check is used in compiled code.
+ // The narrow_oop_base could be NULL or be the address
+ // of the page below heap depending on compressed oops mode.
+ continue;
+ }
#ifdef ASSERT
if ((((uintptr_t)loc & (sizeof(*loc)-1)) != 0) ||
!Universe::heap()->is_in_or_null(*loc)) {
@@ -410,6 +427,8 @@
#endif // ASSERT
oop_fn->do_oop(loc);
} else if ( omv.type() == OopMapValue::value_value ) {
+ assert((*loc) == (oop)NULL || !Universe::is_narrow_oop_base(*loc),
+ "found invalid value pointer");
value_fn->do_oop(loc);
} else if ( omv.type() == OopMapValue::narrowoop_value ) {
narrowOop *nl = (narrowOop*)loc;
--- a/hotspot/src/share/vm/compiler/oopMap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/compiler/oopMap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -233,6 +233,10 @@
int heap_size() const;
void copy_to(address addr);
+ // Methods oops_do() and all_do() filter out NULL oops and
+ // oop == Universe::narrow_oop_base() before passing oops
+ // to closures.
+
// Iterates through frame for a compiled method
static void oops_do (const frame* fr,
const RegisterMap* reg_map, OopClosure* f);
--- a/hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -42,35 +42,40 @@
BufferLength = 1024
};
- oop *_buffer[BufferLength];
- oop **_buffer_top;
- oop **_buffer_curr;
+ StarTask _buffer[BufferLength];
+ StarTask* _buffer_top;
+ StarTask* _buffer_curr;
- OopClosure *_oc;
- double _closure_app_seconds;
+ OopClosure* _oc;
+ double _closure_app_seconds;
void process_buffer () {
-
double start = os::elapsedTime();
- for (oop **curr = _buffer; curr < _buffer_curr; ++curr) {
- _oc->do_oop(*curr);
+ for (StarTask* curr = _buffer; curr < _buffer_curr; ++curr) {
+ if (curr->is_narrow()) {
+ assert(UseCompressedOops, "Error");
+ _oc->do_oop((narrowOop*)(*curr));
+ } else {
+ _oc->do_oop((oop*)(*curr));
+ }
}
_buffer_curr = _buffer;
_closure_app_seconds += (os::elapsedTime() - start);
}
-public:
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- virtual void do_oop(oop *p) {
+ template <class T> inline void do_oop_work(T* p) {
if (_buffer_curr == _buffer_top) {
process_buffer();
}
-
- *_buffer_curr = p;
+ StarTask new_ref(p);
+ *_buffer_curr = new_ref;
++_buffer_curr;
}
+
+public:
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop(oop* p) { do_oop_work(p); }
+
void done () {
if (_buffer_curr > _buffer) {
process_buffer();
@@ -88,18 +93,17 @@
class BufferingOopsInGenClosure: public OopsInGenClosure {
BufferingOopClosure _boc;
OopsInGenClosure* _oc;
-public:
+ protected:
+ template <class T> inline void do_oop_work(T* p) {
+ assert(generation()->is_in_reserved((void*)p), "Must be in!");
+ _boc.do_oop(p);
+ }
+ public:
BufferingOopsInGenClosure(OopsInGenClosure *oc) :
_boc(oc), _oc(oc) {}
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- virtual void do_oop(oop* p) {
- assert(generation()->is_in_reserved(p), "Must be in!");
- _boc.do_oop(p);
- }
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop(oop* p) { do_oop_work(p); }
void done() {
_boc.done();
@@ -130,14 +134,14 @@
BufferLength = 1024
};
- oop *_buffer[BufferLength];
- oop **_buffer_top;
- oop **_buffer_curr;
+ StarTask _buffer[BufferLength];
+ StarTask* _buffer_top;
+ StarTask* _buffer_curr;
- HeapRegion *_hr_buffer[BufferLength];
- HeapRegion **_hr_curr;
+ HeapRegion* _hr_buffer[BufferLength];
+ HeapRegion** _hr_curr;
- OopsInHeapRegionClosure *_oc;
+ OopsInHeapRegionClosure* _oc;
double _closure_app_seconds;
void process_buffer () {
@@ -146,15 +150,20 @@
"the two lengths should be the same");
double start = os::elapsedTime();
- HeapRegion **hr_curr = _hr_buffer;
- HeapRegion *hr_prev = NULL;
- for (oop **curr = _buffer; curr < _buffer_curr; ++curr) {
- HeapRegion *region = *hr_curr;
+ HeapRegion** hr_curr = _hr_buffer;
+ HeapRegion* hr_prev = NULL;
+ for (StarTask* curr = _buffer; curr < _buffer_curr; ++curr) {
+ HeapRegion* region = *hr_curr;
if (region != hr_prev) {
_oc->set_region(region);
hr_prev = region;
}
- _oc->do_oop(*curr);
+ if (curr->is_narrow()) {
+ assert(UseCompressedOops, "Error");
+ _oc->do_oop((narrowOop*)(*curr));
+ } else {
+ _oc->do_oop((oop*)(*curr));
+ }
++hr_curr;
}
_buffer_curr = _buffer;
@@ -163,17 +172,16 @@
}
public:
- virtual void do_oop(narrowOop *p) {
- guarantee(false, "NYI");
- }
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
- virtual void do_oop(oop *p) {
+ template <class T> void do_oop_work(T* p) {
if (_buffer_curr == _buffer_top) {
assert(_hr_curr > _hr_buffer, "_hr_curr should be consistent with _buffer_curr");
process_buffer();
}
-
- *_buffer_curr = p;
+ StarTask new_ref(p);
+ *_buffer_curr = new_ref;
++_buffer_curr;
*_hr_curr = _from;
++_hr_curr;
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -452,13 +452,10 @@
_regionStack.allocate(G1MarkRegionStackSize);
// Create & start a ConcurrentMark thread.
- if (G1ConcMark) {
- _cmThread = new ConcurrentMarkThread(this);
- assert(cmThread() != NULL, "CM Thread should have been created");
- assert(cmThread()->cm() != NULL, "CM Thread should refer to this cm");
- } else {
- _cmThread = NULL;
- }
+ _cmThread = new ConcurrentMarkThread(this);
+ assert(cmThread() != NULL, "CM Thread should have been created");
+ assert(cmThread()->cm() != NULL, "CM Thread should refer to this cm");
+
_g1h = G1CollectedHeap::heap();
assert(CGC_lock != NULL, "Where's the CGC_lock?");
assert(_markBitMap1.covers(rs), "_markBitMap1 inconsistency");
@@ -783,18 +780,18 @@
bool do_barrier) : _cm(cm), _g1h(g1h),
_do_barrier(do_barrier) { }
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- virtual void do_oop(oop* p) {
- oop thisOop = *p;
- if (thisOop != NULL) {
- assert(thisOop->is_oop() || thisOop->mark() == NULL,
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ assert(obj->is_oop() || obj->mark() == NULL,
"expected an oop, possibly with mark word displaced");
- HeapWord* addr = (HeapWord*)thisOop;
+ HeapWord* addr = (HeapWord*)obj;
if (_g1h->is_in_g1_reserved(addr)) {
- _cm->grayRoot(thisOop);
+ _cm->grayRoot(obj);
}
}
if (_do_barrier) {
@@ -850,16 +847,6 @@
double start = os::elapsedTime();
GCOverheadReporter::recordSTWStart(start);
- // If there has not been a GC[n-1] since last GC[n] cycle completed,
- // precede our marking with a collection of all
- // younger generations to keep floating garbage to a minimum.
- // YSR: we won't do this for now -- it's an optimization to be
- // done post-beta.
-
- // YSR: ignoring weak refs for now; will do at bug fixing stage
- // EVM: assert(discoveredRefsAreClear());
-
-
G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
g1p->record_concurrent_mark_init_start();
checkpointRootsInitialPre();
@@ -1135,6 +1122,13 @@
return;
}
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+ gclog_or_tty->print(" VerifyDuringGC:(before)");
+ Universe::heap()->prepare_for_verify();
+ Universe::verify(true, false, true);
+ }
+
G1CollectorPolicy* g1p = g1h->g1_policy();
g1p->record_concurrent_mark_remark_start();
@@ -1159,10 +1153,12 @@
JavaThread::satb_mark_queue_set().set_active_all_threads(false);
if (VerifyDuringGC) {
- g1h->prepare_for_verify();
- g1h->verify(/* allow_dirty */ true,
- /* silent */ false,
- /* use_prev_marking */ false);
+ HandleMark hm; // handle scope
+ gclog_or_tty->print(" VerifyDuringGC:(after)");
+ Universe::heap()->prepare_for_verify();
+ Universe::heap()->verify(/* allow_dirty */ true,
+ /* silent */ false,
+ /* use_prev_marking */ false);
}
}
@@ -1233,6 +1229,41 @@
CardTableModRefBS::card_shift);
}
+ // It takes a region that's not empty (i.e., it has at least one
+ // live object in it and sets its corresponding bit on the region
+ // bitmap to 1. If the region is "starts humongous" it will also set
+ // to 1 the bits on the region bitmap that correspond to its
+ // associated "continues humongous" regions.
+ void set_bit_for_region(HeapRegion* hr) {
+ assert(!hr->continuesHumongous(), "should have filtered those out");
+
+ size_t index = hr->hrs_index();
+ if (!hr->startsHumongous()) {
+ // Normal (non-humongous) case: just set the bit.
+ _region_bm->par_at_put((BitMap::idx_t) index, true);
+ } else {
+ // Starts humongous case: calculate how many regions are part of
+ // this humongous region and then set the bit range. It might
+ // have been a bit more efficient to look at the object that
+ // spans these humongous regions to calculate their number from
+ // the object's size. However, it's a good idea to calculate
+ // this based on the metadata itself, and not the region
+ // contents, so that this code is not aware of what goes into
+ // the humongous regions (in case this changes in the future).
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+ size_t end_index = index + 1;
+ while (end_index < g1h->n_regions()) {
+ HeapRegion* chr = g1h->region_at(end_index);
+ if (!chr->continuesHumongous()) {
+ break;
+ }
+ end_index += 1;
+ }
+ _region_bm->par_at_put_range((BitMap::idx_t) index,
+ (BitMap::idx_t) end_index, true);
+ }
+ }
+
bool doHeapRegion(HeapRegion* hr) {
if (_co_tracker != NULL)
_co_tracker->update();
@@ -1241,13 +1272,13 @@
_start_vtime_sec = os::elapsedVTime();
if (hr->continuesHumongous()) {
- HeapRegion* hum_start = hr->humongous_start_region();
- // If the head region of the humongous region has been determined
- // to be alive, then all the tail regions should be marked
- // such as well.
- if (_region_bm->at(hum_start->hrs_index())) {
- _region_bm->par_at_put(hr->hrs_index(), 1);
- }
+ // We will ignore these here and process them when their
+ // associated "starts humongous" region is processed (see
+ // set_bit_for_heap_region()). Note that we cannot rely on their
+ // associated "starts humongous" region to have their bit set to
+ // 1 since, due to the region chunking in the parallel region
+ // iteration, a "continues humongous" region might be visited
+ // before its associated "starts humongous".
return false;
}
@@ -1343,14 +1374,14 @@
intptr_t(uintptr_t(tp) >> CardTableModRefBS::card_shift);
mark_card_num_range(start_card_num, last_card_num);
// This definitely means the region has live objects.
- _region_bm->par_at_put(hr->hrs_index(), 1);
+ set_bit_for_region(hr);
}
}
hr->add_to_marked_bytes(marked_bytes);
// Update the live region bitmap.
if (marked_bytes > 0) {
- _region_bm->par_at_put(hr->hrs_index(), 1);
+ set_bit_for_region(hr);
}
hr->set_top_at_conc_mark_count(nextTop);
_tot_live += hr->next_live_bytes();
@@ -1623,6 +1654,15 @@
return;
}
+ if (VerifyDuringGC) {
+ HandleMark hm; // handle scope
+ gclog_or_tty->print(" VerifyDuringGC:(before)");
+ Universe::heap()->prepare_for_verify();
+ Universe::verify(/* allow dirty */ true,
+ /* silent */ false,
+ /* prev marking */ true);
+ }
+
_cleanup_co_tracker.disable();
G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
@@ -1755,10 +1795,12 @@
g1h->increment_total_collections();
if (VerifyDuringGC) {
- g1h->prepare_for_verify();
- g1h->verify(/* allow_dirty */ true,
- /* silent */ false,
- /* use_prev_marking */ true);
+ HandleMark hm; // handle scope
+ gclog_or_tty->print(" VerifyDuringGC:(after)");
+ Universe::heap()->prepare_for_verify();
+ Universe::verify(/* allow dirty */ true,
+ /* silent */ false,
+ /* prev marking */ true);
}
}
@@ -1817,12 +1859,11 @@
_g1(g1), _cm(cm),
_bitMap(bitMap) {}
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- void do_oop(oop* p) {
- oop thisOop = *p;
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T* p) {
+ oop thisOop = oopDesc::load_decode_heap_oop(p);
HeapWord* addr = (HeapWord*)thisOop;
if (_g1->is_in_g1_reserved(addr) && _g1->is_obj_ill(thisOop)) {
_bitMap->mark(addr);
@@ -1981,12 +2022,11 @@
ReachablePrinterOopClosure(CMBitMapRO* bitmap, outputStream* out) :
_bitmap(bitmap), _g1h(G1CollectedHeap::heap()), _out(out) { }
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- void do_oop(oop* p) {
- oop obj = *p;
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+ void do_oop( oop* p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
const char* str = NULL;
const char* str2 = "";
@@ -2128,6 +2168,7 @@
HeapWord* objAddr = (HeapWord*) obj;
+ assert(obj->is_oop_or_null(true /* ignore mark word */), "Error");
if (_g1h->is_in_g1_reserved(objAddr)) {
tmp_guarantee_CM( obj != NULL, "is_in_g1_reserved should ensure this" );
HeapRegion* hr = _g1h->heap_region_containing(obj);
@@ -2345,7 +2386,7 @@
}
}
- bool drain() {
+ template <class T> bool drain() {
while (_ms_ind > 0) {
oop obj = pop();
assert(obj != NULL, "Since index was non-zero.");
@@ -2359,9 +2400,8 @@
}
// Now process this portion of this one.
int lim = MIN2(next_arr_ind, len);
- assert(!UseCompressedOops, "This needs to be fixed");
for (int j = arr_ind; j < lim; j++) {
- do_oop(aobj->obj_at_addr<oop>(j));
+ do_oop(aobj->obj_at_addr<T>(j));
}
} else {
@@ -2388,13 +2428,13 @@
FREE_C_HEAP_ARRAY(jint, _array_ind_stack);
}
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- void do_oop(oop* p) {
- oop obj = *p;
- if (obj == NULL) return;
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (oopDesc::is_null(heap_oop)) return;
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (obj->is_forwarded()) {
// If the object has already been forwarded, we have to make sure
// that it's marked. So follow the forwarding pointer. Note that
@@ -2443,7 +2483,11 @@
oop obj = oop(addr);
if (!obj->is_forwarded()) {
if (!_oop_cl.push(obj)) return false;
- if (!_oop_cl.drain()) return false;
+ if (UseCompressedOops) {
+ if (!_oop_cl.drain<narrowOop>()) return false;
+ } else {
+ if (!_oop_cl.drain<oop>()) return false;
+ }
}
// Otherwise...
return true;
@@ -2601,9 +2645,6 @@
// abandon current marking iteration due to a Full GC
void ConcurrentMark::abort() {
- // If we're not marking, nothing to do.
- if (!G1ConcMark) return;
-
// Clear all marks to force marking thread to do nothing
_nextMarkBitMap->clearAll();
// Empty mark stack
@@ -2779,14 +2820,14 @@
CMTask* _task;
public:
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- void do_oop(oop* p) {
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T* p) {
tmp_guarantee_CM( _g1h->is_in_g1_reserved((HeapWord*) p), "invariant" );
-
- oop obj = *p;
+ tmp_guarantee_CM( !_g1h->heap_region_containing((HeapWord*) p)->is_on_free_list(), "invariant" );
+
+ oop obj = oopDesc::load_decode_heap_oop(p);
if (_cm->verbose_high())
gclog_or_tty->print_cr("[%d] we're looking at location "
"*"PTR_FORMAT" = "PTR_FORMAT,
@@ -2932,6 +2973,7 @@
++_refs_reached;
HeapWord* objAddr = (HeapWord*) obj;
+ assert(obj->is_oop_or_null(true /* ignore mark word */), "Error");
if (_g1h->is_in_g1_reserved(objAddr)) {
tmp_guarantee_CM( obj != NULL, "is_in_g1_reserved should ensure this" );
HeapRegion* hr = _g1h->heap_region_containing(obj);
@@ -2995,6 +3037,7 @@
void CMTask::push(oop obj) {
HeapWord* objAddr = (HeapWord*) obj;
tmp_guarantee_CM( _g1h->is_in_g1_reserved(objAddr), "invariant" );
+ tmp_guarantee_CM( !_g1h->heap_region_containing(objAddr)->is_on_free_list(), "invariant" );
tmp_guarantee_CM( !_g1h->is_obj_ill(obj), "invariant" );
tmp_guarantee_CM( _nextMarkBitMap->isMarked(objAddr), "invariant" );
@@ -3240,6 +3283,8 @@
tmp_guarantee_CM( _g1h->is_in_g1_reserved((HeapWord*) obj),
"invariant" );
+ tmp_guarantee_CM( !_g1h->heap_region_containing(obj)->is_on_free_list(),
+ "invariant" );
scan_object(obj);
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -763,6 +763,7 @@
CMBitMap* _nextMarkBitMap;
// the task queue of this task
CMTaskQueue* _task_queue;
+private:
// the task queue set---needed for stealing
CMTaskQueueSet* _task_queues;
// indicates whether the task has been claimed---this is only for
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -424,7 +424,7 @@
while (n <= next_boundary) {
q = n;
oop obj = oop(q);
- if (obj->klass() == NULL) return q;
+ if (obj->klass_or_null() == NULL) return q;
n += obj->size();
}
assert(q <= next_boundary && n > next_boundary, "Consequence of loop");
@@ -436,7 +436,7 @@
while (n <= next_boundary) {
q = n;
oop obj = oop(q);
- if (obj->klass() == NULL) return q;
+ if (obj->klass_or_null() == NULL) return q;
n += _sp->block_size(q);
}
assert(q <= next_boundary && n > next_boundary, "Consequence of loop");
--- a/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -96,14 +96,14 @@
while (n <= addr) {
q = n;
oop obj = oop(q);
- if (obj->klass() == NULL) return q;
+ if (obj->klass_or_null() == NULL) return q;
n += obj->size();
}
} else {
while (n <= addr) {
q = n;
oop obj = oop(q);
- if (obj->klass() == NULL) return q;
+ if (obj->klass_or_null() == NULL) return q;
n += _sp->block_size(q);
}
}
@@ -115,7 +115,7 @@
inline HeapWord*
G1BlockOffsetArray::forward_to_block_containing_addr(HeapWord* q,
const void* addr) {
- if (oop(q)->klass() == NULL) return q;
+ if (oop(q)->klass_or_null() == NULL) return q;
HeapWord* n = q + _sp->block_size(q);
// In the normal case, where the query "addr" is a card boundary, and the
// offset table chunks are the same size as cards, the block starting at
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -902,6 +902,10 @@
size_t word_size) {
ResourceMark rm;
+ if (PrintHeapAtGC) {
+ Universe::print_heap_before_gc();
+ }
+
if (full && DisableExplicitGC) {
gclog_or_tty->print("\n\n\nDisabling Explicit GC\n\n\n");
return;
@@ -927,7 +931,7 @@
g1_policy()->record_full_collection_start();
gc_prologue(true);
- increment_total_collections();
+ increment_total_collections(true /* full gc */);
size_t g1h_prev_used = used();
assert(used() == recalculate_used(), "Should be equal");
@@ -1066,6 +1070,10 @@
assert( check_young_list_empty(false, false),
"young list should be empty at this point");
}
+
+ if (PrintHeapAtGC) {
+ Universe::print_heap_after_gc();
+ }
}
void G1CollectedHeap::do_full_collection(bool clear_all_soft_refs) {
@@ -1650,8 +1658,15 @@
assert(Heap_lock->owner() != NULL,
"Should be owned on this thread's behalf.");
size_t result = _summary_bytes_used;
- if (_cur_alloc_region != NULL)
- result += _cur_alloc_region->used();
+ // Read only once in case it is set to NULL concurrently
+ HeapRegion* hr = _cur_alloc_region;
+ if (hr != NULL)
+ result += hr->used();
+ return result;
+}
+
+size_t G1CollectedHeap::used_unlocked() const {
+ size_t result = _summary_bytes_used;
return result;
}
@@ -2125,13 +2140,13 @@
VerifyLivenessOopClosure(G1CollectedHeap* _g1h) {
g1h = _g1h;
}
- void do_oop(narrowOop *p) {
- guarantee(false, "NYI");
- }
- void do_oop(oop *p) {
- oop obj = *p;
- assert(obj == NULL || !g1h->is_obj_dead(obj),
- "Dead object referenced by a not dead object");
+ void do_oop(narrowOop *p) { do_oop_work(p); }
+ void do_oop( oop *p) { do_oop_work(p); }
+
+ template <class T> void do_oop_work(T *p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
+ guarantee(obj == NULL || !g1h->is_obj_dead(obj),
+ "Dead object referenced by a not dead object");
}
};
@@ -2198,8 +2213,10 @@
// use_prev_marking == true -> use "prev" marking information,
// use_prev_marking == false -> use "next" marking information
VerifyRegionClosure(bool allow_dirty, bool par, bool use_prev_marking)
- : _allow_dirty(allow_dirty), _par(par),
+ : _allow_dirty(allow_dirty),
+ _par(par),
_use_prev_marking(use_prev_marking) {}
+
bool doHeapRegion(HeapRegion* r) {
guarantee(_par || r->claim_value() == HeapRegion::InitialClaimValue,
"Should be unclaimed at verify points.");
@@ -2223,18 +2240,16 @@
// use_prev_marking == true -> use "prev" marking information,
// use_prev_marking == false -> use "next" marking information
VerifyRootsClosure(bool use_prev_marking) :
- _g1h(G1CollectedHeap::heap()), _failures(false),
+ _g1h(G1CollectedHeap::heap()),
+ _failures(false),
_use_prev_marking(use_prev_marking) { }
bool failures() { return _failures; }
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
-
- void do_oop(oop* p) {
- oop obj = *p;
- if (obj != NULL) {
+ template <class T> void do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (_g1h->is_obj_dead_cond(obj, _use_prev_marking)) {
gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
"points to dead obj "PTR_FORMAT, p, (void*) obj);
@@ -2243,6 +2258,9 @@
}
}
}
+
+ void do_oop(oop* p) { do_oop_nv(p); }
+ void do_oop(narrowOop* p) { do_oop_nv(p); }
};
// This is the task used for parallel heap verification.
@@ -2259,7 +2277,8 @@
G1ParVerifyTask(G1CollectedHeap* g1h, bool allow_dirty,
bool use_prev_marking) :
AbstractGangTask("Parallel verify task"),
- _g1h(g1h), _allow_dirty(allow_dirty),
+ _g1h(g1h),
+ _allow_dirty(allow_dirty),
_use_prev_marking(use_prev_marking) { }
void work(int worker_i) {
@@ -2325,9 +2344,37 @@
}
};
-void G1CollectedHeap::print() const { print_on(gclog_or_tty); }
+void G1CollectedHeap::print() const { print_on(tty); }
void G1CollectedHeap::print_on(outputStream* st) const {
+ print_on(st, PrintHeapAtGCExtended);
+}
+
+void G1CollectedHeap::print_on(outputStream* st, bool extended) const {
+ st->print(" %-20s", "garbage-first heap");
+ st->print(" total " SIZE_FORMAT "K, used " SIZE_FORMAT "K",
+ capacity()/K, used_unlocked()/K);
+ st->print(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")",
+ _g1_storage.low_boundary(),
+ _g1_storage.high(),
+ _g1_storage.high_boundary());
+ st->cr();
+ st->print(" region size " SIZE_FORMAT "K, ",
+ HeapRegion::GrainBytes/K);
+ size_t young_regions = _young_list->length();
+ st->print(SIZE_FORMAT " young (" SIZE_FORMAT "K), ",
+ young_regions, young_regions * HeapRegion::GrainBytes / K);
+ size_t survivor_regions = g1_policy()->recorded_survivor_regions();
+ st->print(SIZE_FORMAT " survivors (" SIZE_FORMAT "K)",
+ survivor_regions, survivor_regions * HeapRegion::GrainBytes / K);
+ st->cr();
+ perm()->as_gen()->print_on(st);
+ if (extended) {
+ print_on_extended(st);
+ }
+}
+
+void G1CollectedHeap::print_on_extended(outputStream* st) const {
PrintRegionClosure blk(st);
_hrs->iterate(&blk);
}
@@ -2408,10 +2455,6 @@
}
void G1CollectedHeap::gc_prologue(bool full /* Ignored */) {
- if (PrintHeapAtGC){
- gclog_or_tty->print_cr(" {Heap before GC collections=%d:", total_collections());
- Universe::print();
- }
assert(InlineCacheBuffer::is_empty(), "should have cleaned up ICBuffer");
// Call allocation profiler
AllocationProfiler::iterate_since_last_gc();
@@ -2425,12 +2468,6 @@
// is set.
COMPILER2_PRESENT(assert(DerivedPointerTable::is_empty(),
"derived pointer present"));
-
- if (PrintHeapAtGC){
- gclog_or_tty->print_cr(" Heap after GC collections=%d:", total_collections());
- Universe::print();
- gclog_or_tty->print("} ");
- }
}
void G1CollectedHeap::do_collection_pause() {
@@ -2453,12 +2490,10 @@
void
G1CollectedHeap::doConcurrentMark() {
- if (G1ConcMark) {
- MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
- if (!_cmThread->in_progress()) {
- _cmThread->set_started();
- CGC_lock->notify();
- }
+ MutexLockerEx x(CGC_lock, Mutex::_no_safepoint_check_flag);
+ if (!_cmThread->in_progress()) {
+ _cmThread->set_started();
+ CGC_lock->notify();
}
}
@@ -2535,9 +2570,11 @@
"Not enough space for young surv words summary.");
}
memset(_surviving_young_words, 0, array_length * sizeof(size_t));
+#ifdef ASSERT
for (size_t i = 0; i < array_length; ++i) {
- guarantee( _surviving_young_words[i] == 0, "invariant" );
- }
+ assert( _surviving_young_words[i] == 0, "memset above" );
+ }
+#endif // !ASSERT
}
void
@@ -2559,241 +2596,254 @@
void
G1CollectedHeap::do_collection_pause_at_safepoint() {
- char verbose_str[128];
- sprintf(verbose_str, "GC pause ");
- if (g1_policy()->in_young_gc_mode()) {
- if (g1_policy()->full_young_gcs())
- strcat(verbose_str, "(young)");
- else
- strcat(verbose_str, "(partial)");
- }
- if (g1_policy()->should_initiate_conc_mark())
- strcat(verbose_str, " (initial-mark)");
-
- GCCauseSetter x(this, GCCause::_g1_inc_collection_pause);
-
- // if PrintGCDetails is on, we'll print long statistics information
- // in the collector policy code, so let's not print this as the output
- // is messy if we do.
- gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps);
- TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
- TraceTime t(verbose_str, PrintGC && !PrintGCDetails, true, gclog_or_tty);
-
- ResourceMark rm;
- assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
- assert(Thread::current() == VMThread::vm_thread(), "should be in vm thread");
- guarantee(!is_gc_active(), "collection is not reentrant");
- assert(regions_accounted_for(), "Region leakage!");
-
- increment_gc_time_stamp();
-
- if (g1_policy()->in_young_gc_mode()) {
- assert(check_young_list_well_formed(),
- "young list should be well formed");
- }
-
- if (GC_locker::is_active()) {
- return; // GC is disabled (e.g. JNI GetXXXCritical operation)
- }
-
- bool abandoned = false;
- { // Call to jvmpi::post_class_unload_events must occur outside of active GC
- IsGCActiveMark x;
-
- gc_prologue(false);
- increment_total_collections();
+ if (PrintHeapAtGC) {
+ Universe::print_heap_before_gc();
+ }
+
+ {
+ char verbose_str[128];
+ sprintf(verbose_str, "GC pause ");
+ if (g1_policy()->in_young_gc_mode()) {
+ if (g1_policy()->full_young_gcs())
+ strcat(verbose_str, "(young)");
+ else
+ strcat(verbose_str, "(partial)");
+ }
+ if (g1_policy()->should_initiate_conc_mark())
+ strcat(verbose_str, " (initial-mark)");
+
+ GCCauseSetter x(this, GCCause::_g1_inc_collection_pause);
+
+ // if PrintGCDetails is on, we'll print long statistics information
+ // in the collector policy code, so let's not print this as the output
+ // is messy if we do.
+ gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps);
+ TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
+ TraceTime t(verbose_str, PrintGC && !PrintGCDetails, true, gclog_or_tty);
+
+ ResourceMark rm;
+ assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
+ assert(Thread::current() == VMThread::vm_thread(), "should be in vm thread");
+ guarantee(!is_gc_active(), "collection is not reentrant");
+ assert(regions_accounted_for(), "Region leakage!");
+
+ increment_gc_time_stamp();
+
+ if (g1_policy()->in_young_gc_mode()) {
+ assert(check_young_list_well_formed(),
+ "young list should be well formed");
+ }
+
+ if (GC_locker::is_active()) {
+ return; // GC is disabled (e.g. JNI GetXXXCritical operation)
+ }
+
+ bool abandoned = false;
+ { // Call to jvmpi::post_class_unload_events must occur outside of active GC
+ IsGCActiveMark x;
+
+ gc_prologue(false);
+ increment_total_collections(false /* full gc */);
#if G1_REM_SET_LOGGING
- gclog_or_tty->print_cr("\nJust chose CS, heap:");
- print();
+ gclog_or_tty->print_cr("\nJust chose CS, heap:");
+ print();
#endif
- if (VerifyBeforeGC && total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
- prepare_for_verify();
- gclog_or_tty->print(" VerifyBeforeGC:");
- Universe::verify(false);
- }
-
- COMPILER2_PRESENT(DerivedPointerTable::clear());
-
- // We want to turn off ref discovery, if necessary, and turn it back on
- // on again later if we do.
- bool was_enabled = ref_processor()->discovery_enabled();
- if (was_enabled) ref_processor()->disable_discovery();
-
- // Forget the current alloc region (we might even choose it to be part
- // of the collection set!).
- abandon_cur_alloc_region();
-
- // The elapsed time induced by the start time below deliberately elides
- // the possible verification above.
- double start_time_sec = os::elapsedTime();
- GCOverheadReporter::recordSTWStart(start_time_sec);
- size_t start_used_bytes = used();
- if (!G1ConcMark) {
- do_sync_mark();
- }
-
- g1_policy()->record_collection_pause_start(start_time_sec,
- start_used_bytes);
-
- guarantee(_in_cset_fast_test == NULL, "invariant");
- guarantee(_in_cset_fast_test_base == NULL, "invariant");
- _in_cset_fast_test_length = max_regions();
- _in_cset_fast_test_base =
+ if (VerifyBeforeGC && total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+ prepare_for_verify();
+ gclog_or_tty->print(" VerifyBeforeGC:");
+ Universe::verify(false);
+ }
+
+ COMPILER2_PRESENT(DerivedPointerTable::clear());
+
+ // We want to turn off ref discovery, if necessary, and turn it back on
+ // on again later if we do. XXX Dubious: why is discovery disabled?
+ bool was_enabled = ref_processor()->discovery_enabled();
+ if (was_enabled) ref_processor()->disable_discovery();
+
+ // Forget the current alloc region (we might even choose it to be part
+ // of the collection set!).
+ abandon_cur_alloc_region();
+
+ // The elapsed time induced by the start time below deliberately elides
+ // the possible verification above.
+ double start_time_sec = os::elapsedTime();
+ GCOverheadReporter::recordSTWStart(start_time_sec);
+ size_t start_used_bytes = used();
+
+ g1_policy()->record_collection_pause_start(start_time_sec,
+ start_used_bytes);
+
+ guarantee(_in_cset_fast_test == NULL, "invariant");
+ guarantee(_in_cset_fast_test_base == NULL, "invariant");
+ _in_cset_fast_test_length = max_regions();
+ _in_cset_fast_test_base =
NEW_C_HEAP_ARRAY(bool, _in_cset_fast_test_length);
- memset(_in_cset_fast_test_base, false,
+ memset(_in_cset_fast_test_base, false,
_in_cset_fast_test_length * sizeof(bool));
- // We're biasing _in_cset_fast_test to avoid subtracting the
- // beginning of the heap every time we want to index; basically
- // it's the same with what we do with the card table.
- _in_cset_fast_test = _in_cset_fast_test_base -
+ // We're biasing _in_cset_fast_test to avoid subtracting the
+ // beginning of the heap every time we want to index; basically
+ // it's the same with what we do with the card table.
+ _in_cset_fast_test = _in_cset_fast_test_base -
((size_t) _g1_reserved.start() >> HeapRegion::LogOfHRGrainBytes);
#if SCAN_ONLY_VERBOSE
- _young_list->print();
+ _young_list->print();
#endif // SCAN_ONLY_VERBOSE
- if (g1_policy()->should_initiate_conc_mark()) {
- concurrent_mark()->checkpointRootsInitialPre();
- }
- save_marks();
-
- // We must do this before any possible evacuation that should propagate
- // marks.
- if (mark_in_progress()) {
- double start_time_sec = os::elapsedTime();
-
- _cm->drainAllSATBBuffers();
- double finish_mark_ms = (os::elapsedTime() - start_time_sec) * 1000.0;
- g1_policy()->record_satb_drain_time(finish_mark_ms);
-
- }
- // Record the number of elements currently on the mark stack, so we
- // only iterate over these. (Since evacuation may add to the mark
- // stack, doing more exposes race conditions.) If no mark is in
- // progress, this will be zero.
- _cm->set_oops_do_bound();
-
- assert(regions_accounted_for(), "Region leakage.");
-
- if (mark_in_progress())
- concurrent_mark()->newCSet();
-
- // Now choose the CS.
- g1_policy()->choose_collection_set();
-
- // We may abandon a pause if we find no region that will fit in the MMU
- // pause.
- bool abandoned = (g1_policy()->collection_set() == NULL);
-
- // Nothing to do if we were unable to choose a collection set.
- if (!abandoned) {
+ if (g1_policy()->should_initiate_conc_mark()) {
+ concurrent_mark()->checkpointRootsInitialPre();
+ }
+ save_marks();
+
+ // We must do this before any possible evacuation that should propagate
+ // marks.
+ if (mark_in_progress()) {
+ double start_time_sec = os::elapsedTime();
+
+ _cm->drainAllSATBBuffers();
+ double finish_mark_ms = (os::elapsedTime() - start_time_sec) * 1000.0;
+ g1_policy()->record_satb_drain_time(finish_mark_ms);
+ }
+ // Record the number of elements currently on the mark stack, so we
+ // only iterate over these. (Since evacuation may add to the mark
+ // stack, doing more exposes race conditions.) If no mark is in
+ // progress, this will be zero.
+ _cm->set_oops_do_bound();
+
+ assert(regions_accounted_for(), "Region leakage.");
+
+ if (mark_in_progress())
+ concurrent_mark()->newCSet();
+
+ // Now choose the CS.
+ g1_policy()->choose_collection_set();
+
+ // We may abandon a pause if we find no region that will fit in the MMU
+ // pause.
+ bool abandoned = (g1_policy()->collection_set() == NULL);
+
+ // Nothing to do if we were unable to choose a collection set.
+ if (!abandoned) {
#if G1_REM_SET_LOGGING
- gclog_or_tty->print_cr("\nAfter pause, heap:");
- print();
+ gclog_or_tty->print_cr("\nAfter pause, heap:");
+ print();
#endif
- setup_surviving_young_words();
-
- // Set up the gc allocation regions.
- get_gc_alloc_regions();
-
- // Actually do the work...
- evacuate_collection_set();
- free_collection_set(g1_policy()->collection_set());
- g1_policy()->clear_collection_set();
-
- FREE_C_HEAP_ARRAY(bool, _in_cset_fast_test_base);
- // this is more for peace of mind; we're nulling them here and
- // we're expecting them to be null at the beginning of the next GC
- _in_cset_fast_test = NULL;
- _in_cset_fast_test_base = NULL;
-
- release_gc_alloc_regions(false /* totally */);
-
- cleanup_surviving_young_words();
-
- if (g1_policy()->in_young_gc_mode()) {
- _young_list->reset_sampled_info();
- assert(check_young_list_empty(true),
- "young list should be empty");
+ setup_surviving_young_words();
+
+ // Set up the gc allocation regions.
+ get_gc_alloc_regions();
+
+ // Actually do the work...
+ evacuate_collection_set();
+ free_collection_set(g1_policy()->collection_set());
+ g1_policy()->clear_collection_set();
+
+ FREE_C_HEAP_ARRAY(bool, _in_cset_fast_test_base);
+ // this is more for peace of mind; we're nulling them here and
+ // we're expecting them to be null at the beginning of the next GC
+ _in_cset_fast_test = NULL;
+ _in_cset_fast_test_base = NULL;
+
+ release_gc_alloc_regions(false /* totally */);
+
+ cleanup_surviving_young_words();
+
+ if (g1_policy()->in_young_gc_mode()) {
+ _young_list->reset_sampled_info();
+ assert(check_young_list_empty(true),
+ "young list should be empty");
#if SCAN_ONLY_VERBOSE
- _young_list->print();
+ _young_list->print();
#endif // SCAN_ONLY_VERBOSE
- g1_policy()->record_survivor_regions(_young_list->survivor_length(),
- _young_list->first_survivor_region(),
- _young_list->last_survivor_region());
- _young_list->reset_auxilary_lists();
+ g1_policy()->record_survivor_regions(_young_list->survivor_length(),
+ _young_list->first_survivor_region(),
+ _young_list->last_survivor_region());
+ _young_list->reset_auxilary_lists();
+ }
+ } else {
+ COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
}
- } else {
- COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
- }
-
- if (evacuation_failed()) {
- _summary_bytes_used = recalculate_used();
- } else {
- // The "used" of the the collection set have already been subtracted
- // when they were freed. Add in the bytes evacuated.
- _summary_bytes_used += g1_policy()->bytes_in_to_space();
- }
-
- if (g1_policy()->in_young_gc_mode() &&
- g1_policy()->should_initiate_conc_mark()) {
- concurrent_mark()->checkpointRootsInitialPost();
- set_marking_started();
- doConcurrentMark();
- }
+
+ if (evacuation_failed()) {
+ _summary_bytes_used = recalculate_used();
+ } else {
+ // The "used" of the the collection set have already been subtracted
+ // when they were freed. Add in the bytes evacuated.
+ _summary_bytes_used += g1_policy()->bytes_in_to_space();
+ }
+
+ if (g1_policy()->in_young_gc_mode() &&
+ g1_policy()->should_initiate_conc_mark()) {
+ concurrent_mark()->checkpointRootsInitialPost();
+ set_marking_started();
+ // CAUTION: after the doConcurrentMark() call below,
+ // the concurrent marking thread(s) could be running
+ // concurrently with us. Make sure that anything after
+ // this point does not assume that we are the only GC thread
+ // running. Note: of course, the actual marking work will
+ // not start until the safepoint itself is released in
+ // ConcurrentGCThread::safepoint_desynchronize().
+ doConcurrentMark();
+ }
#if SCAN_ONLY_VERBOSE
- _young_list->print();
+ _young_list->print();
#endif // SCAN_ONLY_VERBOSE
- double end_time_sec = os::elapsedTime();
- double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
- g1_policy()->record_pause_time_ms(pause_time_ms);
- GCOverheadReporter::recordSTWEnd(end_time_sec);
- g1_policy()->record_collection_pause_end(abandoned);
-
- assert(regions_accounted_for(), "Region leakage.");
-
- if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
- HandleMark hm; // Discard invalid handles created during verification
- gclog_or_tty->print(" VerifyAfterGC:");
- prepare_for_verify();
- Universe::verify(false);
- }
-
- if (was_enabled) ref_processor()->enable_discovery();
-
- {
- size_t expand_bytes = g1_policy()->expansion_amount();
- if (expand_bytes > 0) {
- size_t bytes_before = capacity();
- expand(expand_bytes);
+ double end_time_sec = os::elapsedTime();
+ double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
+ g1_policy()->record_pause_time_ms(pause_time_ms);
+ GCOverheadReporter::recordSTWEnd(end_time_sec);
+ g1_policy()->record_collection_pause_end(abandoned);
+
+ assert(regions_accounted_for(), "Region leakage.");
+
+ if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
+ HandleMark hm; // Discard invalid handles created during verification
+ gclog_or_tty->print(" VerifyAfterGC:");
+ prepare_for_verify();
+ Universe::verify(false);
}
- }
-
- if (mark_in_progress()) {
- concurrent_mark()->update_g1_committed();
- }
+
+ if (was_enabled) ref_processor()->enable_discovery();
+
+ {
+ size_t expand_bytes = g1_policy()->expansion_amount();
+ if (expand_bytes > 0) {
+ size_t bytes_before = capacity();
+ expand(expand_bytes);
+ }
+ }
+
+ if (mark_in_progress()) {
+ concurrent_mark()->update_g1_committed();
+ }
#ifdef TRACESPINNING
- ParallelTaskTerminator::print_termination_counts();
+ ParallelTaskTerminator::print_termination_counts();
#endif
- gc_epilogue(false);
- }
-
- assert(verify_region_lists(), "Bad region lists.");
-
- if (ExitAfterGCNum > 0 && total_collections() == ExitAfterGCNum) {
- gclog_or_tty->print_cr("Stopping after GC #%d", ExitAfterGCNum);
- print_tracing_info();
- vm_exit(-1);
+ gc_epilogue(false);
+ }
+
+ assert(verify_region_lists(), "Bad region lists.");
+
+ if (ExitAfterGCNum > 0 && total_collections() == ExitAfterGCNum) {
+ gclog_or_tty->print_cr("Stopping after GC #%d", ExitAfterGCNum);
+ print_tracing_info();
+ vm_exit(-1);
+ }
+ }
+
+ if (PrintHeapAtGC) {
+ Universe::print_heap_after_gc();
}
}
@@ -2930,6 +2980,7 @@
for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
assert(_gc_alloc_regions[ap] == NULL, "invariant");
+ assert(_gc_alloc_region_counts[ap] == 0, "invariant");
// Create new GC alloc regions.
HeapRegion* alloc_region = _retained_gc_alloc_regions[ap];
@@ -2958,6 +3009,9 @@
if (alloc_region == NULL) {
// we will get a new GC alloc region
alloc_region = newAllocRegionWithExpansion(ap, 0);
+ } else {
+ // the region was retained from the last collection
+ ++_gc_alloc_region_counts[ap];
}
if (alloc_region != NULL) {
@@ -2996,11 +3050,11 @@
for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
HeapRegion* r = _gc_alloc_regions[ap];
_retained_gc_alloc_regions[ap] = NULL;
+ _gc_alloc_region_counts[ap] = 0;
if (r != NULL) {
// we retain nothing on _gc_alloc_regions between GCs
set_gc_alloc_region(ap, NULL);
- _gc_alloc_region_counts[ap] = 0;
if (r->is_empty()) {
// we didn't actually allocate anything in it; let's just put
@@ -3088,10 +3142,8 @@
G1CollectedHeap* _g1;
public:
G1KeepAliveClosure(G1CollectedHeap* g1) : _g1(g1) {}
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- void do_oop(oop* p) {
+ void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
+ void do_oop( oop* p) {
oop obj = *p;
#ifdef G1_DEBUG
if (PrintGC && Verbose) {
@@ -3103,7 +3155,6 @@
if (_g1->obj_in_cs(obj)) {
assert( obj->is_forwarded(), "invariant" );
*p = obj->forwardee();
-
#ifdef G1_DEBUG
gclog_or_tty->print_cr(" in CSet: moved "PTR_FORMAT" -> "PTR_FORMAT,
(void*) obj, (void*) *p);
@@ -3120,12 +3171,12 @@
UpdateRSetImmediate(G1CollectedHeap* g1) :
_g1(g1), _g1_rem_set(g1->g1_rem_set()) {}
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- void do_oop(oop* p) {
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+ template <class T> void do_oop_work(T* p) {
assert(_from->is_in_reserved(p), "paranoia");
- if (*p != NULL && !_from->is_survivor()) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop) && !_from->is_survivor()) {
_g1_rem_set->par_write_ref(_from, p, 0);
}
}
@@ -3141,12 +3192,12 @@
UpdateRSetDeferred(G1CollectedHeap* g1, DirtyCardQueue* dcq) :
_g1(g1), _ct_bs((CardTableModRefBS*)_g1->barrier_set()), _dcq(dcq) {}
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- void do_oop(oop* p) {
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+ template <class T> void do_oop_work(T* p) {
assert(_from->is_in_reserved(p), "paranoia");
- if (!_from->is_in_reserved(*p) && !_from->is_survivor()) {
+ if (!_from->is_in_reserved(oopDesc::load_decode_heap_oop(p)) &&
+ !_from->is_survivor()) {
size_t card_index = _ct_bs->index_for(p);
if (_ct_bs->mark_card_deferred(card_index)) {
_dcq->enqueue((jbyte*)_ct_bs->byte_for_index(card_index));
@@ -3501,614 +3552,66 @@
fill_with_object(block, free_words);
}
-#define use_local_bitmaps 1
-#define verify_local_bitmaps 0
-
#ifndef PRODUCT
-
-class GCLabBitMap;
-class GCLabBitMapClosure: public BitMapClosure {
-private:
- ConcurrentMark* _cm;
- GCLabBitMap* _bitmap;
-
-public:
- GCLabBitMapClosure(ConcurrentMark* cm,
- GCLabBitMap* bitmap) {
- _cm = cm;
- _bitmap = bitmap;
- }
-
- virtual bool do_bit(size_t offset);
-};
-
-#endif // PRODUCT
-
-#define oop_buffer_length 256
-
-class GCLabBitMap: public BitMap {
-private:
- ConcurrentMark* _cm;
-
- int _shifter;
- size_t _bitmap_word_covers_words;
-
- // beginning of the heap
- HeapWord* _heap_start;
-
- // this is the actual start of the GCLab
- HeapWord* _real_start_word;
-
- // this is the actual end of the GCLab
- HeapWord* _real_end_word;
-
- // this is the first word, possibly located before the actual start
- // of the GCLab, that corresponds to the first bit of the bitmap
- HeapWord* _start_word;
-
- // size of a GCLab in words
- size_t _gclab_word_size;
-
- static int shifter() {
- return MinObjAlignment - 1;
- }
-
- // how many heap words does a single bitmap word corresponds to?
- static size_t bitmap_word_covers_words() {
- return BitsPerWord << shifter();
- }
-
- static size_t gclab_word_size() {
- return G1ParallelGCAllocBufferSize / HeapWordSize;
- }
-
- static size_t bitmap_size_in_bits() {
- size_t bits_in_bitmap = gclab_word_size() >> shifter();
- // We are going to ensure that the beginning of a word in this
- // bitmap also corresponds to the beginning of a word in the
- // global marking bitmap. To handle the case where a GCLab
- // starts from the middle of the bitmap, we need to add enough
- // space (i.e. up to a bitmap word) to ensure that we have
- // enough bits in the bitmap.
- return bits_in_bitmap + BitsPerWord - 1;
- }
-public:
- GCLabBitMap(HeapWord* heap_start)
- : BitMap(bitmap_size_in_bits()),
- _cm(G1CollectedHeap::heap()->concurrent_mark()),
- _shifter(shifter()),
- _bitmap_word_covers_words(bitmap_word_covers_words()),
- _heap_start(heap_start),
- _gclab_word_size(gclab_word_size()),
- _real_start_word(NULL),
- _real_end_word(NULL),
- _start_word(NULL)
- {
- guarantee( size_in_words() >= bitmap_size_in_words(),
- "just making sure");
- }
-
- inline unsigned heapWordToOffset(HeapWord* addr) {
- unsigned offset = (unsigned) pointer_delta(addr, _start_word) >> _shifter;
- assert(offset < size(), "offset should be within bounds");
- return offset;
- }
-
- inline HeapWord* offsetToHeapWord(size_t offset) {
- HeapWord* addr = _start_word + (offset << _shifter);
- assert(_real_start_word <= addr && addr < _real_end_word, "invariant");
- return addr;
- }
-
- bool fields_well_formed() {
- bool ret1 = (_real_start_word == NULL) &&
- (_real_end_word == NULL) &&
- (_start_word == NULL);
- if (ret1)
- return true;
-
- bool ret2 = _real_start_word >= _start_word &&
- _start_word < _real_end_word &&
- (_real_start_word + _gclab_word_size) == _real_end_word &&
- (_start_word + _gclab_word_size + _bitmap_word_covers_words)
- > _real_end_word;
- return ret2;
- }
-
- inline bool mark(HeapWord* addr) {
- guarantee(use_local_bitmaps, "invariant");
- assert(fields_well_formed(), "invariant");
-
- if (addr >= _real_start_word && addr < _real_end_word) {
- assert(!isMarked(addr), "should not have already been marked");
-
- // first mark it on the bitmap
- at_put(heapWordToOffset(addr), true);
-
- return true;
- } else {
- return false;
- }
- }
-
- inline bool isMarked(HeapWord* addr) {
- guarantee(use_local_bitmaps, "invariant");
- assert(fields_well_formed(), "invariant");
-
- return at(heapWordToOffset(addr));
- }
-
- void set_buffer(HeapWord* start) {
- guarantee(use_local_bitmaps, "invariant");
- clear();
-
- assert(start != NULL, "invariant");
- _real_start_word = start;
- _real_end_word = start + _gclab_word_size;
-
- size_t diff =
- pointer_delta(start, _heap_start) % _bitmap_word_covers_words;
- _start_word = start - diff;
-
- assert(fields_well_formed(), "invariant");
- }
-
-#ifndef PRODUCT
- void verify() {
- // verify that the marks have been propagated
- GCLabBitMapClosure cl(_cm, this);
- iterate(&cl);
- }
-#endif // PRODUCT
-
- void retire() {
- guarantee(use_local_bitmaps, "invariant");
- assert(fields_well_formed(), "invariant");
-
- if (_start_word != NULL) {
- CMBitMap* mark_bitmap = _cm->nextMarkBitMap();
-
- // this means that the bitmap was set up for the GCLab
- assert(_real_start_word != NULL && _real_end_word != NULL, "invariant");
-
- mark_bitmap->mostly_disjoint_range_union(this,
- 0, // always start from the start of the bitmap
- _start_word,
- size_in_words());
- _cm->grayRegionIfNecessary(MemRegion(_real_start_word, _real_end_word));
-
-#ifndef PRODUCT
- if (use_local_bitmaps && verify_local_bitmaps)
- verify();
-#endif // PRODUCT
- } else {
- assert(_real_start_word == NULL && _real_end_word == NULL, "invariant");
- }
- }
-
- static size_t bitmap_size_in_words() {
- return (bitmap_size_in_bits() + BitsPerWord - 1) / BitsPerWord;
- }
-};
-
-#ifndef PRODUCT
-
bool GCLabBitMapClosure::do_bit(size_t offset) {
HeapWord* addr = _bitmap->offsetToHeapWord(offset);
guarantee(_cm->isMarked(oop(addr)), "it should be!");
return true;
}
-
#endif // PRODUCT
-class G1ParGCAllocBuffer: public ParGCAllocBuffer {
-private:
- bool _retired;
- bool _during_marking;
- GCLabBitMap _bitmap;
-
-public:
- G1ParGCAllocBuffer() :
- ParGCAllocBuffer(G1ParallelGCAllocBufferSize / HeapWordSize),
- _during_marking(G1CollectedHeap::heap()->mark_in_progress()),
- _bitmap(G1CollectedHeap::heap()->reserved_region().start()),
- _retired(false)
- { }
-
- inline bool mark(HeapWord* addr) {
- guarantee(use_local_bitmaps, "invariant");
- assert(_during_marking, "invariant");
- return _bitmap.mark(addr);
- }
-
- inline void set_buf(HeapWord* buf) {
- if (use_local_bitmaps && _during_marking)
- _bitmap.set_buffer(buf);
- ParGCAllocBuffer::set_buf(buf);
- _retired = false;
- }
-
- inline void retire(bool end_of_gc, bool retain) {
- if (_retired)
- return;
- if (use_local_bitmaps && _during_marking) {
- _bitmap.retire();
- }
- ParGCAllocBuffer::retire(end_of_gc, retain);
- _retired = true;
- }
-};
-
-
-class G1ParScanThreadState : public StackObj {
-protected:
- G1CollectedHeap* _g1h;
- RefToScanQueue* _refs;
- DirtyCardQueue _dcq;
- CardTableModRefBS* _ct_bs;
- G1RemSet* _g1_rem;
-
- typedef GrowableArray<oop*> OverflowQueue;
- OverflowQueue* _overflowed_refs;
-
- G1ParGCAllocBuffer _alloc_buffers[GCAllocPurposeCount];
- ageTable _age_table;
-
- size_t _alloc_buffer_waste;
- size_t _undo_waste;
-
- OopsInHeapRegionClosure* _evac_failure_cl;
- G1ParScanHeapEvacClosure* _evac_cl;
- G1ParScanPartialArrayClosure* _partial_scan_cl;
-
- int _hash_seed;
- int _queue_num;
-
- int _term_attempts;
+G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, int queue_num)
+ : _g1h(g1h),
+ _refs(g1h->task_queue(queue_num)),
+ _dcq(&g1h->dirty_card_queue_set()),
+ _ct_bs((CardTableModRefBS*)_g1h->barrier_set()),
+ _g1_rem(g1h->g1_rem_set()),
+ _hash_seed(17), _queue_num(queue_num),
+ _term_attempts(0),
+ _age_table(false),
#if G1_DETAILED_STATS
- int _pushes, _pops, _steals, _steal_attempts;
- int _overflow_pushes;
-#endif
-
- double _start;
- double _start_strong_roots;
- double _strong_roots_time;
- double _start_term;
- double _term_time;
-
- // Map from young-age-index (0 == not young, 1 is youngest) to
- // surviving words. base is what we get back from the malloc call
- size_t* _surviving_young_words_base;
- // this points into the array, as we use the first few entries for padding
- size_t* _surviving_young_words;
-
-#define PADDING_ELEM_NUM (64 / sizeof(size_t))
-
- void add_to_alloc_buffer_waste(size_t waste) { _alloc_buffer_waste += waste; }
-
- void add_to_undo_waste(size_t waste) { _undo_waste += waste; }
-
- DirtyCardQueue& dirty_card_queue() { return _dcq; }
- CardTableModRefBS* ctbs() { return _ct_bs; }
-
- void immediate_rs_update(HeapRegion* from, oop* p, int tid) {
- if (!from->is_survivor()) {
- _g1_rem->par_write_ref(from, p, tid);
- }
- }
-
- void deferred_rs_update(HeapRegion* from, oop* p, int tid) {
- // If the new value of the field points to the same region or
- // is the to-space, we don't need to include it in the Rset updates.
- if (!from->is_in_reserved(*p) && !from->is_survivor()) {
- size_t card_index = ctbs()->index_for(p);
- // If the card hasn't been added to the buffer, do it.
- if (ctbs()->mark_card_deferred(card_index)) {
- dirty_card_queue().enqueue((jbyte*)ctbs()->byte_for_index(card_index));
- }
- }
- }
-
-public:
- G1ParScanThreadState(G1CollectedHeap* g1h, int queue_num)
- : _g1h(g1h),
- _refs(g1h->task_queue(queue_num)),
- _dcq(&g1h->dirty_card_queue_set()),
- _ct_bs((CardTableModRefBS*)_g1h->barrier_set()),
- _g1_rem(g1h->g1_rem_set()),
- _hash_seed(17), _queue_num(queue_num),
- _term_attempts(0),
- _age_table(false),
-#if G1_DETAILED_STATS
- _pushes(0), _pops(0), _steals(0),
- _steal_attempts(0), _overflow_pushes(0),
+ _pushes(0), _pops(0), _steals(0),
+ _steal_attempts(0), _overflow_pushes(0),
#endif
- _strong_roots_time(0), _term_time(0),
- _alloc_buffer_waste(0), _undo_waste(0)
- {
- // we allocate G1YoungSurvRateNumRegions plus one entries, since
- // we "sacrifice" entry 0 to keep track of surviving bytes for
- // non-young regions (where the age is -1)
- // We also add a few elements at the beginning and at the end in
- // an attempt to eliminate cache contention
- size_t real_length = 1 + _g1h->g1_policy()->young_cset_length();
- size_t array_length = PADDING_ELEM_NUM +
- real_length +
- PADDING_ELEM_NUM;
- _surviving_young_words_base = NEW_C_HEAP_ARRAY(size_t, array_length);
- if (_surviving_young_words_base == NULL)
- vm_exit_out_of_memory(array_length * sizeof(size_t),
- "Not enough space for young surv histo.");
- _surviving_young_words = _surviving_young_words_base + PADDING_ELEM_NUM;
- memset(_surviving_young_words, 0, real_length * sizeof(size_t));
-
- _overflowed_refs = new OverflowQueue(10);
-
- _start = os::elapsedTime();
- }
-
- ~G1ParScanThreadState() {
- FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_base);
- }
-
- RefToScanQueue* refs() { return _refs; }
- OverflowQueue* overflowed_refs() { return _overflowed_refs; }
- ageTable* age_table() { return &_age_table; }
-
- G1ParGCAllocBuffer* alloc_buffer(GCAllocPurpose purpose) {
- return &_alloc_buffers[purpose];
- }
-
- size_t alloc_buffer_waste() { return _alloc_buffer_waste; }
- size_t undo_waste() { return _undo_waste; }
-
- void push_on_queue(oop* ref) {
- assert(ref != NULL, "invariant");
- assert(has_partial_array_mask(ref) || _g1h->obj_in_cs(*ref), "invariant");
-
- if (!refs()->push(ref)) {
- overflowed_refs()->push(ref);
- IF_G1_DETAILED_STATS(note_overflow_push());
- } else {
- IF_G1_DETAILED_STATS(note_push());
- }
- }
-
- void pop_from_queue(oop*& ref) {
- if (!refs()->pop_local(ref)) {
- ref = NULL;
- } else {
- assert(ref != NULL, "invariant");
- assert(has_partial_array_mask(ref) || _g1h->obj_in_cs(*ref),
- "invariant");
-
- IF_G1_DETAILED_STATS(note_pop());
- }
- }
-
- void pop_from_overflow_queue(oop*& ref) {
- ref = overflowed_refs()->pop();
- }
-
- int refs_to_scan() { return refs()->size(); }
- int overflowed_refs_to_scan() { return overflowed_refs()->length(); }
-
- void update_rs(HeapRegion* from, oop* p, int tid) {
- if (G1DeferredRSUpdate) {
- deferred_rs_update(from, p, tid);
- } else {
- immediate_rs_update(from, p, tid);
- }
- }
-
- HeapWord* allocate_slow(GCAllocPurpose purpose, size_t word_sz) {
-
- HeapWord* obj = NULL;
- if (word_sz * 100 <
- (size_t)(G1ParallelGCAllocBufferSize / HeapWordSize) *
- ParallelGCBufferWastePct) {
- G1ParGCAllocBuffer* alloc_buf = alloc_buffer(purpose);
- add_to_alloc_buffer_waste(alloc_buf->words_remaining());
- alloc_buf->retire(false, false);
-
- HeapWord* buf =
- _g1h->par_allocate_during_gc(purpose, G1ParallelGCAllocBufferSize / HeapWordSize);
- if (buf == NULL) return NULL; // Let caller handle allocation failure.
- // Otherwise.
- alloc_buf->set_buf(buf);
-
- obj = alloc_buf->allocate(word_sz);
- assert(obj != NULL, "buffer was definitely big enough...");
- } else {
- obj = _g1h->par_allocate_during_gc(purpose, word_sz);
- }
- return obj;
- }
-
- HeapWord* allocate(GCAllocPurpose purpose, size_t word_sz) {
- HeapWord* obj = alloc_buffer(purpose)->allocate(word_sz);
- if (obj != NULL) return obj;
- return allocate_slow(purpose, word_sz);
- }
-
- void undo_allocation(GCAllocPurpose purpose, HeapWord* obj, size_t word_sz) {
- if (alloc_buffer(purpose)->contains(obj)) {
- guarantee(alloc_buffer(purpose)->contains(obj + word_sz - 1),
- "should contain whole object");
- alloc_buffer(purpose)->undo_allocation(obj, word_sz);
- } else {
- CollectedHeap::fill_with_object(obj, word_sz);
- add_to_undo_waste(word_sz);
- }
- }
-
- void set_evac_failure_closure(OopsInHeapRegionClosure* evac_failure_cl) {
- _evac_failure_cl = evac_failure_cl;
- }
- OopsInHeapRegionClosure* evac_failure_closure() {
- return _evac_failure_cl;
- }
-
- void set_evac_closure(G1ParScanHeapEvacClosure* evac_cl) {
- _evac_cl = evac_cl;
- }
-
- void set_partial_scan_closure(G1ParScanPartialArrayClosure* partial_scan_cl) {
- _partial_scan_cl = partial_scan_cl;
- }
-
- int* hash_seed() { return &_hash_seed; }
- int queue_num() { return _queue_num; }
-
- int term_attempts() { return _term_attempts; }
- void note_term_attempt() { _term_attempts++; }
-
-#if G1_DETAILED_STATS
- int pushes() { return _pushes; }
- int pops() { return _pops; }
- int steals() { return _steals; }
- int steal_attempts() { return _steal_attempts; }
- int overflow_pushes() { return _overflow_pushes; }
-
- void note_push() { _pushes++; }
- void note_pop() { _pops++; }
- void note_steal() { _steals++; }
- void note_steal_attempt() { _steal_attempts++; }
- void note_overflow_push() { _overflow_pushes++; }
-#endif
-
- void start_strong_roots() {
- _start_strong_roots = os::elapsedTime();
- }
- void end_strong_roots() {
- _strong_roots_time += (os::elapsedTime() - _start_strong_roots);
- }
- double strong_roots_time() { return _strong_roots_time; }
-
- void start_term_time() {
- note_term_attempt();
- _start_term = os::elapsedTime();
- }
- void end_term_time() {
- _term_time += (os::elapsedTime() - _start_term);
- }
- double term_time() { return _term_time; }
-
- double elapsed() {
- return os::elapsedTime() - _start;
- }
-
- size_t* surviving_young_words() {
- // We add on to hide entry 0 which accumulates surviving words for
- // age -1 regions (i.e. non-young ones)
- return _surviving_young_words;
- }
-
- void retire_alloc_buffers() {
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- size_t waste = _alloc_buffers[ap].words_remaining();
- add_to_alloc_buffer_waste(waste);
- _alloc_buffers[ap].retire(true, false);
- }
- }
-
-private:
- void deal_with_reference(oop* ref_to_scan) {
- if (has_partial_array_mask(ref_to_scan)) {
- _partial_scan_cl->do_oop_nv(ref_to_scan);
- } else {
- // Note: we can use "raw" versions of "region_containing" because
- // "obj_to_scan" is definitely in the heap, and is not in a
- // humongous region.
- HeapRegion* r = _g1h->heap_region_containing_raw(ref_to_scan);
- _evac_cl->set_region(r);
- _evac_cl->do_oop_nv(ref_to_scan);
- }
- }
-
-public:
- void trim_queue() {
- // I've replicated the loop twice, first to drain the overflow
- // queue, second to drain the task queue. This is better than
- // having a single loop, which checks both conditions and, inside
- // it, either pops the overflow queue or the task queue, as each
- // loop is tighter. Also, the decision to drain the overflow queue
- // first is not arbitrary, as the overflow queue is not visible
- // to the other workers, whereas the task queue is. So, we want to
- // drain the "invisible" entries first, while allowing the other
- // workers to potentially steal the "visible" entries.
-
- while (refs_to_scan() > 0 || overflowed_refs_to_scan() > 0) {
- while (overflowed_refs_to_scan() > 0) {
- oop *ref_to_scan = NULL;
- pop_from_overflow_queue(ref_to_scan);
- assert(ref_to_scan != NULL, "invariant");
- // We shouldn't have pushed it on the queue if it was not
- // pointing into the CSet.
- assert(ref_to_scan != NULL, "sanity");
- assert(has_partial_array_mask(ref_to_scan) ||
- _g1h->obj_in_cs(*ref_to_scan), "sanity");
-
- deal_with_reference(ref_to_scan);
- }
-
- while (refs_to_scan() > 0) {
- oop *ref_to_scan = NULL;
- pop_from_queue(ref_to_scan);
-
- if (ref_to_scan != NULL) {
- // We shouldn't have pushed it on the queue if it was not
- // pointing into the CSet.
- assert(has_partial_array_mask(ref_to_scan) ||
- _g1h->obj_in_cs(*ref_to_scan), "sanity");
-
- deal_with_reference(ref_to_scan);
- }
- }
- }
- }
-};
+ _strong_roots_time(0), _term_time(0),
+ _alloc_buffer_waste(0), _undo_waste(0)
+{
+ // we allocate G1YoungSurvRateNumRegions plus one entries, since
+ // we "sacrifice" entry 0 to keep track of surviving bytes for
+ // non-young regions (where the age is -1)
+ // We also add a few elements at the beginning and at the end in
+ // an attempt to eliminate cache contention
+ size_t real_length = 1 + _g1h->g1_policy()->young_cset_length();
+ size_t array_length = PADDING_ELEM_NUM +
+ real_length +
+ PADDING_ELEM_NUM;
+ _surviving_young_words_base = NEW_C_HEAP_ARRAY(size_t, array_length);
+ if (_surviving_young_words_base == NULL)
+ vm_exit_out_of_memory(array_length * sizeof(size_t),
+ "Not enough space for young surv histo.");
+ _surviving_young_words = _surviving_young_words_base + PADDING_ELEM_NUM;
+ memset(_surviving_young_words, 0, real_length * sizeof(size_t));
+
+ _overflowed_refs = new OverflowQueue(10);
+
+ _start = os::elapsedTime();
+}
G1ParClosureSuper::G1ParClosureSuper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
_g1(g1), _g1_rem(_g1->g1_rem_set()), _cm(_g1->concurrent_mark()),
_par_scan_state(par_scan_state) { }
-// This closure is applied to the fields of the objects that have just been copied.
-// Should probably be made inline and moved in g1OopClosures.inline.hpp.
-void G1ParScanClosure::do_oop_nv(oop* p) {
- oop obj = *p;
-
- if (obj != NULL) {
- if (_g1->in_cset_fast_test(obj)) {
- // We're not going to even bother checking whether the object is
- // already forwarded or not, as this usually causes an immediate
- // stall. We'll try to prefetch the object (for write, given that
- // we might need to install the forwarding reference) and we'll
- // get back to it when pop it from the queue
- Prefetch::write(obj->mark_addr(), 0);
- Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
-
- // slightly paranoid test; I'm trying to catch potential
- // problems before we go into push_on_queue to know where the
- // problem is coming from
- assert(obj == *p, "the value of *p should not have changed");
- _par_scan_state->push_on_queue(p);
- } else {
- _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
- }
- }
-}
-
-void G1ParCopyHelper::mark_forwardee(oop* p) {
+template <class T> void G1ParCopyHelper::mark_forwardee(T* p) {
// This is called _after_ do_oop_work has been called, hence after
// the object has been relocated to its new location and *p points
// to its new location.
- oop thisOop = *p;
- if (thisOop != NULL) {
- assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(thisOop)),
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop(heap_oop);
+ assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(obj)),
"shouldn't still be in the CSet if evacuation didn't fail.");
- HeapWord* addr = (HeapWord*)thisOop;
+ HeapWord* addr = (HeapWord*)obj;
if (_g1->is_in_g1_reserved(addr))
_cm->grayRoot(oop(addr));
}
@@ -4191,7 +3694,8 @@
if (obj->is_objArray() && arrayOop(obj)->length() >= ParGCArrayScanChunk) {
arrayOop(old)->set_length(0);
- _par_scan_state->push_on_queue(set_partial_array_mask(old));
+ oop* old_p = set_partial_array_mask(old);
+ _par_scan_state->push_on_queue(old_p);
} else {
// No point in using the slower heap_region_containing() method,
// given that we know obj is in the heap.
@@ -4205,11 +3709,11 @@
return obj;
}
-template<bool do_gen_barrier, G1Barrier barrier,
- bool do_mark_forwardee, bool skip_cset_test>
-void G1ParCopyClosure<do_gen_barrier, barrier,
- do_mark_forwardee, skip_cset_test>::do_oop_work(oop* p) {
- oop obj = *p;
+template <bool do_gen_barrier, G1Barrier barrier, bool do_mark_forwardee, bool skip_cset_test>
+template <class T>
+void G1ParCopyClosure <do_gen_barrier, barrier, do_mark_forwardee, skip_cset_test>
+::do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
assert(barrier != G1BarrierRS || obj != NULL,
"Precondition: G1BarrierRS implies obj is nonNull");
@@ -4226,9 +3730,10 @@
"into CS.", p, (void*) obj);
#endif
if (obj->is_forwarded()) {
- *p = obj->forwardee();
+ oopDesc::encode_store_heap_oop(p, obj->forwardee());
} else {
- *p = copy_to_survivor_space(obj);
+ oop copy_oop = copy_to_survivor_space(obj);
+ oopDesc::encode_store_heap_oop(p, copy_oop);
}
// When scanning the RS, we only care about objs in CS.
if (barrier == G1BarrierRS) {
@@ -4247,21 +3752,9 @@
}
template void G1ParCopyClosure<false, G1BarrierEvac, false, true>::do_oop_work(oop* p);
-
-template<class T> void G1ParScanPartialArrayClosure::process_array_chunk(
- oop obj, int start, int end) {
- // process our set of indices (include header in first chunk)
- assert(start < end, "invariant");
- T* const base = (T*)objArrayOop(obj)->base();
- T* const start_addr = (start == 0) ? (T*) obj : base + start;
- T* const end_addr = base + end;
- MemRegion mr((HeapWord*)start_addr, (HeapWord*)end_addr);
- _scanner.set_region(_g1->heap_region_containing(obj));
- obj->oop_iterate(&_scanner, mr);
-}
-
-void G1ParScanPartialArrayClosure::do_oop_nv(oop* p) {
- assert(!UseCompressedOops, "Needs to be fixed to work with compressed oops");
+template void G1ParCopyClosure<false, G1BarrierEvac, false, true>::do_oop_work(narrowOop* p);
+
+template <class T> void G1ParScanPartialArrayClosure::do_oop_nv(T* p) {
assert(has_partial_array_mask(p), "invariant");
oop old = clear_partial_array_mask(p);
assert(old->is_objArray(), "must be obj array");
@@ -4281,19 +3774,19 @@
end = start + ParGCArrayScanChunk;
arrayOop(old)->set_length(end);
// Push remainder.
- _par_scan_state->push_on_queue(set_partial_array_mask(old));
+ oop* old_p = set_partial_array_mask(old);
+ assert(arrayOop(old)->length() < obj->length(), "Empty push?");
+ _par_scan_state->push_on_queue(old_p);
} else {
// Restore length so that the heap remains parsable in
// case of evacuation failure.
arrayOop(old)->set_length(end);
}
-
+ _scanner.set_region(_g1->heap_region_containing_raw(obj));
// process our set of indices (include header in first chunk)
- process_array_chunk<oop>(obj, start, end);
+ obj->oop_iterate_range(&_scanner, start, end);
}
-int G1ScanAndBalanceClosure::_nq = 0;
-
class G1ParEvacuateFollowersClosure : public VoidClosure {
protected:
G1CollectedHeap* _g1h;
@@ -4316,21 +3809,28 @@
void do_void() {
G1ParScanThreadState* pss = par_scan_state();
while (true) {
- oop* ref_to_scan;
pss->trim_queue();
IF_G1_DETAILED_STATS(pss->note_steal_attempt());
- if (queues()->steal(pss->queue_num(),
- pss->hash_seed(),
- ref_to_scan)) {
+
+ StarTask stolen_task;
+ if (queues()->steal(pss->queue_num(), pss->hash_seed(), stolen_task)) {
IF_G1_DETAILED_STATS(pss->note_steal());
// slightly paranoid tests; I'm trying to catch potential
// problems before we go into push_on_queue to know where the
// problem is coming from
- assert(ref_to_scan != NULL, "invariant");
- assert(has_partial_array_mask(ref_to_scan) ||
- _g1h->obj_in_cs(*ref_to_scan), "invariant");
- pss->push_on_queue(ref_to_scan);
+ assert((oop*)stolen_task != NULL, "Error");
+ if (stolen_task.is_narrow()) {
+ assert(UseCompressedOops, "Error");
+ narrowOop* p = (narrowOop*) stolen_task;
+ assert(has_partial_array_mask(p) ||
+ _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "Error");
+ pss->push_on_queue(p);
+ } else {
+ oop* p = (oop*) stolen_task;
+ assert(has_partial_array_mask(p) || _g1h->obj_in_cs(*p), "Error");
+ pss->push_on_queue(p);
+ }
continue;
}
pss->start_term_time();
@@ -4347,6 +3847,7 @@
G1CollectedHeap* _g1h;
RefToScanQueueSet *_queues;
ParallelTaskTerminator _terminator;
+ int _n_workers;
Mutex _stats_lock;
Mutex* stats_lock() { return &_stats_lock; }
@@ -4362,7 +3863,8 @@
_g1h(g1h),
_queues(task_queues),
_terminator(workers, _queues),
- _stats_lock(Mutex::leaf, "parallel G1 stats lock", true)
+ _stats_lock(Mutex::leaf, "parallel G1 stats lock", true),
+ _n_workers(workers)
{}
RefToScanQueueSet* queues() { return _queues; }
@@ -4372,6 +3874,7 @@
}
void work(int i) {
+ if (i >= _n_workers) return; // no work needed this round
ResourceMark rm;
HandleMark hm;
@@ -4469,23 +3972,6 @@
// *** Common G1 Evacuation Stuff
-class G1CountClosure: public OopsInHeapRegionClosure {
-public:
- int n;
- G1CountClosure() : n(0) {}
- void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- void do_oop(oop* p) {
- oop obj = *p;
- assert(obj != NULL && G1CollectedHeap::heap()->obj_in_cs(obj),
- "Rem set closure called on non-rem-set pointer.");
- n++;
- }
-};
-
-static G1CountClosure count_closure;
-
void
G1CollectedHeap::
g1_process_strong_roots(bool collecting_perm_gen,
@@ -5357,7 +4843,7 @@
assert(_free_region_list == NULL, "Postcondition of loop.");
if (_free_region_list_size != 0) {
gclog_or_tty->print_cr("Size is %d.", _free_region_list_size);
- print();
+ print_on(gclog_or_tty, true /* extended */);
}
assert(_free_region_list_size == 0, "Postconditions of loop.");
}
@@ -5535,8 +5021,3 @@
void G1CollectedHeap::g1_unimplemented() {
// Unimplemented();
}
-
-
-// Local Variables: ***
-// c-indentation-style: gnu ***
-// End: ***
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -56,8 +56,8 @@
# define IF_G1_DETAILED_STATS(code)
#endif
-typedef GenericTaskQueue<oop*> RefToScanQueue;
-typedef GenericTaskQueueSet<oop*> RefToScanQueueSet;
+typedef GenericTaskQueue<StarTask> RefToScanQueue;
+typedef GenericTaskQueueSet<StarTask> RefToScanQueueSet;
typedef int RegionIdx_t; // needs to hold [ 0..max_regions() )
typedef int CardIdx_t; // needs to hold [ 0..CardsPerRegion )
@@ -700,6 +700,9 @@
size_t g1_reserved_obj_bytes() { return _g1_reserved.byte_size(); }
virtual size_t capacity() const;
virtual size_t used() const;
+ // This should be called when we're not holding the heap lock. The
+ // result might be a bit inaccurate.
+ size_t used_unlocked() const;
size_t recalculate_used() const;
#ifndef PRODUCT
size_t recalculate_used_regions() const;
@@ -1061,8 +1064,14 @@
// Override; it uses the "prev" marking information
virtual void verify(bool allow_dirty, bool silent);
+ // Default behavior by calling print(tty);
virtual void print() const;
+ // This calls print_on(st, PrintHeapAtGCExtended).
virtual void print_on(outputStream* st) const;
+ // If extended is true, it will print out information for all
+ // regions in the heap by calling print_on_extended(st).
+ virtual void print_on(outputStream* st, bool extended) const;
+ virtual void print_on_extended(outputStream* st) const;
virtual void print_gc_threads_on(outputStream* st) const;
virtual void gc_threads_do(ThreadClosure* tc) const;
@@ -1265,6 +1274,552 @@
};
-// Local Variables: ***
-// c-indentation-style: gnu ***
-// End: ***
+#define use_local_bitmaps 1
+#define verify_local_bitmaps 0
+#define oop_buffer_length 256
+
+#ifndef PRODUCT
+class GCLabBitMap;
+class GCLabBitMapClosure: public BitMapClosure {
+private:
+ ConcurrentMark* _cm;
+ GCLabBitMap* _bitmap;
+
+public:
+ GCLabBitMapClosure(ConcurrentMark* cm,
+ GCLabBitMap* bitmap) {
+ _cm = cm;
+ _bitmap = bitmap;
+ }
+
+ virtual bool do_bit(size_t offset);
+};
+#endif // !PRODUCT
+
+class GCLabBitMap: public BitMap {
+private:
+ ConcurrentMark* _cm;
+
+ int _shifter;
+ size_t _bitmap_word_covers_words;
+
+ // beginning of the heap
+ HeapWord* _heap_start;
+
+ // this is the actual start of the GCLab
+ HeapWord* _real_start_word;
+
+ // this is the actual end of the GCLab
+ HeapWord* _real_end_word;
+
+ // this is the first word, possibly located before the actual start
+ // of the GCLab, that corresponds to the first bit of the bitmap
+ HeapWord* _start_word;
+
+ // size of a GCLab in words
+ size_t _gclab_word_size;
+
+ static int shifter() {
+ return MinObjAlignment - 1;
+ }
+
+ // how many heap words does a single bitmap word corresponds to?
+ static size_t bitmap_word_covers_words() {
+ return BitsPerWord << shifter();
+ }
+
+ static size_t gclab_word_size() {
+ return G1ParallelGCAllocBufferSize / HeapWordSize;
+ }
+
+ static size_t bitmap_size_in_bits() {
+ size_t bits_in_bitmap = gclab_word_size() >> shifter();
+ // We are going to ensure that the beginning of a word in this
+ // bitmap also corresponds to the beginning of a word in the
+ // global marking bitmap. To handle the case where a GCLab
+ // starts from the middle of the bitmap, we need to add enough
+ // space (i.e. up to a bitmap word) to ensure that we have
+ // enough bits in the bitmap.
+ return bits_in_bitmap + BitsPerWord - 1;
+ }
+public:
+ GCLabBitMap(HeapWord* heap_start)
+ : BitMap(bitmap_size_in_bits()),
+ _cm(G1CollectedHeap::heap()->concurrent_mark()),
+ _shifter(shifter()),
+ _bitmap_word_covers_words(bitmap_word_covers_words()),
+ _heap_start(heap_start),
+ _gclab_word_size(gclab_word_size()),
+ _real_start_word(NULL),
+ _real_end_word(NULL),
+ _start_word(NULL)
+ {
+ guarantee( size_in_words() >= bitmap_size_in_words(),
+ "just making sure");
+ }
+
+ inline unsigned heapWordToOffset(HeapWord* addr) {
+ unsigned offset = (unsigned) pointer_delta(addr, _start_word) >> _shifter;
+ assert(offset < size(), "offset should be within bounds");
+ return offset;
+ }
+
+ inline HeapWord* offsetToHeapWord(size_t offset) {
+ HeapWord* addr = _start_word + (offset << _shifter);
+ assert(_real_start_word <= addr && addr < _real_end_word, "invariant");
+ return addr;
+ }
+
+ bool fields_well_formed() {
+ bool ret1 = (_real_start_word == NULL) &&
+ (_real_end_word == NULL) &&
+ (_start_word == NULL);
+ if (ret1)
+ return true;
+
+ bool ret2 = _real_start_word >= _start_word &&
+ _start_word < _real_end_word &&
+ (_real_start_word + _gclab_word_size) == _real_end_word &&
+ (_start_word + _gclab_word_size + _bitmap_word_covers_words)
+ > _real_end_word;
+ return ret2;
+ }
+
+ inline bool mark(HeapWord* addr) {
+ guarantee(use_local_bitmaps, "invariant");
+ assert(fields_well_formed(), "invariant");
+
+ if (addr >= _real_start_word && addr < _real_end_word) {
+ assert(!isMarked(addr), "should not have already been marked");
+
+ // first mark it on the bitmap
+ at_put(heapWordToOffset(addr), true);
+
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ inline bool isMarked(HeapWord* addr) {
+ guarantee(use_local_bitmaps, "invariant");
+ assert(fields_well_formed(), "invariant");
+
+ return at(heapWordToOffset(addr));
+ }
+
+ void set_buffer(HeapWord* start) {
+ guarantee(use_local_bitmaps, "invariant");
+ clear();
+
+ assert(start != NULL, "invariant");
+ _real_start_word = start;
+ _real_end_word = start + _gclab_word_size;
+
+ size_t diff =
+ pointer_delta(start, _heap_start) % _bitmap_word_covers_words;
+ _start_word = start - diff;
+
+ assert(fields_well_formed(), "invariant");
+ }
+
+#ifndef PRODUCT
+ void verify() {
+ // verify that the marks have been propagated
+ GCLabBitMapClosure cl(_cm, this);
+ iterate(&cl);
+ }
+#endif // PRODUCT
+
+ void retire() {
+ guarantee(use_local_bitmaps, "invariant");
+ assert(fields_well_formed(), "invariant");
+
+ if (_start_word != NULL) {
+ CMBitMap* mark_bitmap = _cm->nextMarkBitMap();
+
+ // this means that the bitmap was set up for the GCLab
+ assert(_real_start_word != NULL && _real_end_word != NULL, "invariant");
+
+ mark_bitmap->mostly_disjoint_range_union(this,
+ 0, // always start from the start of the bitmap
+ _start_word,
+ size_in_words());
+ _cm->grayRegionIfNecessary(MemRegion(_real_start_word, _real_end_word));
+
+#ifndef PRODUCT
+ if (use_local_bitmaps && verify_local_bitmaps)
+ verify();
+#endif // PRODUCT
+ } else {
+ assert(_real_start_word == NULL && _real_end_word == NULL, "invariant");
+ }
+ }
+
+ static size_t bitmap_size_in_words() {
+ return (bitmap_size_in_bits() + BitsPerWord - 1) / BitsPerWord;
+ }
+};
+
+class G1ParGCAllocBuffer: public ParGCAllocBuffer {
+private:
+ bool _retired;
+ bool _during_marking;
+ GCLabBitMap _bitmap;
+
+public:
+ G1ParGCAllocBuffer() :
+ ParGCAllocBuffer(G1ParallelGCAllocBufferSize / HeapWordSize),
+ _during_marking(G1CollectedHeap::heap()->mark_in_progress()),
+ _bitmap(G1CollectedHeap::heap()->reserved_region().start()),
+ _retired(false)
+ { }
+
+ inline bool mark(HeapWord* addr) {
+ guarantee(use_local_bitmaps, "invariant");
+ assert(_during_marking, "invariant");
+ return _bitmap.mark(addr);
+ }
+
+ inline void set_buf(HeapWord* buf) {
+ if (use_local_bitmaps && _during_marking)
+ _bitmap.set_buffer(buf);
+ ParGCAllocBuffer::set_buf(buf);
+ _retired = false;
+ }
+
+ inline void retire(bool end_of_gc, bool retain) {
+ if (_retired)
+ return;
+ if (use_local_bitmaps && _during_marking) {
+ _bitmap.retire();
+ }
+ ParGCAllocBuffer::retire(end_of_gc, retain);
+ _retired = true;
+ }
+};
+
+class G1ParScanThreadState : public StackObj {
+protected:
+ G1CollectedHeap* _g1h;
+ RefToScanQueue* _refs;
+ DirtyCardQueue _dcq;
+ CardTableModRefBS* _ct_bs;
+ G1RemSet* _g1_rem;
+
+ typedef GrowableArray<StarTask> OverflowQueue;
+ OverflowQueue* _overflowed_refs;
+
+ G1ParGCAllocBuffer _alloc_buffers[GCAllocPurposeCount];
+ ageTable _age_table;
+
+ size_t _alloc_buffer_waste;
+ size_t _undo_waste;
+
+ OopsInHeapRegionClosure* _evac_failure_cl;
+ G1ParScanHeapEvacClosure* _evac_cl;
+ G1ParScanPartialArrayClosure* _partial_scan_cl;
+
+ int _hash_seed;
+ int _queue_num;
+
+ int _term_attempts;
+#if G1_DETAILED_STATS
+ int _pushes, _pops, _steals, _steal_attempts;
+ int _overflow_pushes;
+#endif
+
+ double _start;
+ double _start_strong_roots;
+ double _strong_roots_time;
+ double _start_term;
+ double _term_time;
+
+ // Map from young-age-index (0 == not young, 1 is youngest) to
+ // surviving words. base is what we get back from the malloc call
+ size_t* _surviving_young_words_base;
+ // this points into the array, as we use the first few entries for padding
+ size_t* _surviving_young_words;
+
+#define PADDING_ELEM_NUM (64 / sizeof(size_t))
+
+ void add_to_alloc_buffer_waste(size_t waste) { _alloc_buffer_waste += waste; }
+
+ void add_to_undo_waste(size_t waste) { _undo_waste += waste; }
+
+ DirtyCardQueue& dirty_card_queue() { return _dcq; }
+ CardTableModRefBS* ctbs() { return _ct_bs; }
+
+ template <class T> void immediate_rs_update(HeapRegion* from, T* p, int tid) {
+ if (!from->is_survivor()) {
+ _g1_rem->par_write_ref(from, p, tid);
+ }
+ }
+
+ template <class T> void deferred_rs_update(HeapRegion* from, T* p, int tid) {
+ // If the new value of the field points to the same region or
+ // is the to-space, we don't need to include it in the Rset updates.
+ if (!from->is_in_reserved(oopDesc::load_decode_heap_oop(p)) && !from->is_survivor()) {
+ size_t card_index = ctbs()->index_for(p);
+ // If the card hasn't been added to the buffer, do it.
+ if (ctbs()->mark_card_deferred(card_index)) {
+ dirty_card_queue().enqueue((jbyte*)ctbs()->byte_for_index(card_index));
+ }
+ }
+ }
+
+public:
+ G1ParScanThreadState(G1CollectedHeap* g1h, int queue_num);
+
+ ~G1ParScanThreadState() {
+ FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_base);
+ }
+
+ RefToScanQueue* refs() { return _refs; }
+ OverflowQueue* overflowed_refs() { return _overflowed_refs; }
+ ageTable* age_table() { return &_age_table; }
+
+ G1ParGCAllocBuffer* alloc_buffer(GCAllocPurpose purpose) {
+ return &_alloc_buffers[purpose];
+ }
+
+ size_t alloc_buffer_waste() { return _alloc_buffer_waste; }
+ size_t undo_waste() { return _undo_waste; }
+
+ template <class T> void push_on_queue(T* ref) {
+ assert(ref != NULL, "invariant");
+ assert(has_partial_array_mask(ref) ||
+ _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(ref)), "invariant");
+#ifdef ASSERT
+ if (has_partial_array_mask(ref)) {
+ oop p = clear_partial_array_mask(ref);
+ // Verify that we point into the CS
+ assert(_g1h->obj_in_cs(p), "Should be in CS");
+ }
+#endif
+ if (!refs()->push(ref)) {
+ overflowed_refs()->push(ref);
+ IF_G1_DETAILED_STATS(note_overflow_push());
+ } else {
+ IF_G1_DETAILED_STATS(note_push());
+ }
+ }
+
+ void pop_from_queue(StarTask& ref) {
+ if (refs()->pop_local(ref)) {
+ assert((oop*)ref != NULL, "pop_local() returned true");
+ assert(UseCompressedOops || !ref.is_narrow(), "Error");
+ assert(has_partial_array_mask((oop*)ref) ||
+ _g1h->obj_in_cs(ref.is_narrow() ? oopDesc::load_decode_heap_oop((narrowOop*)ref)
+ : oopDesc::load_decode_heap_oop((oop*)ref)),
+ "invariant");
+ IF_G1_DETAILED_STATS(note_pop());
+ } else {
+ StarTask null_task;
+ ref = null_task;
+ }
+ }
+
+ void pop_from_overflow_queue(StarTask& ref) {
+ StarTask new_ref = overflowed_refs()->pop();
+ assert((oop*)new_ref != NULL, "pop() from a local non-empty stack");
+ assert(UseCompressedOops || !new_ref.is_narrow(), "Error");
+ assert(has_partial_array_mask((oop*)new_ref) ||
+ _g1h->obj_in_cs(new_ref.is_narrow() ? oopDesc::load_decode_heap_oop((narrowOop*)new_ref)
+ : oopDesc::load_decode_heap_oop((oop*)new_ref)),
+ "invariant");
+ ref = new_ref;
+ }
+
+ int refs_to_scan() { return refs()->size(); }
+ int overflowed_refs_to_scan() { return overflowed_refs()->length(); }
+
+ template <class T> void update_rs(HeapRegion* from, T* p, int tid) {
+ if (G1DeferredRSUpdate) {
+ deferred_rs_update(from, p, tid);
+ } else {
+ immediate_rs_update(from, p, tid);
+ }
+ }
+
+ HeapWord* allocate_slow(GCAllocPurpose purpose, size_t word_sz) {
+
+ HeapWord* obj = NULL;
+ if (word_sz * 100 <
+ (size_t)(G1ParallelGCAllocBufferSize / HeapWordSize) *
+ ParallelGCBufferWastePct) {
+ G1ParGCAllocBuffer* alloc_buf = alloc_buffer(purpose);
+ add_to_alloc_buffer_waste(alloc_buf->words_remaining());
+ alloc_buf->retire(false, false);
+
+ HeapWord* buf =
+ _g1h->par_allocate_during_gc(purpose, G1ParallelGCAllocBufferSize / HeapWordSize);
+ if (buf == NULL) return NULL; // Let caller handle allocation failure.
+ // Otherwise.
+ alloc_buf->set_buf(buf);
+
+ obj = alloc_buf->allocate(word_sz);
+ assert(obj != NULL, "buffer was definitely big enough...");
+ } else {
+ obj = _g1h->par_allocate_during_gc(purpose, word_sz);
+ }
+ return obj;
+ }
+
+ HeapWord* allocate(GCAllocPurpose purpose, size_t word_sz) {
+ HeapWord* obj = alloc_buffer(purpose)->allocate(word_sz);
+ if (obj != NULL) return obj;
+ return allocate_slow(purpose, word_sz);
+ }
+
+ void undo_allocation(GCAllocPurpose purpose, HeapWord* obj, size_t word_sz) {
+ if (alloc_buffer(purpose)->contains(obj)) {
+ assert(alloc_buffer(purpose)->contains(obj + word_sz - 1),
+ "should contain whole object");
+ alloc_buffer(purpose)->undo_allocation(obj, word_sz);
+ } else {
+ CollectedHeap::fill_with_object(obj, word_sz);
+ add_to_undo_waste(word_sz);
+ }
+ }
+
+ void set_evac_failure_closure(OopsInHeapRegionClosure* evac_failure_cl) {
+ _evac_failure_cl = evac_failure_cl;
+ }
+ OopsInHeapRegionClosure* evac_failure_closure() {
+ return _evac_failure_cl;
+ }
+
+ void set_evac_closure(G1ParScanHeapEvacClosure* evac_cl) {
+ _evac_cl = evac_cl;
+ }
+
+ void set_partial_scan_closure(G1ParScanPartialArrayClosure* partial_scan_cl) {
+ _partial_scan_cl = partial_scan_cl;
+ }
+
+ int* hash_seed() { return &_hash_seed; }
+ int queue_num() { return _queue_num; }
+
+ int term_attempts() { return _term_attempts; }
+ void note_term_attempt() { _term_attempts++; }
+
+#if G1_DETAILED_STATS
+ int pushes() { return _pushes; }
+ int pops() { return _pops; }
+ int steals() { return _steals; }
+ int steal_attempts() { return _steal_attempts; }
+ int overflow_pushes() { return _overflow_pushes; }
+
+ void note_push() { _pushes++; }
+ void note_pop() { _pops++; }
+ void note_steal() { _steals++; }
+ void note_steal_attempt() { _steal_attempts++; }
+ void note_overflow_push() { _overflow_pushes++; }
+#endif
+
+ void start_strong_roots() {
+ _start_strong_roots = os::elapsedTime();
+ }
+ void end_strong_roots() {
+ _strong_roots_time += (os::elapsedTime() - _start_strong_roots);
+ }
+ double strong_roots_time() { return _strong_roots_time; }
+
+ void start_term_time() {
+ note_term_attempt();
+ _start_term = os::elapsedTime();
+ }
+ void end_term_time() {
+ _term_time += (os::elapsedTime() - _start_term);
+ }
+ double term_time() { return _term_time; }
+
+ double elapsed() {
+ return os::elapsedTime() - _start;
+ }
+
+ size_t* surviving_young_words() {
+ // We add on to hide entry 0 which accumulates surviving words for
+ // age -1 regions (i.e. non-young ones)
+ return _surviving_young_words;
+ }
+
+ void retire_alloc_buffers() {
+ for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
+ size_t waste = _alloc_buffers[ap].words_remaining();
+ add_to_alloc_buffer_waste(waste);
+ _alloc_buffers[ap].retire(true, false);
+ }
+ }
+
+private:
+ template <class T> void deal_with_reference(T* ref_to_scan) {
+ if (has_partial_array_mask(ref_to_scan)) {
+ _partial_scan_cl->do_oop_nv(ref_to_scan);
+ } else {
+ // Note: we can use "raw" versions of "region_containing" because
+ // "obj_to_scan" is definitely in the heap, and is not in a
+ // humongous region.
+ HeapRegion* r = _g1h->heap_region_containing_raw(ref_to_scan);
+ _evac_cl->set_region(r);
+ _evac_cl->do_oop_nv(ref_to_scan);
+ }
+ }
+
+public:
+ void trim_queue() {
+ // I've replicated the loop twice, first to drain the overflow
+ // queue, second to drain the task queue. This is better than
+ // having a single loop, which checks both conditions and, inside
+ // it, either pops the overflow queue or the task queue, as each
+ // loop is tighter. Also, the decision to drain the overflow queue
+ // first is not arbitrary, as the overflow queue is not visible
+ // to the other workers, whereas the task queue is. So, we want to
+ // drain the "invisible" entries first, while allowing the other
+ // workers to potentially steal the "visible" entries.
+
+ while (refs_to_scan() > 0 || overflowed_refs_to_scan() > 0) {
+ while (overflowed_refs_to_scan() > 0) {
+ StarTask ref_to_scan;
+ assert((oop*)ref_to_scan == NULL, "Constructed above");
+ pop_from_overflow_queue(ref_to_scan);
+ // We shouldn't have pushed it on the queue if it was not
+ // pointing into the CSet.
+ assert((oop*)ref_to_scan != NULL, "Follows from inner loop invariant");
+ if (ref_to_scan.is_narrow()) {
+ assert(UseCompressedOops, "Error");
+ narrowOop* p = (narrowOop*)ref_to_scan;
+ assert(!has_partial_array_mask(p) &&
+ _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+ deal_with_reference(p);
+ } else {
+ oop* p = (oop*)ref_to_scan;
+ assert((has_partial_array_mask(p) && _g1h->obj_in_cs(clear_partial_array_mask(p))) ||
+ _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+ deal_with_reference(p);
+ }
+ }
+
+ while (refs_to_scan() > 0) {
+ StarTask ref_to_scan;
+ assert((oop*)ref_to_scan == NULL, "Constructed above");
+ pop_from_queue(ref_to_scan);
+ if ((oop*)ref_to_scan != NULL) {
+ if (ref_to_scan.is_narrow()) {
+ assert(UseCompressedOops, "Error");
+ narrowOop* p = (narrowOop*)ref_to_scan;
+ assert(!has_partial_array_mask(p) &&
+ _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+ deal_with_reference(p);
+ } else {
+ oop* p = (oop*)ref_to_scan;
+ assert((has_partial_array_mask(p) && _g1h->obj_in_cs(clear_partial_array_mask(p))) ||
+ _g1h->obj_in_cs(oopDesc::load_decode_heap_oop(p)), "sanity");
+ deal_with_reference(p);
+ }
+ }
+ }
+ }
+ }
+};
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -293,10 +293,6 @@
if (G1SteadyStateUsed < 50) {
vm_exit_during_initialization("G1SteadyStateUsed must be at least 50%.");
}
- if (UseConcMarkSweepGC) {
- vm_exit_during_initialization("-XX:+UseG1GC is incompatible with "
- "-XX:+UseConcMarkSweepGC.");
- }
initialize_gc_policy_counters();
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1097,6 +1097,10 @@
_recorded_survivor_tail = tail;
}
+ size_t recorded_survivor_regions() {
+ return _recorded_survivor_regions;
+ }
+
void record_thread_age_table(ageTable* age_table)
{
_survivors_age_table.merge_par(age_table);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -42,18 +42,6 @@
virtual void set_region(HeapRegion* from) { _from = from; }
};
-
-class G1ScanAndBalanceClosure : public OopClosure {
- G1CollectedHeap* _g1;
- static int _nq;
-public:
- G1ScanAndBalanceClosure(G1CollectedHeap* g1) : _g1(g1) { }
- inline void do_oop_nv(oop* p);
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p) { guarantee(false, "NYI"); }
-};
-
class G1ParClosureSuper : public OopsInHeapRegionClosure {
protected:
G1CollectedHeap* _g1;
@@ -69,34 +57,32 @@
public:
G1ParScanClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
G1ParClosureSuper(g1, par_scan_state) { }
- void do_oop_nv(oop* p); // should be made inline
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
};
-#define G1_PARTIAL_ARRAY_MASK 1
+#define G1_PARTIAL_ARRAY_MASK 0x2
-inline bool has_partial_array_mask(oop* ref) {
- return (intptr_t) ref & G1_PARTIAL_ARRAY_MASK;
+template <class T> inline bool has_partial_array_mask(T* ref) {
+ return ((uintptr_t)ref & G1_PARTIAL_ARRAY_MASK) == G1_PARTIAL_ARRAY_MASK;
}
-inline oop* set_partial_array_mask(oop obj) {
- return (oop*) ((intptr_t) obj | G1_PARTIAL_ARRAY_MASK);
+template <class T> inline T* set_partial_array_mask(T obj) {
+ assert(((uintptr_t)obj & G1_PARTIAL_ARRAY_MASK) == 0, "Information loss!");
+ return (T*) ((uintptr_t)obj | G1_PARTIAL_ARRAY_MASK);
}
-inline oop clear_partial_array_mask(oop* ref) {
- return oop((intptr_t) ref & ~G1_PARTIAL_ARRAY_MASK);
+template <class T> inline oop clear_partial_array_mask(T* ref) {
+ return oop((intptr_t)ref & ~G1_PARTIAL_ARRAY_MASK);
}
class G1ParScanPartialArrayClosure : public G1ParClosureSuper {
G1ParScanClosure _scanner;
- template <class T> void process_array_chunk(oop obj, int start, int end);
public:
G1ParScanPartialArrayClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
G1ParClosureSuper(g1, par_scan_state), _scanner(g1, par_scan_state) { }
- void do_oop_nv(oop* p);
- void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_nv(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
};
@@ -105,7 +91,7 @@
class G1ParCopyHelper : public G1ParClosureSuper {
G1ParScanClosure *_scanner;
protected:
- void mark_forwardee(oop* p);
+ template <class T> void mark_forwardee(T* p);
oop copy_to_survivor_space(oop obj);
public:
G1ParCopyHelper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state,
@@ -117,36 +103,35 @@
bool do_mark_forwardee, bool skip_cset_test>
class G1ParCopyClosure : public G1ParCopyHelper {
G1ParScanClosure _scanner;
- void do_oop_work(oop* p);
- void do_oop_work(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_work(T* p);
public:
G1ParCopyClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
_scanner(g1, par_scan_state), G1ParCopyHelper(g1, par_scan_state, &_scanner) { }
- inline void do_oop_nv(oop* p) {
+ template <class T> void do_oop_nv(T* p) {
do_oop_work(p);
if (do_mark_forwardee)
mark_forwardee(p);
}
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
};
typedef G1ParCopyClosure<false, G1BarrierNone, false, false> G1ParScanExtRootClosure;
typedef G1ParCopyClosure<true, G1BarrierNone, false, false> G1ParScanPermClosure;
+typedef G1ParCopyClosure<false, G1BarrierRS, false, false> G1ParScanHeapRSClosure;
typedef G1ParCopyClosure<false, G1BarrierNone, true, false> G1ParScanAndMarkExtRootClosure;
typedef G1ParCopyClosure<true, G1BarrierNone, true, false> G1ParScanAndMarkPermClosure;
-typedef G1ParCopyClosure<false, G1BarrierRS, false, false> G1ParScanHeapRSClosure;
typedef G1ParCopyClosure<false, G1BarrierRS, true, false> G1ParScanAndMarkHeapRSClosure;
// This is the only case when we set skip_cset_test. Basically, this
// closure is (should?) only be called directly while we're draining
// the overflow and task queues. In that case we know that the
// reference in question points into the collection set, otherwise we
-// would not have pushed it on the queue.
-typedef G1ParCopyClosure<false, G1BarrierEvac, false, true> G1ParScanHeapEvacClosure;
+// would not have pushed it on the queue. The following is defined in
+// g1_specialized_oop_closures.hpp.
+// typedef G1ParCopyClosure<false, G1BarrierEvac, false, true> G1ParScanHeapEvacClosure;
// We need a separate closure to handle references during evacuation
-// failure processing, as it cannot asume that the reference already
- // points to the collection set (like G1ParScanHeapEvacClosure does).
+// failure processing, as we cannot asume that the reference already
+// points into the collection set (like G1ParScanHeapEvacClosure does).
typedef G1ParCopyClosure<false, G1BarrierEvac, false, false> G1ParScanHeapEvacFailureClosure;
class FilterIntoCSClosure: public OopClosure {
@@ -158,10 +143,9 @@
G1CollectedHeap* g1, OopClosure* oc) :
_dcto_cl(dcto_cl), _g1(g1), _oc(oc)
{}
- inline void do_oop_nv(oop* p);
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
bool apply_to_weak_ref_discovered_field() { return true; }
bool do_header() { return false; }
};
@@ -174,10 +158,9 @@
OopsInHeapRegionClosure* oc) :
_g1(g1), _oc(oc)
{}
- inline void do_oop_nv(oop* p);
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
bool apply_to_weak_ref_discovered_field() { return true; }
bool do_header() { return false; }
void set_region(HeapRegion* from) {
@@ -195,10 +178,9 @@
ConcurrentMark* cm)
: _g1(g1), _oc(oc), _cm(cm) { }
- inline void do_oop_nv(oop* p);
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
bool apply_to_weak_ref_discovered_field() { return true; }
bool do_header() { return false; }
void set_region(HeapRegion* from) {
@@ -213,10 +195,9 @@
int _out_of_region;
public:
FilterOutOfRegionClosure(HeapRegion* r, OopClosure* oc);
- inline void do_oop_nv(oop* p);
- inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
- virtual void do_oop(oop* p);
- virtual void do_oop(narrowOop* p) { guarantee(false, "NYI"); }
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
bool apply_to_weak_ref_discovered_field() { return true; }
bool do_header() { return false; }
int out_of_region() { return _out_of_region; }
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -31,9 +31,10 @@
// perf-critical inner loop.
#define FILTERINTOCSCLOSURE_DOHISTOGRAMCOUNT 0
-inline void FilterIntoCSClosure::do_oop_nv(oop* p) {
- oop obj = *p;
- if (obj != NULL && _g1->obj_in_cs(obj)) {
+template <class T> inline void FilterIntoCSClosure::do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop) &&
+ _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop))) {
_oc->do_oop(p);
#if FILTERINTOCSCLOSURE_DOHISTOGRAMCOUNT
_dcto_cl->incr_count();
@@ -41,44 +42,32 @@
}
}
-inline void FilterIntoCSClosure::do_oop(oop* p)
-{
- do_oop_nv(p);
-}
-
#define FILTEROUTOFREGIONCLOSURE_DOHISTOGRAMCOUNT 0
-inline void FilterOutOfRegionClosure::do_oop_nv(oop* p) {
- oop obj = *p;
- HeapWord* obj_hw = (HeapWord*)obj;
- if (obj_hw != NULL && (obj_hw < _r_bottom || obj_hw >= _r_end)) {
- _oc->do_oop(p);
+template <class T> inline void FilterOutOfRegionClosure::do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ HeapWord* obj_hw = (HeapWord*)oopDesc::decode_heap_oop_not_null(heap_oop);
+ if (obj_hw < _r_bottom || obj_hw >= _r_end) {
+ _oc->do_oop(p);
#if FILTEROUTOFREGIONCLOSURE_DOHISTOGRAMCOUNT
- _out_of_region++;
+ _out_of_region++;
#endif
+ }
}
}
-inline void FilterOutOfRegionClosure::do_oop(oop* p)
-{
- do_oop_nv(p);
-}
-
-inline void FilterInHeapRegionAndIntoCSClosure::do_oop_nv(oop* p) {
- oop obj = *p;
- if (obj != NULL && _g1->obj_in_cs(obj))
+template <class T> inline void FilterInHeapRegionAndIntoCSClosure::do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop) &&
+ _g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop)))
_oc->do_oop(p);
}
-inline void FilterInHeapRegionAndIntoCSClosure::do_oop(oop* p)
-{
- do_oop_nv(p);
-}
-
-
-inline void FilterAndMarkInHeapRegionAndIntoCSClosure::do_oop_nv(oop* p) {
- oop obj = *p;
- if (obj != NULL) {
+template <class T> inline void FilterAndMarkInHeapRegionAndIntoCSClosure::do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
HeapRegion* hr = _g1->heap_region_containing((HeapWord*) obj);
if (hr != NULL) {
if (hr->in_collection_set())
@@ -89,24 +78,29 @@
}
}
-inline void FilterAndMarkInHeapRegionAndIntoCSClosure::do_oop(oop* p)
-{
- do_oop_nv(p);
-}
+// This closure is applied to the fields of the objects that have just been copied.
+template <class T> inline void G1ParScanClosure::do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
-inline void G1ScanAndBalanceClosure::do_oop_nv(oop* p) {
- RefToScanQueue* q;
- if (ParallelGCThreads > 0) {
- // Deal the work out equally.
- _nq = (_nq + 1) % ParallelGCThreads;
- q = _g1->task_queue(_nq);
- } else {
- q = _g1->task_queue(0);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ if (_g1->in_cset_fast_test(obj)) {
+ // We're not going to even bother checking whether the object is
+ // already forwarded or not, as this usually causes an immediate
+ // stall. We'll try to prefetch the object (for write, given that
+ // we might need to install the forwarding reference) and we'll
+ // get back to it when pop it from the queue
+ Prefetch::write(obj->mark_addr(), 0);
+ Prefetch::read(obj->mark_addr(), (HeapWordSize*2));
+
+ // slightly paranoid test; I'm trying to catch potential
+ // problems before we go into push_on_queue to know where the
+ // problem is coming from
+ assert(obj == oopDesc::load_decode_heap_oop(p),
+ "p should still be pointing to obj");
+ _par_scan_state->push_on_queue(p);
+ } else {
+ _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
+ }
}
- bool nooverflow = q->push(p);
- guarantee(nooverflow, "Overflow during poplularity region processing");
}
-
-inline void G1ScanAndBalanceClosure::do_oop(oop* p) {
- do_oop_nv(p);
-}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -65,11 +65,10 @@
void set_region(HeapRegion* from) {
_blk->set_region(from);
}
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- virtual void do_oop(oop* p) {
- oop obj = *p;
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+ template <class T> void do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
if (_g1->obj_in_cs(obj)) _blk->do_oop(p);
}
bool apply_to_weak_ref_discovered_field() { return true; }
@@ -110,11 +109,10 @@
public:
VerifyRSCleanCardOopClosure(G1CollectedHeap* g1) : _g1(g1) {}
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- virtual void do_oop(oop* p) {
- oop obj = *p;
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+ template <class T> void do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
HeapRegion* to = _g1->heap_region_containing(obj);
guarantee(to == NULL || !to->in_collection_set(),
"Missed a rem set member.");
@@ -129,9 +127,9 @@
{
_seq_task = new SubTasksDone(NumSeqTasks);
guarantee(n_workers() > 0, "There should be some workers");
- _new_refs = NEW_C_HEAP_ARRAY(GrowableArray<oop*>*, n_workers());
+ _new_refs = NEW_C_HEAP_ARRAY(GrowableArray<OopOrNarrowOopStar>*, n_workers());
for (uint i = 0; i < n_workers(); i++) {
- _new_refs[i] = new (ResourceObj::C_HEAP) GrowableArray<oop*>(8192,true);
+ _new_refs[i] = new (ResourceObj::C_HEAP) GrowableArray<OopOrNarrowOopStar>(8192,true);
}
}
@@ -140,7 +138,7 @@
for (uint i = 0; i < n_workers(); i++) {
delete _new_refs[i];
}
- FREE_C_HEAP_ARRAY(GrowableArray<oop*>*, _new_refs);
+ FREE_C_HEAP_ARRAY(GrowableArray<OopOrNarrowOopStar>*, _new_refs);
}
void CountNonCleanMemRegionClosure::do_MemRegion(MemRegion mr) {
@@ -428,15 +426,15 @@
}
};
-void
-HRInto_G1RemSet::scanNewRefsRS(OopsInHeapRegionClosure* oc,
- int worker_i) {
+template <class T> void
+HRInto_G1RemSet::scanNewRefsRS_work(OopsInHeapRegionClosure* oc,
+ int worker_i) {
double scan_new_refs_start_sec = os::elapsedTime();
G1CollectedHeap* g1h = G1CollectedHeap::heap();
CardTableModRefBS* ct_bs = (CardTableModRefBS*) (g1h->barrier_set());
for (int i = 0; i < _new_refs[worker_i]->length(); i++) {
- oop* p = _new_refs[worker_i]->at(i);
- oop obj = *p;
+ T* p = (T*) _new_refs[worker_i]->at(i);
+ oop obj = oopDesc::load_decode_heap_oop(p);
// *p was in the collection set when p was pushed on "_new_refs", but
// another thread may have processed this location from an RS, so it
// might not point into the CS any longer. If so, it's obviously been
@@ -549,11 +547,10 @@
G1CollectedHeap* _g1;
public:
UpdateRSetOopsIntoCSImmediate(G1CollectedHeap* g1) : _g1(g1) { }
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- virtual void do_oop(oop* p) {
- HeapRegion* to = _g1->heap_region_containing(*p);
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+ template <class T> void do_oop_work(T* p) {
+ HeapRegion* to = _g1->heap_region_containing(oopDesc::load_decode_heap_oop(p));
if (to->in_collection_set()) {
to->rem_set()->add_reference(p, 0);
}
@@ -567,11 +564,10 @@
public:
UpdateRSetOopsIntoCSDeferred(G1CollectedHeap* g1, DirtyCardQueue* dcq) :
_g1(g1), _ct_bs((CardTableModRefBS*)_g1->barrier_set()), _dcq(dcq) { }
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
- virtual void do_oop(oop* p) {
- oop obj = *p;
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
+ template <class T> void do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
if (_g1->obj_in_cs(obj)) {
size_t card_index = _ct_bs->index_for(p);
if (_ct_bs->mark_card_deferred(card_index)) {
@@ -581,10 +577,10 @@
}
};
-void HRInto_G1RemSet::new_refs_iterate(OopClosure* cl) {
+template <class T> void HRInto_G1RemSet::new_refs_iterate_work(OopClosure* cl) {
for (size_t i = 0; i < n_workers(); i++) {
for (int j = 0; j < _new_refs[i]->length(); j++) {
- oop* p = _new_refs[i]->at(j);
+ T* p = (T*) _new_refs[i]->at(j);
cl->do_oop(p);
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -62,10 +62,12 @@
// If "this" is of the given subtype, return "this", else "NULL".
virtual HRInto_G1RemSet* as_HRInto_G1RemSet() { return NULL; }
- // Record, if necessary, the fact that *p (where "p" is in region "from")
- // has changed to its new value.
+ // Record, if necessary, the fact that *p (where "p" is in region "from",
+ // and is, a fortiori, required to be non-NULL) has changed to its new value.
virtual void write_ref(HeapRegion* from, oop* p) = 0;
+ virtual void write_ref(HeapRegion* from, narrowOop* p) = 0;
virtual void par_write_ref(HeapRegion* from, oop* p, int tid) = 0;
+ virtual void par_write_ref(HeapRegion* from, narrowOop* p, int tid) = 0;
// Requires "region_bm" and "card_bm" to be bitmaps with 1 bit per region
// or card, respectively, such that a region or card with a corresponding
@@ -105,7 +107,9 @@
// Nothing is necessary in the version below.
void write_ref(HeapRegion* from, oop* p) {}
+ void write_ref(HeapRegion* from, narrowOop* p) {}
void par_write_ref(HeapRegion* from, oop* p, int tid) {}
+ void par_write_ref(HeapRegion* from, narrowOop* p, int tid) {}
void scrub(BitMap* region_bm, BitMap* card_bm) {}
void scrub_par(BitMap* region_bm, BitMap* card_bm,
@@ -143,8 +147,19 @@
// their references into the collection summarized in "_new_refs".
bool _par_traversal_in_progress;
void set_par_traversal(bool b) { _par_traversal_in_progress = b; }
- GrowableArray<oop*>** _new_refs;
- void new_refs_iterate(OopClosure* cl);
+ GrowableArray<OopOrNarrowOopStar>** _new_refs;
+ template <class T> void new_refs_iterate_work(OopClosure* cl);
+ void new_refs_iterate(OopClosure* cl) {
+ if (UseCompressedOops) {
+ new_refs_iterate_work<narrowOop>(cl);
+ } else {
+ new_refs_iterate_work<oop>(cl);
+ }
+ }
+
+protected:
+ template <class T> void write_ref_nv(HeapRegion* from, T* p);
+ template <class T> void par_write_ref_nv(HeapRegion* from, T* p, int tid);
public:
// This is called to reset dual hash tables after the gc pause
@@ -161,7 +176,14 @@
void prepare_for_oops_into_collection_set_do();
void cleanup_after_oops_into_collection_set_do();
void scanRS(OopsInHeapRegionClosure* oc, int worker_i);
- void scanNewRefsRS(OopsInHeapRegionClosure* oc, int worker_i);
+ template <class T> void scanNewRefsRS_work(OopsInHeapRegionClosure* oc, int worker_i);
+ void scanNewRefsRS(OopsInHeapRegionClosure* oc, int worker_i) {
+ if (UseCompressedOops) {
+ scanNewRefsRS_work<narrowOop>(oc, worker_i);
+ } else {
+ scanNewRefsRS_work<oop>(oc, worker_i);
+ }
+ }
void updateRS(int worker_i);
HeapRegion* calculateStartRegion(int i);
@@ -172,12 +194,22 @@
// Record, if necessary, the fact that *p (where "p" is in region "from",
// which is required to be non-NULL) has changed to a new non-NULL value.
- inline void write_ref(HeapRegion* from, oop* p);
- // The "_nv" version is the same; it exists just so that it is not virtual.
- inline void write_ref_nv(HeapRegion* from, oop* p);
+ // [Below the virtual version calls a non-virtual protected
+ // workhorse that is templatified for narrow vs wide oop.]
+ inline void write_ref(HeapRegion* from, oop* p) {
+ write_ref_nv(from, p);
+ }
+ inline void write_ref(HeapRegion* from, narrowOop* p) {
+ write_ref_nv(from, p);
+ }
+ inline void par_write_ref(HeapRegion* from, oop* p, int tid) {
+ par_write_ref_nv(from, p, tid);
+ }
+ inline void par_write_ref(HeapRegion* from, narrowOop* p, int tid) {
+ par_write_ref_nv(from, p, tid);
+ }
- inline bool self_forwarded(oop obj);
- inline void par_write_ref(HeapRegion* from, oop* p, int tid);
+ bool self_forwarded(oop obj);
void scrub(BitMap* region_bm, BitMap* card_bm);
void scrub_par(BitMap* region_bm, BitMap* card_bm,
@@ -208,6 +240,9 @@
HeapRegion* _from;
HRInto_G1RemSet* _rs;
int _worker_i;
+
+ template <class T> void do_oop_work(T* p);
+
public:
UpdateRSOopClosure(HRInto_G1RemSet* rs, int worker_i = 0) :
_from(NULL), _rs(rs), _worker_i(worker_i) {
@@ -219,11 +254,10 @@
_from = from;
}
- virtual void do_oop(narrowOop* p);
- virtual void do_oop(oop* p);
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop(oop* p) { do_oop_work(p); }
// Override: this closure is idempotent.
// bool idempotent() { return true; }
bool apply_to_weak_ref_discovered_field() { return true; }
};
-
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,8 @@
}
}
-inline void HRInto_G1RemSet::write_ref_nv(HeapRegion* from, oop* p) {
- par_write_ref(from, p, 0);
-}
-
-inline void HRInto_G1RemSet::write_ref(HeapRegion* from, oop* p) {
- write_ref_nv(from, p);
+template <class T> inline void HRInto_G1RemSet::write_ref_nv(HeapRegion* from, T* p) {
+ par_write_ref_nv(from, p, 0);
}
inline bool HRInto_G1RemSet::self_forwarded(oop obj) {
@@ -43,8 +39,8 @@
return result;
}
-inline void HRInto_G1RemSet::par_write_ref(HeapRegion* from, oop* p, int tid) {
- oop obj = *p;
+template <class T> inline void HRInto_G1RemSet::par_write_ref_nv(HeapRegion* from, T* p, int tid) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
#ifdef ASSERT
// can't do because of races
// assert(obj == NULL || obj->is_oop(), "expected an oop");
@@ -71,7 +67,7 @@
// false during the evacuation failure handing.
if (_par_traversal_in_progress &&
to->in_collection_set() && !self_forwarded(obj)) {
- _new_refs[tid]->push(p);
+ _new_refs[tid]->push((void*)p);
// Deferred updates to the Cset are either discarded (in the normal case),
// or processed (if an evacuation failure occurs) at the end
// of the collection.
@@ -89,11 +85,7 @@
}
}
-inline void UpdateRSOopClosure::do_oop(narrowOop* p) {
- guarantee(false, "NYI");
-}
-
-inline void UpdateRSOopClosure::do_oop(oop* p) {
+template <class T> inline void UpdateRSOopClosure::do_oop_work(T* p) {
assert(_from != NULL, "from region must be non-NULL");
_rs->par_write_ref(_from, p, _worker_i);
}
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -34,6 +34,7 @@
void G1SATBCardTableModRefBS::enqueue(oop pre_val) {
+ assert(pre_val->is_oop_or_null(true), "Error");
if (!JavaThread::satb_mark_queue_set().active()) return;
Thread* thr = Thread::current();
if (thr->is_Java_thread()) {
@@ -46,32 +47,31 @@
}
// When we know the current java thread:
-void
-G1SATBCardTableModRefBS::write_ref_field_pre_static(void* field,
- oop newVal,
+template <class T> void
+G1SATBCardTableModRefBS::write_ref_field_pre_static(T* field,
+ oop new_val,
JavaThread* jt) {
if (!JavaThread::satb_mark_queue_set().active()) return;
- assert(!UseCompressedOops, "Else will need to modify this to deal with narrowOop");
- oop preVal = *(oop*)field;
- if (preVal != NULL) {
- jt->satb_mark_queue().enqueue(preVal);
+ T heap_oop = oopDesc::load_heap_oop(field);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop pre_val = oopDesc::decode_heap_oop_not_null(heap_oop);
+ assert(pre_val->is_oop(true /* ignore mark word */), "Error");
+ jt->satb_mark_queue().enqueue(pre_val);
}
}
-void
-G1SATBCardTableModRefBS::write_ref_array_pre(MemRegion mr) {
+template <class T> void
+G1SATBCardTableModRefBS::write_ref_array_pre_work(T* dst, int count) {
if (!JavaThread::satb_mark_queue_set().active()) return;
- assert(!UseCompressedOops, "Else will need to modify this to deal with narrowOop");
- oop* elem_ptr = (oop*)mr.start();
- while ((HeapWord*)elem_ptr < mr.end()) {
- oop elem = *elem_ptr;
- if (elem != NULL) enqueue(elem);
- elem_ptr++;
+ T* elem_ptr = dst;
+ for (int i = 0; i < count; i++, elem_ptr++) {
+ T heap_oop = oopDesc::load_heap_oop(elem_ptr);
+ if (!oopDesc::is_null(heap_oop)) {
+ enqueue(oopDesc::decode_heap_oop_not_null(heap_oop));
+ }
}
}
-
-
G1SATBCardTableLoggingModRefBS::
G1SATBCardTableLoggingModRefBS(MemRegion whole_heap,
int max_covered_regions) :
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -47,31 +47,41 @@
// This notes that we don't need to access any BarrierSet data
// structures, so this can be called from a static context.
- static void write_ref_field_pre_static(void* field, oop newVal) {
- assert(!UseCompressedOops, "Else needs to be templatized");
- oop preVal = *((oop*)field);
- if (preVal != NULL) {
- enqueue(preVal);
+ template <class T> static void write_ref_field_pre_static(T* field, oop newVal) {
+ T heap_oop = oopDesc::load_heap_oop(field);
+ if (!oopDesc::is_null(heap_oop)) {
+ enqueue(oopDesc::decode_heap_oop(heap_oop));
}
}
// When we know the current java thread:
- static void write_ref_field_pre_static(void* field, oop newVal,
- JavaThread* jt);
+ template <class T> static void write_ref_field_pre_static(T* field, oop newVal,
+ JavaThread* jt);
// We export this to make it available in cases where the static
// type of the barrier set is known. Note that it is non-virtual.
- inline void inline_write_ref_field_pre(void* field, oop newVal) {
+ template <class T> inline void inline_write_ref_field_pre(T* field, oop newVal) {
write_ref_field_pre_static(field, newVal);
}
- // This is the more general virtual version.
- void write_ref_field_pre_work(void* field, oop new_val) {
+ // These are the more general virtual versions.
+ virtual void write_ref_field_pre_work(oop* field, oop new_val) {
+ inline_write_ref_field_pre(field, new_val);
+ }
+ virtual void write_ref_field_pre_work(narrowOop* field, oop new_val) {
inline_write_ref_field_pre(field, new_val);
}
+ virtual void write_ref_field_pre_work(void* field, oop new_val) {
+ guarantee(false, "Not needed");
+ }
- virtual void write_ref_array_pre(MemRegion mr);
-
+ template <class T> void write_ref_array_pre_work(T* dst, int count);
+ virtual void write_ref_array_pre(oop* dst, int count) {
+ write_ref_array_pre_work(dst, count);
+ }
+ virtual void write_ref_array_pre(narrowOop* dst, int count) {
+ write_ref_array_pre_work(dst, count);
+ }
};
// Adds card-table logging to the post-barrier.
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -80,9 +80,6 @@
develop(bool, G1TraceConcurrentRefinement, false, \
"Trace G1 concurrent refinement") \
\
- develop(bool, G1ConcMark, true, \
- "If true, run concurrent marking for G1") \
- \
product(intx, G1MarkStackSize, 2 * 1024 * 1024, \
"Size of the mark stack for concurrent marking.") \
\
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -37,14 +37,12 @@
class G1ParCopyClosure;
class G1ParScanClosure;
-typedef G1ParCopyClosure<false, G1BarrierEvac, false, true>
- G1ParScanHeapEvacClosure;
+typedef G1ParCopyClosure<false, G1BarrierEvac, false, true> G1ParScanHeapEvacClosure;
class FilterIntoCSClosure;
class FilterOutOfRegionClosure;
class FilterInHeapRegionAndIntoCSClosure;
class FilterAndMarkInHeapRegionAndIntoCSClosure;
-class G1ScanAndBalanceClosure;
#ifdef FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES
#error "FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES already defined."
@@ -56,8 +54,7 @@
f(FilterIntoCSClosure,_nv) \
f(FilterOutOfRegionClosure,_nv) \
f(FilterInHeapRegionAndIntoCSClosure,_nv) \
- f(FilterAndMarkInHeapRegionAndIntoCSClosure,_nv) \
- f(G1ScanAndBalanceClosure,_nv)
+ f(FilterAndMarkInHeapRegionAndIntoCSClosure,_nv)
#ifdef FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES
#error "FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES already defined."
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,16 +66,16 @@
bool failures() { return _failures; }
int n_failures() { return _n_failures; }
- virtual void do_oop(narrowOop* p) {
- guarantee(false, "NYI");
- }
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+ virtual void do_oop( oop* p) { do_oop_work(p); }
- void do_oop(oop* p) {
+ template <class T> void do_oop_work(T* p) {
assert(_containing_obj != NULL, "Precondition");
assert(!_g1h->is_obj_dead_cond(_containing_obj, _use_prev_marking),
"Precondition");
- oop obj = *p;
- if (obj != NULL) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
bool failed = false;
if (!_g1h->is_in_closed_subset(obj) ||
_g1h->is_obj_dead_cond(obj, _use_prev_marking)) {
@@ -106,8 +106,8 @@
}
if (!_g1h->full_collection()) {
- HeapRegion* from = _g1h->heap_region_containing(p);
- HeapRegion* to = _g1h->heap_region_containing(*p);
+ HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
+ HeapRegion* to = _g1h->heap_region_containing(obj);
if (from != NULL && to != NULL &&
from != to &&
!to->isHumongous()) {
@@ -534,13 +534,13 @@
// Otherwise, find the obj that extends onto mr.start().
assert(cur <= mr.start()
- && (oop(cur)->klass() == NULL ||
+ && (oop(cur)->klass_or_null() == NULL ||
cur + oop(cur)->size() > mr.start()),
"postcondition of block_start");
oop obj;
while (cur < mr.end()) {
obj = oop(cur);
- if (obj->klass() == NULL) {
+ if (obj->klass_or_null() == NULL) {
// Ran into an unparseable point.
return cur;
} else if (!g1h->is_obj_dead(obj)) {
@@ -577,7 +577,7 @@
assert(cur <= mr.start(), "Postcondition");
while (cur <= mr.start()) {
- if (oop(cur)->klass() == NULL) {
+ if (oop(cur)->klass_or_null() == NULL) {
// Ran into an unparseable point.
return cur;
}
@@ -591,7 +591,7 @@
obj = oop(cur);
// If we finish this loop...
assert(cur <= mr.start()
- && obj->klass() != NULL
+ && obj->klass_or_null() != NULL
&& cur + obj->size() > mr.start(),
"Loop postcondition");
if (!g1h->is_obj_dead(obj)) {
@@ -601,7 +601,7 @@
HeapWord* next;
while (cur < mr.end()) {
obj = oop(cur);
- if (obj->klass() == NULL) {
+ if (obj->klass_or_null() == NULL) {
// Ran into an unparseable point.
return cur;
};
@@ -703,7 +703,7 @@
}
if (vl_cl.failures()) {
gclog_or_tty->print_cr("Heap:");
- G1CollectedHeap::heap()->print();
+ G1CollectedHeap::heap()->print_on(gclog_or_tty, true /* extended */);
gclog_or_tty->print_cr("");
}
if (VerifyDuringGC &&
@@ -781,8 +781,13 @@
// will pick up the right saved_mark_word() as the high water mark
// of the region. Either way, the behaviour will be correct.
ContiguousSpace::set_saved_mark();
+ OrderAccess::storestore();
_gc_time_stamp = curr_gc_time_stamp;
- OrderAccess::fence();
+ // The following fence is to force a flush of the writes above, but
+ // is strictly not needed because when an allocating worker thread
+ // calls set_saved_mark() it does so under the ParGCRareEvent_lock;
+ // when the lock is released, the write will be flushed.
+ // OrderAccess::fence();
}
}
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -126,7 +126,7 @@
}
}
- void add_reference_work(oop* from, bool par) {
+ void add_reference_work(OopOrNarrowOopStar from, bool par) {
// Must make this robust in case "from" is not in "_hr", because of
// concurrency.
@@ -173,11 +173,11 @@
_bm.clear();
}
- void add_reference(oop* from) {
+ void add_reference(OopOrNarrowOopStar from) {
add_reference_work(from, /*parallel*/ true);
}
- void seq_add_reference(oop* from) {
+ void seq_add_reference(OopOrNarrowOopStar from) {
add_reference_work(from, /*parallel*/ false);
}
@@ -220,7 +220,7 @@
}
// Requires "from" to be in "hr()".
- bool contains_reference(oop* from) const {
+ bool contains_reference(OopOrNarrowOopStar from) const {
assert(hr()->is_in_reserved(from), "Precondition.");
size_t card_ind = pointer_delta(from, hr()->bottom(),
CardTableModRefBS::card_size);
@@ -394,7 +394,7 @@
void set_next(PosParPRT* nxt) { _next = nxt; }
PosParPRT** next_addr() { return &_next; }
- void add_reference(oop* from, int tid) {
+ void add_reference(OopOrNarrowOopStar from, int tid) {
// Expand if necessary.
PerRegionTable** pt = par_tables();
if (par_tables() == NULL && tid > 0 && hr()->is_gc_alloc_region()) {
@@ -447,7 +447,7 @@
return res;
}
- bool contains_reference(oop* from) const {
+ bool contains_reference(OopOrNarrowOopStar from) const {
if (PerRegionTable::contains_reference(from)) return true;
if (_par_tables != NULL) {
for (int i = 0; i < HeapRegionRemSet::num_par_rem_sets()-1; i++) {
@@ -564,12 +564,15 @@
}
#endif
-void OtherRegionsTable::add_reference(oop* from, int tid) {
+void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
size_t cur_hrs_ind = hr()->hrs_index();
#if HRRS_VERBOSE
gclog_or_tty->print_cr("ORT::add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
- from, *from);
+ from,
+ UseCompressedOops
+ ? oopDesc::load_decode_heap_oop((narrowOop*)from)
+ : oopDesc::load_decode_heap_oop((oop*)from));
#endif
int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
@@ -1021,13 +1024,13 @@
}
}
-bool OtherRegionsTable::contains_reference(oop* from) const {
+bool OtherRegionsTable::contains_reference(OopOrNarrowOopStar from) const {
// Cast away const in this case.
MutexLockerEx x((Mutex*)&_m, Mutex::_no_safepoint_check_flag);
return contains_reference_locked(from);
}
-bool OtherRegionsTable::contains_reference_locked(oop* from) const {
+bool OtherRegionsTable::contains_reference_locked(OopOrNarrowOopStar from) const {
HeapRegion* hr = _g1h->heap_region_containing_raw(from);
if (hr == NULL) return false;
RegionIdx_t hr_ind = (RegionIdx_t) hr->hrs_index();
@@ -1288,24 +1291,24 @@
-oop** HeapRegionRemSet::_recorded_oops = NULL;
-HeapWord** HeapRegionRemSet::_recorded_cards = NULL;
-HeapRegion** HeapRegionRemSet::_recorded_regions = NULL;
-int HeapRegionRemSet::_n_recorded = 0;
+OopOrNarrowOopStar* HeapRegionRemSet::_recorded_oops = NULL;
+HeapWord** HeapRegionRemSet::_recorded_cards = NULL;
+HeapRegion** HeapRegionRemSet::_recorded_regions = NULL;
+int HeapRegionRemSet::_n_recorded = 0;
HeapRegionRemSet::Event* HeapRegionRemSet::_recorded_events = NULL;
int* HeapRegionRemSet::_recorded_event_index = NULL;
int HeapRegionRemSet::_n_recorded_events = 0;
-void HeapRegionRemSet::record(HeapRegion* hr, oop* f) {
+void HeapRegionRemSet::record(HeapRegion* hr, OopOrNarrowOopStar f) {
if (_recorded_oops == NULL) {
assert(_n_recorded == 0
&& _recorded_cards == NULL
&& _recorded_regions == NULL,
"Inv");
- _recorded_oops = NEW_C_HEAP_ARRAY(oop*, MaxRecorded);
- _recorded_cards = NEW_C_HEAP_ARRAY(HeapWord*, MaxRecorded);
- _recorded_regions = NEW_C_HEAP_ARRAY(HeapRegion*, MaxRecorded);
+ _recorded_oops = NEW_C_HEAP_ARRAY(OopOrNarrowOopStar, MaxRecorded);
+ _recorded_cards = NEW_C_HEAP_ARRAY(HeapWord*, MaxRecorded);
+ _recorded_regions = NEW_C_HEAP_ARRAY(HeapRegion*, MaxRecorded);
}
if (_n_recorded == MaxRecorded) {
gclog_or_tty->print_cr("Filled up 'recorded' (%d).", MaxRecorded);
@@ -1408,21 +1411,21 @@
HeapRegionRemSet* hrrs = hr0->rem_set();
// Make three references from region 0x101...
- hrrs->add_reference((oop*)hr1_start);
- hrrs->add_reference((oop*)hr1_mid);
- hrrs->add_reference((oop*)hr1_last);
+ hrrs->add_reference((OopOrNarrowOopStar)hr1_start);
+ hrrs->add_reference((OopOrNarrowOopStar)hr1_mid);
+ hrrs->add_reference((OopOrNarrowOopStar)hr1_last);
- hrrs->add_reference((oop*)hr2_start);
- hrrs->add_reference((oop*)hr2_mid);
- hrrs->add_reference((oop*)hr2_last);
+ hrrs->add_reference((OopOrNarrowOopStar)hr2_start);
+ hrrs->add_reference((OopOrNarrowOopStar)hr2_mid);
+ hrrs->add_reference((OopOrNarrowOopStar)hr2_last);
- hrrs->add_reference((oop*)hr3_start);
- hrrs->add_reference((oop*)hr3_mid);
- hrrs->add_reference((oop*)hr3_last);
+ hrrs->add_reference((OopOrNarrowOopStar)hr3_start);
+ hrrs->add_reference((OopOrNarrowOopStar)hr3_mid);
+ hrrs->add_reference((OopOrNarrowOopStar)hr3_last);
// Now cause a coarsening.
- hrrs->add_reference((oop*)hr4->bottom());
- hrrs->add_reference((oop*)hr5->bottom());
+ hrrs->add_reference((OopOrNarrowOopStar)hr4->bottom());
+ hrrs->add_reference((OopOrNarrowOopStar)hr5->bottom());
// Now, does iteration yield these three?
HeapRegionRemSetIterator iter;
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -116,9 +116,9 @@
// For now. Could "expand" some tables in the future, so that this made
// sense.
- void add_reference(oop* from, int tid);
+ void add_reference(OopOrNarrowOopStar from, int tid);
- void add_reference(oop* from) {
+ void add_reference(OopOrNarrowOopStar from) {
return add_reference(from, 0);
}
@@ -140,8 +140,8 @@
static size_t static_mem_size();
static size_t fl_mem_size();
- bool contains_reference(oop* from) const;
- bool contains_reference_locked(oop* from) const;
+ bool contains_reference(OopOrNarrowOopStar from) const;
+ bool contains_reference_locked(OopOrNarrowOopStar from) const;
void clear();
@@ -192,10 +192,10 @@
// Unused unless G1RecordHRRSOops is true.
static const int MaxRecorded = 1000000;
- static oop** _recorded_oops;
- static HeapWord** _recorded_cards;
- static HeapRegion** _recorded_regions;
- static int _n_recorded;
+ static OopOrNarrowOopStar* _recorded_oops;
+ static HeapWord** _recorded_cards;
+ static HeapRegion** _recorded_regions;
+ static int _n_recorded;
static const int MaxRecordedEvents = 1000;
static Event* _recorded_events;
@@ -231,13 +231,13 @@
/* Used in the sequential case. Returns "true" iff this addition causes
the size limit to be reached. */
- void add_reference(oop* from) {
+ void add_reference(OopOrNarrowOopStar from) {
_other_regions.add_reference(from);
}
/* Used in the parallel case. Returns "true" iff this addition causes
the size limit to be reached. */
- void add_reference(oop* from, int tid) {
+ void add_reference(OopOrNarrowOopStar from, int tid) {
_other_regions.add_reference(from, tid);
}
@@ -301,7 +301,7 @@
return OtherRegionsTable::fl_mem_size();
}
- bool contains_reference(oop* from) const {
+ bool contains_reference(OopOrNarrowOopStar from) const {
return _other_regions.contains_reference(from);
}
void print() const;
@@ -329,7 +329,7 @@
}
#endif
- static void record(HeapRegion* hr, oop* f);
+ static void record(HeapRegion* hr, OopOrNarrowOopStar f);
static void print_recorded();
static void record_event(Event evnt);
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/satbQueue.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -43,6 +43,18 @@
}
}
}
+
+#ifdef ASSERT
+void ObjPtrQueue::verify_oops_in_buffer() {
+ if (_buf == NULL) return;
+ for (size_t i = _index; i < _sz; i += oopSize) {
+ oop obj = (oop)_buf[byte_index_to_index((int)i)];
+ assert(obj != NULL && obj->is_oop(true /* ignore mark word */),
+ "Not an oop");
+ }
+}
+#endif
+
#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif // _MSC_VER
@@ -66,6 +78,7 @@
void SATBMarkQueueSet::handle_zero_index_for_thread(JavaThread* t) {
+ DEBUG_ONLY(t->satb_mark_queue().verify_oops_in_buffer();)
t->satb_mark_queue().handle_zero_index();
}
@@ -143,7 +156,7 @@
}
_completed_buffers_tail = NULL;
_n_completed_buffers = 0;
- debug_only(assert_completed_buffer_list_len_correct_locked());
+ DEBUG_ONLY(assert_completed_buffer_list_len_correct_locked());
}
while (buffers_to_delete != NULL) {
CompletedBufferNode* nd = buffers_to_delete;
--- a/hotspot/src/share/vm/gc_implementation/g1/satbQueue.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/satbQueue.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -39,6 +39,7 @@
static void apply_closure_to_buffer(ObjectClosure* cl,
void** buf, size_t index, size_t sz);
+ void verify_oops_in_buffer() NOT_DEBUG_RETURN;
};
--- a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1 Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1 Thu Jul 30 12:25:39 2009 -0700
@@ -27,6 +27,7 @@
bufferingOopClosure.hpp genOopClosures.hpp
bufferingOopClosure.hpp generation.hpp
bufferingOopClosure.hpp os.hpp
+bufferingOopClosure.hpp taskqueue.hpp
cardTableRS.cpp concurrentMark.hpp
cardTableRS.cpp g1SATBCardTableModRefBS.hpp
@@ -139,7 +140,7 @@
g1CollectedHeap.cpp g1CollectedHeap.inline.hpp
g1CollectedHeap.cpp g1CollectorPolicy.hpp
g1CollectedHeap.cpp g1MarkSweep.hpp
-g1CollectedHeap.cpp g1RemSet.hpp
+g1CollectedHeap.cpp g1RemSet.inline.hpp
g1CollectedHeap.cpp g1OopClosures.inline.hpp
g1CollectedHeap.cpp genOopClosures.inline.hpp
g1CollectedHeap.cpp gcLocker.inline.hpp
@@ -151,13 +152,14 @@
g1CollectedHeap.cpp isGCActiveMark.hpp
g1CollectedHeap.cpp oop.inline.hpp
g1CollectedHeap.cpp oop.pcgc.inline.hpp
-g1CollectedHeap.cpp parGCAllocBuffer.hpp
g1CollectedHeap.cpp vm_operations_g1.hpp
g1CollectedHeap.cpp vmThread.hpp
g1CollectedHeap.hpp barrierSet.hpp
+g1CollectedHeap.hpp g1RemSet.hpp
g1CollectedHeap.hpp heapRegion.hpp
g1CollectedHeap.hpp memRegion.hpp
+g1CollectedHeap.hpp parGCAllocBuffer.hpp
g1CollectedHeap.hpp sharedHeap.hpp
g1CollectedHeap.inline.hpp concurrentMark.hpp
@@ -245,6 +247,7 @@
g1RemSet.cpp iterator.hpp
g1RemSet.cpp oop.inline.hpp
+g1RemSet.inline.hpp oop.inline.hpp
g1RemSet.inline.hpp g1RemSet.hpp
g1RemSet.inline.hpp heapRegionRemSet.hpp
@@ -255,6 +258,7 @@
g1SATBCardTableModRefBS.cpp thread_<os_family>.inline.hpp
g1SATBCardTableModRefBS.cpp satbQueue.hpp
+g1SATBCardTableModRefBS.hpp oop.inline.hpp
g1SATBCardTableModRefBS.hpp cardTableModRefBS.hpp
g1SATBCardTableModRefBS.hpp memRegion.hpp
--- a/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -31,9 +31,10 @@
bool clear,
int n_threads) {
if (n_threads > 0) {
- assert(n_threads == (int)ParallelGCThreads, "# worker threads != # requested!");
-
- // Make sure the LNC array is valid for the space.
+ assert((n_threads == 1 && ParallelGCThreads == 0) ||
+ n_threads <= (int)ParallelGCThreads,
+ "# worker threads != # requested!");
+ // Make sure the LNC array is valid for the space.
jbyte** lowest_non_clean;
uintptr_t lowest_non_clean_base_chunk_index;
size_t lowest_non_clean_chunk_size;
--- a/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -885,7 +885,7 @@
}
-void ParallelScavengeHeap::verify(bool allow_dirty, bool silent) {
+void ParallelScavengeHeap::verify(bool allow_dirty, bool silent, bool option /* ignored */) {
// Why do we need the total_collections()-filter below?
if (total_collections() > 0) {
if (!silent) {
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -217,7 +217,7 @@
virtual void gc_threads_do(ThreadClosure* tc) const;
virtual void print_tracing_info() const;
- void verify(bool allow_dirty, bool silent);
+ void verify(bool allow_dirty, bool silent, bool /* option */);
void print_heap_change(size_t prev_used);
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -117,6 +117,7 @@
process_array_chunk(old);
} else {
if (p.is_narrow()) {
+ assert(UseCompressedOops, "Error");
PSScavenge::copy_and_push_safe_barrier(this, (narrowOop*)p);
} else {
PSScavenge::copy_and_push_safe_barrier(this, (oop*)p);
--- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -533,7 +533,7 @@
virtual void print_tracing_info() const = 0;
// Heap verification
- virtual void verify(bool allow_dirty, bool silent) = 0;
+ virtual void verify(bool allow_dirty, bool silent, bool option) = 0;
// Non product verification and debugging.
#ifndef PRODUCT
--- a/hotspot/src/share/vm/gc_interface/gcCause.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/gc_interface/gcCause.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/includeDB_compiler1 Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/includeDB_compiler1 Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
//
-// Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+// Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/includeDB_core Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/includeDB_core Thu Jul 30 12:25:39 2009 -0700
@@ -554,7 +554,6 @@
ciEnv.cpp linkResolver.hpp
ciEnv.cpp methodDataOop.hpp
ciEnv.cpp objArrayKlass.hpp
-ciEnv.cpp oop.hpp
ciEnv.cpp oop.inline.hpp
ciEnv.cpp oop.inline2.hpp
ciEnv.cpp oopFactory.hpp
@@ -785,7 +784,6 @@
ciSignature.cpp allocation.inline.hpp
ciSignature.cpp ciSignature.hpp
ciSignature.cpp ciUtilities.hpp
-ciSignature.cpp oop.hpp
ciSignature.cpp oop.inline.hpp
ciSignature.cpp signature.hpp
@@ -950,7 +948,6 @@
classify.cpp classify.hpp
classify.cpp systemDictionary.hpp
-classify.hpp oop.hpp
classify.hpp oop.inline.hpp
codeBlob.cpp allocation.inline.hpp
@@ -1185,7 +1182,6 @@
compilerOracle.cpp jniHandles.hpp
compilerOracle.cpp klass.hpp
compilerOracle.cpp methodOop.hpp
-compilerOracle.cpp oop.hpp
compilerOracle.cpp oop.inline.hpp
compilerOracle.cpp oopFactory.hpp
compilerOracle.cpp resourceArea.hpp
@@ -1629,7 +1625,6 @@
frame.cpp methodOop.hpp
frame.cpp monitorChunk.hpp
frame.cpp nativeInst_<arch>.hpp
-frame.cpp oop.hpp
frame.cpp oop.inline.hpp
frame.cpp oop.inline2.hpp
frame.cpp oopMapCache.hpp
@@ -1797,7 +1792,6 @@
generation.cpp generation.hpp
generation.cpp generation.inline.hpp
generation.cpp java.hpp
-generation.cpp oop.hpp
generation.cpp oop.inline.hpp
generation.cpp spaceDecorator.hpp
generation.cpp space.inline.hpp
@@ -2270,7 +2264,6 @@
java.cpp memprofiler.hpp
java.cpp methodOop.hpp
java.cpp objArrayOop.hpp
-java.cpp oop.hpp
java.cpp oop.inline.hpp
java.cpp oopFactory.hpp
java.cpp sharedRuntime.hpp
@@ -2947,7 +2940,7 @@
nativeInst_<arch>.cpp assembler_<arch>.inline.hpp
nativeInst_<arch>.cpp handles.hpp
nativeInst_<arch>.cpp nativeInst_<arch>.hpp
-nativeInst_<arch>.cpp oop.hpp
+nativeInst_<arch>.cpp oop.inline.hpp
nativeInst_<arch>.cpp ostream.hpp
nativeInst_<arch>.cpp resourceArea.hpp
nativeInst_<arch>.cpp sharedRuntime.hpp
@@ -3842,7 +3835,7 @@
stackValue.cpp debugInfo.hpp
stackValue.cpp frame.inline.hpp
stackValue.cpp handles.inline.hpp
-stackValue.cpp oop.hpp
+stackValue.cpp oop.inline.hpp
stackValue.cpp stackValue.hpp
stackValue.hpp handles.hpp
@@ -4329,7 +4322,6 @@
unhandledOops.cpp collectedHeap.hpp
unhandledOops.cpp gcLocker.inline.hpp
unhandledOops.cpp globalDefinitions.hpp
-unhandledOops.cpp oop.hpp
unhandledOops.cpp oop.inline.hpp
unhandledOops.cpp thread.hpp
unhandledOops.cpp unhandledOops.hpp
@@ -4465,7 +4457,6 @@
vframe.cpp nmethod.hpp
vframe.cpp objectMonitor.hpp
vframe.cpp objectMonitor.inline.hpp
-vframe.cpp oop.hpp
vframe.cpp oop.inline.hpp
vframe.cpp oopMapCache.hpp
vframe.cpp pcDesc.hpp
@@ -4577,7 +4568,6 @@
vmThread.cpp interfaceSupport.hpp
vmThread.cpp methodOop.hpp
vmThread.cpp mutexLocker.hpp
-vmThread.cpp oop.hpp
vmThread.cpp oop.inline.hpp
vmThread.cpp os.hpp
vmThread.cpp resourceArea.hpp
--- a/hotspot/src/share/vm/includeDB_features Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/includeDB_features Thu Jul 30 12:25:39 2009 -0700
@@ -47,7 +47,7 @@
dump.cpp javaClasses.hpp
dump.cpp loaderConstraints.hpp
dump.cpp methodDataOop.hpp
-dump.cpp oop.hpp
+dump.cpp oop.inline.hpp
dump.cpp oopFactory.hpp
dump.cpp resourceArea.hpp
dump.cpp signature.hpp
@@ -237,7 +237,7 @@
serialize.cpp compiledICHolderOop.hpp
serialize.cpp methodDataOop.hpp
serialize.cpp objArrayOop.hpp
-serialize.cpp oop.hpp
+serialize.cpp oop.inline.hpp
serialize.cpp symbolTable.hpp
serialize.cpp systemDictionary.hpp
@@ -295,7 +295,7 @@
vmStructs.cpp objArrayKlass.hpp
vmStructs.cpp objArrayKlassKlass.hpp
vmStructs.cpp objArrayOop.hpp
-vmStructs.cpp oop.hpp
+vmStructs.cpp oop.inline.hpp
vmStructs.cpp oopMap.hpp
vmStructs.cpp pcDesc.hpp
vmStructs.cpp perfMemory.hpp
--- a/hotspot/src/share/vm/includeDB_jvmti Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/includeDB_jvmti Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
//
-// Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+// Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/bytecode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/bytecode.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecode.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/bytecodeStream.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecodeStream.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/bytecodes.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecodes.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/bytecodes.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/bytecodes.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/invocationCounter.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/invocationCounter.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -273,6 +273,7 @@
compute_index_maps();
if (RegisterFinalizersAtInit && _klass->name() == vmSymbols::java_lang_Object()) {
+ bool did_rewrite = false;
int i = _methods->length();
while (i-- > 0) {
methodOop method = (methodOop)_methods->obj_at(i);
@@ -281,9 +282,11 @@
// object for finalization if needed.
methodHandle m(THREAD, method);
rewrite_Object_init(m, CHECK);
+ did_rewrite = true;
break;
}
}
+ assert(did_rewrite, "must find Object::<init> to rewrite it");
}
// rewrite methods, in two passes
--- a/hotspot/src/share/vm/interpreter/rewriter.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/rewriter.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/templateTable.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/templateTable.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/interpreter/templateTable.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/interpreter/templateTable.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/memory/barrierSet.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/barrierSet.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -25,12 +25,27 @@
# include "incls/_precompiled.incl"
# include "incls/_barrierSet.cpp.incl"
-// count is in HeapWord's
+// count is number of array elements being written
void BarrierSet::static_write_ref_array_pre(HeapWord* start, size_t count) {
- Universe::heap()->barrier_set()->write_ref_array_pre(MemRegion(start, start + count));
+ assert(count <= (size_t)max_intx, "count too large");
+#if 0
+ warning("Pre: \t" INTPTR_FORMAT "[" SIZE_FORMAT "]\t",
+ start, count);
+#endif
+ if (UseCompressedOops) {
+ Universe::heap()->barrier_set()->write_ref_array_pre((narrowOop*)start, (int)count);
+ } else {
+ Universe::heap()->barrier_set()->write_ref_array_pre( (oop*)start, (int)count);
+ }
}
-// count is in HeapWord's
+// count is number of array elements being written
void BarrierSet::static_write_ref_array_post(HeapWord* start, size_t count) {
- Universe::heap()->barrier_set()->write_ref_array_work(MemRegion(start, start + count));
+ assert(count <= (size_t)max_intx, "count too large");
+ HeapWord* end = start + objArrayOopDesc::array_size((int)count);
+#if 0
+ warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t",
+ start, count, start, end);
+#endif
+ Universe::heap()->barrier_set()->write_ref_array_work(MemRegion(start, end));
}
--- a/hotspot/src/share/vm/memory/barrierSet.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/barrierSet.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -81,9 +81,13 @@
// barrier types. Semantically, it should be thought of as a call to the
// virtual "_work" function below, which must implement the barrier.)
// First the pre-write versions...
- inline void write_ref_field_pre(void* field, oop new_val);
+ template <class T> inline void write_ref_field_pre(T* field, oop new_val);
+private:
+ // Keep this private so as to catch violations at build time.
+ virtual void write_ref_field_pre_work( void* field, oop new_val) { guarantee(false, "Not needed"); };
protected:
- virtual void write_ref_field_pre_work(void* field, oop new_val) {};
+ virtual void write_ref_field_pre_work( oop* field, oop new_val) {};
+ virtual void write_ref_field_pre_work(narrowOop* field, oop new_val) {};
public:
// ...then the post-write version.
@@ -117,12 +121,17 @@
virtual void read_ref_array(MemRegion mr) = 0;
virtual void read_prim_array(MemRegion mr) = 0;
- virtual void write_ref_array_pre(MemRegion mr) {}
+ virtual void write_ref_array_pre( oop* dst, int length) {}
+ virtual void write_ref_array_pre(narrowOop* dst, int length) {}
inline void write_ref_array(MemRegion mr);
// Static versions, suitable for calling from generated code.
static void static_write_ref_array_pre(HeapWord* start, size_t count);
static void static_write_ref_array_post(HeapWord* start, size_t count);
+ // Narrow oop versions of the above; count is # of array elements being written,
+ // starting with "start", which is HeapWord-aligned.
+ static void static_write_ref_array_pre_narrow(HeapWord* start, size_t count);
+ static void static_write_ref_array_post_narrow(HeapWord* start, size_t count);
protected:
virtual void write_ref_array_work(MemRegion mr) = 0;
--- a/hotspot/src/share/vm/memory/barrierSet.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/barrierSet.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -23,10 +23,10 @@
*/
// Inline functions of BarrierSet, which de-virtualize certain
-// performance-critical calls when when the barrier is the most common
+// performance-critical calls when the barrier is the most common
// card-table kind.
-void BarrierSet::write_ref_field_pre(void* field, oop new_val) {
+template <class T> void BarrierSet::write_ref_field_pre(T* field, oop new_val) {
if (kind() == CardTableModRef) {
((CardTableModRefBS*)this)->inline_write_ref_field_pre(field, new_val);
} else {
--- a/hotspot/src/share/vm/memory/blockOffsetTable.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/blockOffsetTable.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -287,7 +287,7 @@
// these functions here for performance.
protected:
void write_ref_field_work(oop obj, size_t offset, oop newVal);
- void write_ref_field_work(void* field, oop newVal);
+ virtual void write_ref_field_work(void* field, oop newVal);
public:
bool has_write_ref_array_opt() { return true; }
@@ -317,10 +317,10 @@
// *** Card-table-barrier-specific things.
- inline void inline_write_ref_field_pre(void* field, oop newVal) {}
+ template <class T> inline void inline_write_ref_field_pre(T* field, oop newVal) {}
- inline void inline_write_ref_field(void* field, oop newVal) {
- jbyte* byte = byte_for(field);
+ template <class T> inline void inline_write_ref_field(T* field, oop newVal) {
+ jbyte* byte = byte_for((void*)field);
*byte = dirty_card;
}
--- a/hotspot/src/share/vm/memory/cardTableRS.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/cardTableRS.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/memory/gcLocker.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/gcLocker.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1194,7 +1194,7 @@
return _gens[level]->gc_stats();
}
-void GenCollectedHeap::verify(bool allow_dirty, bool silent) {
+void GenCollectedHeap::verify(bool allow_dirty, bool silent, bool option /* ignored */) {
if (!silent) {
gclog_or_tty->print("permgen ");
}
--- a/hotspot/src/share/vm/memory/genCollectedHeap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -325,7 +325,7 @@
void prepare_for_verify();
// Override.
- void verify(bool allow_dirty, bool silent);
+ void verify(bool allow_dirty, bool silent, bool /* option */);
// Override.
void print() const;
--- a/hotspot/src/share/vm/memory/genOopClosures.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/genOopClosures.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -57,7 +57,7 @@
template <class T> void do_barrier(T* p);
// Version for use by closures that may be called in parallel code.
- void par_do_barrier(oop* p);
+ template <class T> void par_do_barrier(T* p);
public:
OopsInGenClosure() : OopClosure(NULL),
--- a/hotspot/src/share/vm/memory/genOopClosures.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/genOopClosures.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -40,18 +40,20 @@
template <class T> inline void OopsInGenClosure::do_barrier(T* p) {
assert(generation()->is_in_reserved(p), "expected ref in generation");
- assert(!oopDesc::is_null(*p), "expected non-null object");
- oop obj = oopDesc::load_decode_heap_oop_not_null(p);
+ T heap_oop = oopDesc::load_heap_oop(p);
+ assert(!oopDesc::is_null(heap_oop), "expected non-null oop");
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
// If p points to a younger generation, mark the card.
if ((HeapWord*)obj < _gen_boundary) {
_rs->inline_write_ref_field_gc(p, obj);
}
}
-inline void OopsInGenClosure::par_do_barrier(oop* p) {
+template <class T> inline void OopsInGenClosure::par_do_barrier(T* p) {
assert(generation()->is_in_reserved(p), "expected ref in generation");
- oop obj = *p;
- assert(obj != NULL, "expected non-null object");
+ T heap_oop = oopDesc::load_heap_oop(p);
+ assert(!oopDesc::is_null(heap_oop), "expected non-null oop");
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
// If p points to a younger generation, mark the card.
if ((HeapWord*)obj < gen_boundary()) {
rs()->write_ref_field_gc_par(p, obj);
--- a/hotspot/src/share/vm/memory/heap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/heap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/referenceProcessor.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1013,12 +1013,19 @@
// discovered_addr.
oop current_head = refs_list.head();
- // Note: In the case of G1, this pre-barrier is strictly
+ // Note: In the case of G1, this specific pre-barrier is strictly
// not necessary because the only case we are interested in
- // here is when *discovered_addr is NULL, so this will expand to
- // nothing. As a result, I am just manually eliding this out for G1.
+ // here is when *discovered_addr is NULL (see the CAS further below),
+ // so this will expand to nothing. As a result, we have manually
+ // elided this out for G1, but left in the test for some future
+ // collector that might have need for a pre-barrier here.
if (_discovered_list_needs_barrier && !UseG1GC) {
- _bs->write_ref_field_pre((void*)discovered_addr, current_head); guarantee(false, "Needs to be fixed: YSR");
+ if (UseCompressedOops) {
+ _bs->write_ref_field_pre((narrowOop*)discovered_addr, current_head);
+ } else {
+ _bs->write_ref_field_pre((oop*)discovered_addr, current_head);
+ }
+ guarantee(false, "Need to check non-G1 collector");
}
oop retest = oopDesc::atomic_compare_exchange_oop(current_head, discovered_addr,
NULL);
@@ -1029,9 +1036,8 @@
refs_list.set_head(obj);
refs_list.inc_length(1);
if (_discovered_list_needs_barrier) {
- _bs->write_ref_field((void*)discovered_addr, current_head); guarantee(false, "Needs to be fixed: YSR");
+ _bs->write_ref_field((void*)discovered_addr, current_head);
}
-
} else {
// If retest was non NULL, another thread beat us to it:
// The reference has already been discovered...
@@ -1177,11 +1183,16 @@
// pre-value, we can safely elide the pre-barrier here for the case of G1.
assert(discovered == NULL, "control point invariant");
if (_discovered_list_needs_barrier && !UseG1GC) { // safe to elide for G1
- _bs->write_ref_field_pre((oop*)discovered_addr, current_head);
+ if (UseCompressedOops) {
+ _bs->write_ref_field_pre((narrowOop*)discovered_addr, current_head);
+ } else {
+ _bs->write_ref_field_pre((oop*)discovered_addr, current_head);
+ }
+ guarantee(false, "Need to check non-G1 collector");
}
oop_store_raw(discovered_addr, current_head);
if (_discovered_list_needs_barrier) {
- _bs->write_ref_field((oop*)discovered_addr, current_head);
+ _bs->write_ref_field((void*)discovered_addr, current_head);
}
list->set_head(obj);
list->inc_length(1);
--- a/hotspot/src/share/vm/memory/space.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/space.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -106,6 +106,7 @@
virtual void set_end(HeapWord* value) { _end = value; }
virtual HeapWord* saved_mark_word() const { return _saved_mark_word; }
+
void set_saved_mark_word(HeapWord* p) { _saved_mark_word = p; }
MemRegionClosure* preconsumptionDirtyCardClosure() const {
--- a/hotspot/src/share/vm/memory/universe.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/universe.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1170,7 +1170,7 @@
st->print_cr("}");
}
-void Universe::verify(bool allow_dirty, bool silent) {
+void Universe::verify(bool allow_dirty, bool silent, bool option) {
if (SharedSkipVerify) {
return;
}
@@ -1194,7 +1194,7 @@
if (!silent) gclog_or_tty->print("[Verifying ");
if (!silent) gclog_or_tty->print("threads ");
Threads::verify();
- heap()->verify(allow_dirty, silent);
+ heap()->verify(allow_dirty, silent, option);
if (!silent) gclog_or_tty->print("syms ");
SymbolTable::verify();
--- a/hotspot/src/share/vm/memory/universe.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/memory/universe.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -343,6 +343,7 @@
// For UseCompressedOops
static address* narrow_oop_base_addr() { return &_narrow_oop._base; }
static address narrow_oop_base() { return _narrow_oop._base; }
+ static bool is_narrow_oop_base(void* addr) { return (narrow_oop_base() == (address)addr); }
static int narrow_oop_shift() { return _narrow_oop._shift; }
static void set_narrow_oop_base(address base) { _narrow_oop._base = base; }
static void set_narrow_oop_shift(int shift) { _narrow_oop._shift = shift; }
@@ -398,7 +399,7 @@
// Debugging
static bool verify_in_progress() { return _verify_in_progress; }
- static void verify(bool allow_dirty = true, bool silent = false);
+ static void verify(bool allow_dirty = true, bool silent = false, bool option = true);
static int verify_count() { return _verify_count; }
static void print();
static void print_on(outputStream* st);
--- a/hotspot/src/share/vm/oops/cpCacheOop.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/cpCacheOop.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/oops/generateOopMap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/generateOopMap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/oops/instanceRefKlass.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -28,13 +28,14 @@
template <class T>
static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
- oop referent = oopDesc::load_decode_heap_oop(referent_addr);
+ T heap_oop = oopDesc::load_heap_oop(referent_addr);
debug_only(
if(TraceReferenceGC && PrintGCDetails) {
gclog_or_tty->print_cr("instanceRefKlass::oop_follow_contents " INTPTR_FORMAT, obj);
}
)
- if (referent != NULL) {
+ if (!oopDesc::is_null(heap_oop)) {
+ oop referent = oopDesc::decode_heap_oop_not_null(heap_oop);
if (!referent->is_gc_marked() &&
MarkSweep::ref_processor()->
discover_reference(obj, ref->reference_type())) {
@@ -81,13 +82,14 @@
ParCompactionManager* cm,
oop obj) {
T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
- oop referent = oopDesc::load_decode_heap_oop(referent_addr);
+ T heap_oop = oopDesc::load_heap_oop(referent_addr);
debug_only(
if(TraceReferenceGC && PrintGCDetails) {
gclog_or_tty->print_cr("instanceRefKlass::oop_follow_contents " INTPTR_FORMAT, obj);
}
)
- if (referent != NULL) {
+ if (!oopDesc::is_null(heap_oop)) {
+ oop referent = oopDesc::decode_heap_oop_not_null(heap_oop);
if (PSParallelCompact::mark_bitmap()->is_unmarked(referent) &&
PSParallelCompact::ref_processor()->
discover_reference(obj, ref->reference_type())) {
@@ -182,9 +184,10 @@
} \
\
T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj); \
- oop referent = oopDesc::load_decode_heap_oop(referent_addr); \
- if (referent != NULL && contains(referent_addr)) { \
+ T heap_oop = oopDesc::load_heap_oop(referent_addr); \
+ if (!oopDesc::is_null(heap_oop) && contains(referent_addr)) { \
ReferenceProcessor* rp = closure->_ref_processor; \
+ oop referent = oopDesc::decode_heap_oop_not_null(heap_oop); \
if (!referent->is_gc_marked() && (rp != NULL) && \
rp->discover_reference(obj, reference_type())) { \
return size; \
--- a/hotspot/src/share/vm/oops/methodDataOop.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/methodDataOop.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/oops/methodKlass.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/methodKlass.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -68,7 +68,7 @@
m->set_constants(NULL);
m->set_max_stack(0);
m->set_max_locals(0);
- m->clear_intrinsic_id_cache();
+ m->set_intrinsic_id(vmIntrinsics::_none);
m->set_method_data(NULL);
m->set_interpreter_throwout_count(0);
m->set_vtable_index(methodOopDesc::garbage_vtable_index);
--- a/hotspot/src/share/vm/oops/methodOop.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/methodOop.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -962,26 +962,39 @@
return newm;
}
-vmIntrinsics::ID methodOopDesc::compute_intrinsic_id() const {
- assert(vmIntrinsics::_none == 0, "correct coding of default case");
- const uintptr_t max_cache_uint = right_n_bits((int)(sizeof(_intrinsic_id_cache) * BitsPerByte));
- assert((uintptr_t)vmIntrinsics::ID_LIMIT <= max_cache_uint, "else fix cache size");
+vmSymbols::SID methodOopDesc::klass_id_for_intrinsics(klassOop holder) {
// if loader is not the default loader (i.e., != NULL), we can't know the intrinsics
// because we are not loading from core libraries
- if (instanceKlass::cast(method_holder())->class_loader() != NULL) return vmIntrinsics::_none;
+ if (instanceKlass::cast(holder)->class_loader() != NULL)
+ return vmSymbols::NO_SID; // regardless of name, no intrinsics here
// see if the klass name is well-known:
- symbolOop klass_name = instanceKlass::cast(method_holder())->name();
- vmSymbols::SID klass_id = vmSymbols::find_sid(klass_name);
- if (klass_id == vmSymbols::NO_SID) return vmIntrinsics::_none;
+ symbolOop klass_name = instanceKlass::cast(holder)->name();
+ return vmSymbols::find_sid(klass_name);
+}
+
+void methodOopDesc::init_intrinsic_id() {
+ assert(_intrinsic_id == vmIntrinsics::_none, "do this just once");
+ const uintptr_t max_id_uint = right_n_bits((int)(sizeof(_intrinsic_id) * BitsPerByte));
+ assert((uintptr_t)vmIntrinsics::ID_LIMIT <= max_id_uint, "else fix size");
+
+ // the klass name is well-known:
+ vmSymbols::SID klass_id = klass_id_for_intrinsics(method_holder());
+ assert(klass_id != vmSymbols::NO_SID, "caller responsibility");
// ditto for method and signature:
vmSymbols::SID name_id = vmSymbols::find_sid(name());
- if (name_id == vmSymbols::NO_SID) return vmIntrinsics::_none;
+ if (name_id == vmSymbols::NO_SID) return;
vmSymbols::SID sig_id = vmSymbols::find_sid(signature());
- if (sig_id == vmSymbols::NO_SID) return vmIntrinsics::_none;
+ if (sig_id == vmSymbols::NO_SID) return;
jshort flags = access_flags().as_short();
+ vmIntrinsics::ID id = vmIntrinsics::find_id(klass_id, name_id, sig_id, flags);
+ if (id != vmIntrinsics::_none) {
+ set_intrinsic_id(id);
+ return;
+ }
+
// A few slightly irregular cases:
switch (klass_id) {
case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_StrictMath):
@@ -992,15 +1005,18 @@
case vmSymbols::VM_SYMBOL_ENUM_NAME(sqrt_name):
// pretend it is the corresponding method in the non-strict class:
klass_id = vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_Math);
+ id = vmIntrinsics::find_id(klass_id, name_id, sig_id, flags);
break;
}
}
- // return intrinsic id if any
- return vmIntrinsics::find_id(klass_id, name_id, sig_id, flags);
+ if (id != vmIntrinsics::_none) {
+ // Set up its iid. It is an alias method.
+ set_intrinsic_id(id);
+ return;
+ }
}
-
// These two methods are static since a GC may move the methodOopDesc
bool methodOopDesc::load_signature_classes(methodHandle m, TRAPS) {
bool sig_is_loaded = true;
--- a/hotspot/src/share/vm/oops/methodOop.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/methodOop.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -104,7 +104,7 @@
u2 _max_stack; // Maximum number of entries on the expression stack
u2 _max_locals; // Number of local variables used by this method
u2 _size_of_parameters; // size of the parameter block (receiver + arguments) in words
- u1 _intrinsic_id_cache; // Cache for intrinsic_id; 0 or 1+vmInt::ID
+ u1 _intrinsic_id; // vmSymbols::intrinsic_id (0 == _none)
u1 _highest_tier_compile; // Highest compile level this method has ever seen.
u2 _interpreter_throwout_count; // Count of times method was exited via exception while interpreting
u2 _number_of_breakpoints; // fullspeed debugging support
@@ -224,8 +224,6 @@
int highest_tier_compile() { return _highest_tier_compile;}
void set_highest_tier_compile(int level) { _highest_tier_compile = level;}
- void clear_intrinsic_id_cache() { _intrinsic_id_cache = 0; }
-
// Count of times method was exited via exception while interpreting
void interpreter_throwout_increment() {
if (_interpreter_throwout_count < 65534) {
@@ -571,18 +569,12 @@
void set_cached_itable_index(int index) { instanceKlass::cast(method_holder())->set_cached_itable_index(method_idnum(), index); }
// Support for inlining of intrinsic methods
- vmIntrinsics::ID intrinsic_id() const { // returns zero if not an intrinsic
- const u1& cache = _intrinsic_id_cache;
- if (cache != 0) {
- return (vmIntrinsics::ID)(cache - 1);
- } else {
- vmIntrinsics::ID id = compute_intrinsic_id();
- *(u1*)&cache = ((u1) id) + 1; // force the cache to be non-const
- vmIntrinsics::verify_method(id, (methodOop) this);
- assert((vmIntrinsics::ID)(cache - 1) == id, "proper conversion");
- return id;
- }
- }
+ vmIntrinsics::ID intrinsic_id() const { return (vmIntrinsics::ID) _intrinsic_id; }
+ void set_intrinsic_id(vmIntrinsics::ID id) { _intrinsic_id = (u1) id; }
+
+ // Helper routines for intrinsic_id() and vmIntrinsics::method().
+ void init_intrinsic_id(); // updates from _none if a match
+ static vmSymbols::SID klass_id_for_intrinsics(klassOop holder);
// On-stack replacement support
bool has_osr_nmethod() { return instanceKlass::cast(method_holder())->lookup_osr_nmethod(this, InvocationEntryBci) != NULL; }
@@ -635,9 +627,6 @@
void set_size_of_parameters(int size) { _size_of_parameters = size; }
private:
- // Helper routine for intrinsic_id().
- vmIntrinsics::ID compute_intrinsic_id() const;
-
// Inlined elements
address* native_function_addr() const { assert(is_native(), "must be native"); return (address*) (this+1); }
address* signature_handler_addr() const { return native_function_addr() + 1; }
--- a/hotspot/src/share/vm/oops/objArrayKlass.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/objArrayKlass.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -84,8 +84,6 @@
template <class T> void objArrayKlass::do_copy(arrayOop s, T* src,
arrayOop d, T* dst, int length, TRAPS) {
- const size_t word_len = objArrayOopDesc::array_size(length);
-
BarrierSet* bs = Universe::heap()->barrier_set();
// For performance reasons, we assume we are that the write barrier we
// are using has optimized modes for arrays of references. At least one
@@ -93,11 +91,10 @@
assert(bs->has_write_ref_array_opt(), "Barrier set must have ref array opt");
assert(bs->has_write_ref_array_pre_opt(), "For pre-barrier as well.");
- MemRegion dst_mr = MemRegion((HeapWord*)dst, word_len);
if (s == d) {
// since source and destination are equal we do not need conversion checks.
assert(length > 0, "sanity check");
- bs->write_ref_array_pre(dst_mr);
+ bs->write_ref_array_pre(dst, length);
Copy::conjoint_oops_atomic(src, dst, length);
} else {
// We have to make sure all elements conform to the destination array
@@ -105,7 +102,7 @@
klassOop stype = objArrayKlass::cast(s->klass())->element_klass();
if (stype == bound || Klass::cast(stype)->is_subtype_of(bound)) {
// elements are guaranteed to be subtypes, so no check necessary
- bs->write_ref_array_pre(dst_mr);
+ bs->write_ref_array_pre(dst, length);
Copy::conjoint_oops_atomic(src, dst, length);
} else {
// slow case: need individual subtype checks
@@ -137,6 +134,7 @@
}
}
}
+ const size_t word_len = objArrayOopDesc::array_size(length);
bs->write_ref_array(MemRegion((HeapWord*)dst, word_len));
}
--- a/hotspot/src/share/vm/oops/oop.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -148,12 +148,14 @@
inline narrowOop oopDesc::encode_heap_oop_not_null(oop v) {
assert(!is_null(v), "oop value can never be zero");
+ assert(Universe::heap()->is_in_reserved(v), "Address not in heap");
address base = Universe::narrow_oop_base();
int shift = Universe::narrow_oop_shift();
uint64_t pd = (uint64_t)(pointer_delta((void*)v, (void*)base, 1));
assert(OopEncodingHeapMax > pd, "change encoding max if new encoding");
uint64_t result = pd >> shift;
assert((result & CONST64(0xffffffff00000000)) == 0, "narrow oop overflow");
+ assert(decode_heap_oop(result) == v, "reversibility");
return (narrowOop)result;
}
@@ -449,7 +451,7 @@
oopDesc::bs()->write_ref_field(p, v);
}
-inline void update_barrier_set_pre(void* p, oop v) {
+template <class T> inline void update_barrier_set_pre(T* p, oop v) {
oopDesc::bs()->write_ref_field_pre(p, v);
}
@@ -459,15 +461,15 @@
} else {
update_barrier_set_pre(p, v);
oopDesc::encode_store_heap_oop(p, v);
- update_barrier_set(p, v);
+ update_barrier_set((void*)p, v); // cast away type
}
}
template <class T> inline void oop_store(volatile T* p, oop v) {
- update_barrier_set_pre((void*)p, v);
+ update_barrier_set_pre((T*)p, v); // cast away volatile
// Used by release_obj_field_put, so use release_store_ptr.
oopDesc::release_encode_store_heap_oop(p, v);
- update_barrier_set((void*)p, v);
+ update_barrier_set((void*)p, v); // cast away type
}
template <class T> inline void oop_store_without_check(T* p, oop v) {
--- a/hotspot/src/share/vm/oops/oopsHierarchy.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/oops/oopsHierarchy.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -29,6 +29,7 @@
typedef juint narrowOop; // Offset instead of address for an oop within a java object
typedef class klassOopDesc* wideKlassOop; // to keep SA happy and unhandled oop
// detector happy.
+typedef void* OopOrNarrowOopStar;
#ifndef CHECK_UNHANDLED_OOPS
--- a/hotspot/src/share/vm/opto/addnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/addnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/block.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/block.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -357,6 +357,9 @@
#ifndef PRODUCT
, _trace_opto_pipelining(TraceOptoPipelining || C->method_has_option("TraceOptoPipelining"))
#endif
+#ifdef ASSERT
+ , _raw_oops(a)
+#endif
{
ResourceMark rm;
// I'll need a few machine-specific GotoNodes. Make an Ideal GotoNode,
--- a/hotspot/src/share/vm/opto/block.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/block.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -380,6 +380,10 @@
bool _trace_opto_pipelining; // tracing flag
#endif
+#ifdef ASSERT
+ Unique_Node_List _raw_oops;
+#endif
+
// Build dominators
void Dominators();
--- a/hotspot/src/share/vm/opto/buildOopMap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/buildOopMap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,9 +74,11 @@
// this block.
Block *_b; // Block for this struct
OopFlow *_next; // Next free OopFlow
+ // or NULL if dead/conflict
+ Compile* C;
- OopFlow( short *callees, Node **defs ) : _callees(callees), _defs(defs),
- _b(NULL), _next(NULL) { }
+ OopFlow( short *callees, Node **defs, Compile* c ) : _callees(callees), _defs(defs),
+ _b(NULL), _next(NULL), C(c) { }
// Given reaching-defs for this block start, compute it for this block end
void compute_reach( PhaseRegAlloc *regalloc, int max_reg, Dict *safehash );
@@ -88,7 +90,7 @@
void clone( OopFlow *flow, int max_size);
// Make a new OopFlow from scratch
- static OopFlow *make( Arena *A, int max_size );
+ static OopFlow *make( Arena *A, int max_size, Compile* C );
// Build an oopmap from the current flow info
OopMap *build_oop_map( Node *n, int max_reg, PhaseRegAlloc *regalloc, int* live );
@@ -180,11 +182,11 @@
}
//------------------------------make-------------------------------------------
-OopFlow *OopFlow::make( Arena *A, int max_size ) {
+OopFlow *OopFlow::make( Arena *A, int max_size, Compile* C ) {
short *callees = NEW_ARENA_ARRAY(A,short,max_size+1);
Node **defs = NEW_ARENA_ARRAY(A,Node*,max_size+1);
debug_only( memset(defs,0,(max_size+1)*sizeof(Node*)) );
- OopFlow *flow = new (A) OopFlow(callees+1, defs+1);
+ OopFlow *flow = new (A) OopFlow(callees+1, defs+1, C);
assert( &flow->_callees[OptoReg::Bad] == callees, "Ok to index at OptoReg::Bad" );
assert( &flow->_defs [OptoReg::Bad] == defs , "Ok to index at OptoReg::Bad" );
return flow;
@@ -288,7 +290,7 @@
m = m->in(idx);
}
}
- guarantee( 0, "must find derived/base pair" );
+ guarantee( 0, "must find derived/base pair" );
}
found: ;
Node *base = n->in(i+1); // Base is other half of pair
@@ -347,6 +349,13 @@
} else {
// Other - some reaching non-oop value
omap->set_value( r);
+#ifdef ASSERT
+ if( t->isa_rawptr() && C->cfg()->_raw_oops.member(def) ) {
+ def->dump();
+ n->dump();
+ assert(false, "there should be a oop in OopMap instead of a live raw oop at safepoint");
+ }
+#endif
}
}
@@ -562,7 +571,7 @@
// Do the first block 'by hand' to prime the worklist
Block *entry = _cfg->_blocks[1];
- OopFlow *rootflow = OopFlow::make(A,max_reg);
+ OopFlow *rootflow = OopFlow::make(A,max_reg,this);
// Initialize to 'bottom' (not 'top')
memset( rootflow->_callees, OptoReg::Bad, max_reg*sizeof(short) );
memset( rootflow->_defs , 0, max_reg*sizeof(Node*) );
@@ -628,7 +637,7 @@
// Carry it forward.
} else { // Draw a new OopFlow from the freelist
if( !free_list )
- free_list = OopFlow::make(A,max_reg);
+ free_list = OopFlow::make(A,max_reg,C);
flow = free_list;
assert( flow->_b == NULL, "oopFlow is not free" );
free_list = flow->_next;
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/c2compiler.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/c2compiler.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,9 @@
initialize();
}
bool subsume_loads = true;
- bool do_escape_analysis = DoEscapeAnalysis;
+ bool do_escape_analysis = DoEscapeAnalysis &&
+ !(env->jvmti_can_hotswap_or_post_breakpoint() ||
+ env->jvmti_can_examine_or_deopt_anywhere());
while (!env->failing()) {
// Attempt to compile while subsuming loads into machine instructions.
Compile C(env, this, target, entry_bci, subsume_loads, do_escape_analysis);
--- a/hotspot/src/share/vm/opto/callnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/callnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/callnode.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/callnode.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/cfgnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1796,8 +1796,12 @@
for (uint i=1; i<req(); ++i) {// For all paths in
Node *ii = in(i);
if (ii->is_DecodeN() && ii->bottom_type() == bottom_type()) {
- has_decodeN = true;
- in_decodeN = ii->in(1);
+ // Note: in_decodeN is used only to define the type of new phi.
+ // Find a non dead path otherwise phi type will be wrong.
+ if (ii->in(1)->bottom_type() != Type::TOP) {
+ has_decodeN = true;
+ in_decodeN = ii->in(1);
+ }
} else if (!ii->is_Phi()) {
may_push = false;
}
@@ -1805,7 +1809,6 @@
if (has_decodeN && may_push) {
PhaseIterGVN *igvn = phase->is_IterGVN();
- // Note: in_decodeN is used only to define the type of new phi here.
PhiNode *new_phi = PhiNode::make_blank(in(0), in_decodeN);
uint orig_cnt = req();
for (uint i=1; i<req(); ++i) {// For all paths in
--- a/hotspot/src/share/vm/opto/coalesce.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/coalesce.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/compile.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/compile.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -101,7 +101,8 @@
}
}
// Lazily create intrinsics for intrinsic IDs well-known in the runtime.
- if (m->intrinsic_id() != vmIntrinsics::_none) {
+ if (m->intrinsic_id() != vmIntrinsics::_none &&
+ m->intrinsic_id() <= vmIntrinsics::LAST_COMPILER_INLINE) {
CallGenerator* cg = make_vm_intrinsic(m, is_virtual);
if (cg != NULL) {
// Save it for next time:
@@ -440,6 +441,8 @@
_orig_pc_slot_offset_in_bytes(0),
_node_bundling_limit(0),
_node_bundling_base(NULL),
+ _java_calls(0),
+ _inner_loops(0),
#ifndef PRODUCT
_trace_opto_output(TraceOptoOutput || method()->has_option("TraceOptoOutput")),
_printer(IdealGraphPrinter::printer()),
@@ -710,6 +713,8 @@
_code_buffer("Compile::Fill_buffer"),
_node_bundling_limit(0),
_node_bundling_base(NULL),
+ _java_calls(0),
+ _inner_loops(0),
#ifndef PRODUCT
_trace_opto_output(TraceOptoOutput),
_printer(NULL),
@@ -1850,22 +1855,26 @@
int _float_count; // count float ops requiring 24-bit precision
int _double_count; // count double ops requiring more precision
int _java_call_count; // count non-inlined 'java' calls
+ int _inner_loop_count; // count loops which need alignment
VectorSet _visited; // Visitation flags
Node_List _tests; // Set of IfNodes & PCTableNodes
Final_Reshape_Counts() :
- _call_count(0), _float_count(0), _double_count(0), _java_call_count(0),
+ _call_count(0), _float_count(0), _double_count(0),
+ _java_call_count(0), _inner_loop_count(0),
_visited( Thread::current()->resource_area() ) { }
void inc_call_count () { _call_count ++; }
void inc_float_count () { _float_count ++; }
void inc_double_count() { _double_count++; }
void inc_java_call_count() { _java_call_count++; }
+ void inc_inner_loop_count() { _inner_loop_count++; }
int get_call_count () const { return _call_count ; }
int get_float_count () const { return _float_count ; }
int get_double_count() const { return _double_count; }
int get_java_call_count() const { return _java_call_count; }
+ int get_inner_loop_count() const { return _inner_loop_count; }
};
static bool oop_offset_is_sane(const TypeInstPtr* tp) {
@@ -1877,7 +1886,7 @@
//------------------------------final_graph_reshaping_impl----------------------
// Implement items 1-5 from final_graph_reshaping below.
-static void final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &fpu ) {
+static void final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc ) {
if ( n->outcnt() == 0 ) return; // dead node
uint nop = n->Opcode();
@@ -1919,13 +1928,13 @@
case Op_CmpF:
case Op_CmpF3:
// case Op_ConvL2F: // longs are split into 32-bit halves
- fpu.inc_float_count();
+ frc.inc_float_count();
break;
case Op_ConvF2D:
case Op_ConvD2F:
- fpu.inc_float_count();
- fpu.inc_double_count();
+ frc.inc_float_count();
+ frc.inc_double_count();
break;
// Count all double operations that may use FPU
@@ -1942,7 +1951,7 @@
case Op_ConD:
case Op_CmpD:
case Op_CmpD3:
- fpu.inc_double_count();
+ frc.inc_double_count();
break;
case Op_Opaque1: // Remove Opaque Nodes before matching
case Op_Opaque2: // Remove Opaque Nodes before matching
@@ -1951,7 +1960,7 @@
case Op_CallStaticJava:
case Op_CallJava:
case Op_CallDynamicJava:
- fpu.inc_java_call_count(); // Count java call site;
+ frc.inc_java_call_count(); // Count java call site;
case Op_CallRuntime:
case Op_CallLeaf:
case Op_CallLeafNoFP: {
@@ -1962,7 +1971,7 @@
// uncommon_trap, _complete_monitor_locking, _complete_monitor_unlocking,
// _new_Java, _new_typeArray, _new_objArray, _rethrow_Java, ...
if( !call->is_CallStaticJava() || !call->as_CallStaticJava()->_name ) {
- fpu.inc_call_count(); // Count the call site
+ frc.inc_call_count(); // Count the call site
} else { // See if uncommon argument is shared
Node *n = call->in(TypeFunc::Parms);
int nop = n->Opcode();
@@ -1983,11 +1992,11 @@
case Op_StoreD:
case Op_LoadD:
case Op_LoadD_unaligned:
- fpu.inc_double_count();
+ frc.inc_double_count();
goto handle_mem;
case Op_StoreF:
case Op_LoadF:
- fpu.inc_float_count();
+ frc.inc_float_count();
goto handle_mem;
case Op_StoreB:
@@ -2324,6 +2333,12 @@
n->subsume_by(btp);
}
break;
+ case Op_Loop:
+ case Op_CountedLoop:
+ if (n->as_Loop()->is_inner_loop()) {
+ frc.inc_inner_loop_count();
+ }
+ break;
default:
assert( !n->is_Call(), "" );
assert( !n->is_Mem(), "" );
@@ -2332,17 +2347,17 @@
// Collect CFG split points
if (n->is_MultiBranch())
- fpu._tests.push(n);
+ frc._tests.push(n);
}
//------------------------------final_graph_reshaping_walk---------------------
// Replacing Opaque nodes with their input in final_graph_reshaping_impl(),
// requires that the walk visits a node's inputs before visiting the node.
-static void final_graph_reshaping_walk( Node_Stack &nstack, Node *root, Final_Reshape_Counts &fpu ) {
+static void final_graph_reshaping_walk( Node_Stack &nstack, Node *root, Final_Reshape_Counts &frc ) {
ResourceArea *area = Thread::current()->resource_area();
Unique_Node_List sfpt(area);
- fpu._visited.set(root->_idx); // first, mark node as visited
+ frc._visited.set(root->_idx); // first, mark node as visited
uint cnt = root->req();
Node *n = root;
uint i = 0;
@@ -2351,7 +2366,7 @@
// Place all non-visited non-null inputs onto stack
Node* m = n->in(i);
++i;
- if (m != NULL && !fpu._visited.test_set(m->_idx)) {
+ if (m != NULL && !frc._visited.test_set(m->_idx)) {
if (m->is_SafePoint() && m->as_SafePoint()->jvms() != NULL)
sfpt.push(m);
cnt = m->req();
@@ -2361,7 +2376,7 @@
}
} else {
// Now do post-visit work
- final_graph_reshaping_impl( n, fpu );
+ final_graph_reshaping_impl( n, frc );
if (nstack.is_empty())
break; // finished
n = nstack.node(); // Get node from stack
@@ -2442,16 +2457,16 @@
return true;
}
- Final_Reshape_Counts fpu;
+ Final_Reshape_Counts frc;
// Visit everybody reachable!
// Allocate stack of size C->unique()/2 to avoid frequent realloc
Node_Stack nstack(unique() >> 1);
- final_graph_reshaping_walk(nstack, root(), fpu);
+ final_graph_reshaping_walk(nstack, root(), frc);
// Check for unreachable (from below) code (i.e., infinite loops).
- for( uint i = 0; i < fpu._tests.size(); i++ ) {
- MultiBranchNode *n = fpu._tests[i]->as_MultiBranch();
+ for( uint i = 0; i < frc._tests.size(); i++ ) {
+ MultiBranchNode *n = frc._tests[i]->as_MultiBranch();
// Get number of CFG targets.
// Note that PCTables include exception targets after calls.
uint required_outcnt = n->required_outcnt();
@@ -2497,7 +2512,7 @@
// Check that I actually visited all kids. Unreached kids
// must be infinite loops.
for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++)
- if (!fpu._visited.test(n->fast_out(j)->_idx)) {
+ if (!frc._visited.test(n->fast_out(j)->_idx)) {
record_method_not_compilable("infinite loop");
return true; // Found unvisited kid; must be unreach
}
@@ -2506,13 +2521,14 @@
// If original bytecodes contained a mixture of floats and doubles
// check if the optimizer has made it homogenous, item (3).
if( Use24BitFPMode && Use24BitFP &&
- fpu.get_float_count() > 32 &&
- fpu.get_double_count() == 0 &&
- (10 * fpu.get_call_count() < fpu.get_float_count()) ) {
+ frc.get_float_count() > 32 &&
+ frc.get_double_count() == 0 &&
+ (10 * frc.get_call_count() < frc.get_float_count()) ) {
set_24_bit_selection_and_mode( false, true );
}
- set_has_java_calls(fpu.get_java_call_count() > 0);
+ set_java_calls(frc.get_java_call_count());
+ set_inner_loops(frc.get_inner_loop_count());
// No infinite loops, no reason to bail out.
return false;
--- a/hotspot/src/share/vm/opto/compile.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/compile.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -223,7 +223,8 @@
PhaseCFG* _cfg; // Results of CFG finding
bool _select_24_bit_instr; // We selected an instruction with a 24-bit result
bool _in_24_bit_fp_mode; // We are emitting instructions with 24-bit results
- bool _has_java_calls; // True if the method has java calls
+ int _java_calls; // Number of java calls in the method
+ int _inner_loops; // Number of inner loops in the method
Matcher* _matcher; // Engine to map ideal to machine instructions
PhaseRegAlloc* _regalloc; // Results of register allocation.
int _frame_slots; // Size of total frame in stack slots
@@ -505,7 +506,9 @@
PhaseCFG* cfg() { return _cfg; }
bool select_24_bit_instr() const { return _select_24_bit_instr; }
bool in_24_bit_fp_mode() const { return _in_24_bit_fp_mode; }
- bool has_java_calls() const { return _has_java_calls; }
+ bool has_java_calls() const { return _java_calls > 0; }
+ int java_calls() const { return _java_calls; }
+ int inner_loops() const { return _inner_loops; }
Matcher* matcher() { return _matcher; }
PhaseRegAlloc* regalloc() { return _regalloc; }
int frame_slots() const { return _frame_slots; }
@@ -532,7 +535,8 @@
_in_24_bit_fp_mode = mode;
}
- void set_has_java_calls(bool z) { _has_java_calls = z; }
+ void set_java_calls(int z) { _java_calls = z; }
+ void set_inner_loops(int z) { _inner_loops = z; }
// Instruction bits passed off to the VM
int code_size() { return _method_size; }
--- a/hotspot/src/share/vm/opto/connode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/connode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/doCall.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/doCall.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/escape.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/escape.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -578,11 +578,24 @@
if (phi_alias_idx == alias_idx) {
return orig_phi;
}
- // have we already created a Phi for this alias index?
+ // Have we recently created a Phi for this alias index?
PhiNode *result = get_map_phi(orig_phi->_idx);
if (result != NULL && C->get_alias_index(result->adr_type()) == alias_idx) {
return result;
}
+ // Previous check may fail when the same wide memory Phi was split into Phis
+ // for different memory slices. Search all Phis for this region.
+ if (result != NULL) {
+ Node* region = orig_phi->in(0);
+ for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) {
+ Node* phi = region->fast_out(i);
+ if (phi->is_Phi() &&
+ C->get_alias_index(phi->as_Phi()->adr_type()) == alias_idx) {
+ assert(phi->_idx >= nodes_size(), "only new Phi per instance memory slice");
+ return phi->as_Phi();
+ }
+ }
+ }
if ((int)C->unique() + 2*NodeLimitFudgeFactor > MaxNodeLimit) {
if (C->do_escape_analysis() == true && !C->failing()) {
// Retry compilation without escape analysis.
@@ -595,6 +608,7 @@
orig_phi_worklist.append_if_missing(orig_phi);
const TypePtr *atype = C->get_adr_type(alias_idx);
result = PhiNode::make(orig_phi->in(0), NULL, Type::MEMORY, atype);
+ C->copy_node_notes_to(result, orig_phi);
set_map_phi(orig_phi->_idx, result);
igvn->set_type(result, result->bottom_type());
record_for_optimizer(result);
--- a/hotspot/src/share/vm/opto/gcm.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/gcm.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1130,6 +1130,9 @@
Node *def = self->in(1);
if (def != NULL && def->bottom_type()->base() == Type::RawPtr) {
early->add_inst(self);
+#ifdef ASSERT
+ _raw_oops.push(def);
+#endif
continue;
}
break;
--- a/hotspot/src/share/vm/opto/graphKit.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/graphKit.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1373,19 +1373,20 @@
return st;
}
+
void GraphKit::pre_barrier(Node* ctl,
Node* obj,
Node* adr,
- uint adr_idx,
- Node *val,
- const Type* val_type,
+ uint adr_idx,
+ Node* val,
+ const TypeOopPtr* val_type,
BasicType bt) {
BarrierSet* bs = Universe::heap()->barrier_set();
set_control(ctl);
switch (bs->kind()) {
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
- g1_write_barrier_pre(obj, adr, adr_idx, val, val_type, bt);
+ g1_write_barrier_pre(obj, adr, adr_idx, val, val_type, bt);
break;
case BarrierSet::CardTableModRef:
@@ -1404,8 +1405,8 @@
Node* store,
Node* obj,
Node* adr,
- uint adr_idx,
- Node *val,
+ uint adr_idx,
+ Node* val,
BasicType bt,
bool use_precise) {
BarrierSet* bs = Universe::heap()->barrier_set();
@@ -1413,7 +1414,7 @@
switch (bs->kind()) {
case BarrierSet::G1SATBCT:
case BarrierSet::G1SATBCTLogging:
- g1_write_barrier_post(store, obj, adr, adr_idx, val, bt, use_precise);
+ g1_write_barrier_post(store, obj, adr, adr_idx, val, bt, use_precise);
break;
case BarrierSet::CardTableModRef:
@@ -1431,49 +1432,55 @@
}
}
-Node* GraphKit::store_oop_to_object(Node* ctl,
- Node* obj,
- Node* adr,
- const TypePtr* adr_type,
- Node *val,
- const Type* val_type,
- BasicType bt) {
+Node* GraphKit::store_oop(Node* ctl,
+ Node* obj,
+ Node* adr,
+ const TypePtr* adr_type,
+ Node* val,
+ const TypeOopPtr* val_type,
+ BasicType bt,
+ bool use_precise) {
+
+ set_control(ctl);
+ if (stopped()) return top(); // Dead path ?
+
+ assert(bt == T_OBJECT, "sanity");
+ assert(val != NULL, "not dead path");
uint adr_idx = C->get_alias_index(adr_type);
- Node* store;
- pre_barrier(ctl, obj, adr, adr_idx, val, val_type, bt);
- store = store_to_memory(control(), adr, val, bt, adr_idx);
- post_barrier(control(), store, obj, adr, adr_idx, val, bt, false);
+ assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
+
+ pre_barrier(control(), obj, adr, adr_idx, val, val_type, bt);
+ Node* store = store_to_memory(control(), adr, val, bt, adr_idx);
+ post_barrier(control(), store, obj, adr, adr_idx, val, bt, use_precise);
return store;
}
-Node* GraphKit::store_oop_to_array(Node* ctl,
- Node* obj,
- Node* adr,
- const TypePtr* adr_type,
- Node *val,
- const Type* val_type,
- BasicType bt) {
- uint adr_idx = C->get_alias_index(adr_type);
- Node* store;
- pre_barrier(ctl, obj, adr, adr_idx, val, val_type, bt);
- store = store_to_memory(control(), adr, val, bt, adr_idx);
- post_barrier(control(), store, obj, adr, adr_idx, val, bt, true);
- return store;
-}
-
+// Could be an array or object we don't know at compile time (unsafe ref.)
Node* GraphKit::store_oop_to_unknown(Node* ctl,
- Node* obj,
- Node* adr,
- const TypePtr* adr_type,
- Node *val,
- const Type* val_type,
- BasicType bt) {
- uint adr_idx = C->get_alias_index(adr_type);
- Node* store;
- pre_barrier(ctl, obj, adr, adr_idx, val, val_type, bt);
- store = store_to_memory(control(), adr, val, bt, adr_idx);
- post_barrier(control(), store, obj, adr, adr_idx, val, bt, true);
- return store;
+ Node* obj, // containing obj
+ Node* adr, // actual adress to store val at
+ const TypePtr* adr_type,
+ Node* val,
+ BasicType bt) {
+ Compile::AliasType* at = C->alias_type(adr_type);
+ const TypeOopPtr* val_type = NULL;
+ if (adr_type->isa_instptr()) {
+ if (at->field() != NULL) {
+ // known field. This code is a copy of the do_put_xxx logic.
+ ciField* field = at->field();
+ if (!field->type()->is_loaded()) {
+ val_type = TypeInstPtr::BOTTOM;
+ } else {
+ val_type = TypeOopPtr::make_from_klass(field->type()->as_klass());
+ }
+ }
+ } else if (adr_type->isa_aryptr()) {
+ val_type = adr_type->is_aryptr()->elem()->make_oopptr();
+ }
+ if (val_type == NULL) {
+ val_type = TypeInstPtr::BOTTOM;
+ }
+ return store_oop(ctl, obj, adr, adr_type, val, val_type, bt, true);
}
@@ -1787,93 +1794,6 @@
}
-//------------------------------store_barrier----------------------------------
-// Insert a write-barrier store. This is to let generational GC work; we have
-// to flag all oop-stores before the next GC point.
-void GraphKit::write_barrier_post(Node* oop_store, Node* obj, Node* adr,
- Node* val, bool use_precise) {
- // No store check needed if we're storing a NULL or an old object
- // (latter case is probably a string constant). The concurrent
- // mark sweep garbage collector, however, needs to have all nonNull
- // oop updates flagged via card-marks.
- if (val != NULL && val->is_Con()) {
- // must be either an oop or NULL
- const Type* t = val->bottom_type();
- if (t == TypePtr::NULL_PTR || t == Type::TOP)
- // stores of null never (?) need barriers
- return;
- ciObject* con = t->is_oopptr()->const_oop();
- if (con != NULL
- && con->is_perm()
- && Universe::heap()->can_elide_permanent_oop_store_barriers())
- // no store barrier needed, because no old-to-new ref created
- return;
- }
-
- if (use_ReduceInitialCardMarks()
- && obj == just_allocated_object(control())) {
- // We can skip marks on a freshly-allocated object.
- // Keep this code in sync with do_eager_card_mark in runtime.cpp.
- // That routine eagerly marks the occasional object which is produced
- // by the slow path, so that we don't have to do it here.
- return;
- }
-
- if (!use_precise) {
- // All card marks for a (non-array) instance are in one place:
- adr = obj;
- }
- // (Else it's an array (or unknown), and we want more precise card marks.)
- assert(adr != NULL, "");
-
- // Get the alias_index for raw card-mark memory
- int adr_type = Compile::AliasIdxRaw;
- // Convert the pointer to an int prior to doing math on it
- Node* cast = _gvn.transform(new (C, 2) CastP2XNode(control(), adr));
- // Divide by card size
- assert(Universe::heap()->barrier_set()->kind() == BarrierSet::CardTableModRef,
- "Only one we handle so far.");
- CardTableModRefBS* ct =
- (CardTableModRefBS*)(Universe::heap()->barrier_set());
- Node *b = _gvn.transform(new (C, 3) URShiftXNode( cast, _gvn.intcon(CardTableModRefBS::card_shift) ));
- // We store into a byte array, so do not bother to left-shift by zero
- Node *c = byte_map_base_node();
- // Combine
- Node *sb_ctl = control();
- Node *sb_adr = _gvn.transform(new (C, 4) AddPNode( top()/*no base ptr*/, c, b ));
- Node *sb_val = _gvn.intcon(0);
- // Smash zero into card
- if( !UseConcMarkSweepGC ) {
- BasicType bt = T_BYTE;
- store_to_memory(sb_ctl, sb_adr, sb_val, bt, adr_type);
- } else {
- // Specialized path for CM store barrier
- cms_card_mark( sb_ctl, sb_adr, sb_val, oop_store);
- }
-}
-
-// Specialized path for CMS store barrier
-void GraphKit::cms_card_mark(Node* ctl, Node* adr, Node* val, Node *oop_store) {
- BasicType bt = T_BYTE;
- int adr_idx = Compile::AliasIdxRaw;
- Node* mem = memory(adr_idx);
-
- // The type input is NULL in PRODUCT builds
- const TypePtr* type = NULL;
- debug_only(type = C->get_adr_type(adr_idx));
-
- // Add required edge to oop_store, optimizer does not support precedence edges.
- // Convert required edge to precedence edge before allocation.
- Node *store = _gvn.transform( new (C, 5) StoreCMNode(ctl, mem, adr, type, val, oop_store) );
- set_memory(store, adr_idx);
-
- // For CMS, back-to-back card-marks can only remove the first one
- // and this requires DU info. Push on worklist for optimizer.
- if (mem->req() > MemNode::Address && adr == mem->in(MemNode::Address))
- record_for_igvn(store);
-}
-
-
void GraphKit::round_double_arguments(ciMethod* dest_method) {
// (Note: TypeFunc::make has a cache that makes this fast.)
const TypeFunc* tf = TypeFunc::make(dest_method);
@@ -3198,17 +3118,88 @@
return NULL;
}
+//----------------------------- store barriers ----------------------------
+#define __ ideal.
+
+void GraphKit::sync_kit(IdealKit& ideal) {
+ // Final sync IdealKit and graphKit.
+ __ drain_delay_transform();
+ set_all_memory(__ merged_memory());
+ set_control(__ ctrl());
+}
+
+// vanilla/CMS post barrier
+// Insert a write-barrier store. This is to let generational GC work; we have
+// to flag all oop-stores before the next GC point.
+void GraphKit::write_barrier_post(Node* oop_store,
+ Node* obj,
+ Node* adr,
+ Node* val,
+ bool use_precise) {
+ // No store check needed if we're storing a NULL or an old object
+ // (latter case is probably a string constant). The concurrent
+ // mark sweep garbage collector, however, needs to have all nonNull
+ // oop updates flagged via card-marks.
+ if (val != NULL && val->is_Con()) {
+ // must be either an oop or NULL
+ const Type* t = val->bottom_type();
+ if (t == TypePtr::NULL_PTR || t == Type::TOP)
+ // stores of null never (?) need barriers
+ return;
+ ciObject* con = t->is_oopptr()->const_oop();
+ if (con != NULL
+ && con->is_perm()
+ && Universe::heap()->can_elide_permanent_oop_store_barriers())
+ // no store barrier needed, because no old-to-new ref created
+ return;
+ }
+
+ if (!use_precise) {
+ // All card marks for a (non-array) instance are in one place:
+ adr = obj;
+ }
+ // (Else it's an array (or unknown), and we want more precise card marks.)
+ assert(adr != NULL, "");
+
+ IdealKit ideal(gvn(), control(), merged_memory(), true);
+
+ // Convert the pointer to an int prior to doing math on it
+ Node* cast = __ CastPX(__ ctrl(), adr);
+
+ // Divide by card size
+ assert(Universe::heap()->barrier_set()->kind() == BarrierSet::CardTableModRef,
+ "Only one we handle so far.");
+ Node* card_offset = __ URShiftX( cast, __ ConI(CardTableModRefBS::card_shift) );
+
+ // Combine card table base and card offset
+ Node* card_adr = __ AddP(__ top(), byte_map_base_node(), card_offset );
+
+ // Get the alias_index for raw card-mark memory
+ int adr_type = Compile::AliasIdxRaw;
+ // Smash zero into card
+ Node* zero = __ ConI(0);
+ BasicType bt = T_BYTE;
+ if( !UseConcMarkSweepGC ) {
+ __ store(__ ctrl(), card_adr, zero, bt, adr_type);
+ } else {
+ // Specialized path for CM store barrier
+ __ storeCM(__ ctrl(), card_adr, zero, oop_store, bt, adr_type);
+ }
+
+ // Final sync IdealKit and GraphKit.
+ sync_kit(ideal);
+}
+
+// G1 pre/post barriers
void GraphKit::g1_write_barrier_pre(Node* obj,
Node* adr,
uint alias_idx,
Node* val,
- const Type* val_type,
+ const TypeOopPtr* val_type,
BasicType bt) {
IdealKit ideal(gvn(), control(), merged_memory(), true);
-#define __ ideal.
- __ declares_done();
-
- Node* thread = __ thread();
+
+ Node* tls = __ thread(); // ThreadLocalStorage
Node* no_ctrl = NULL;
Node* no_base = __ top();
@@ -3231,9 +3222,9 @@
// set_control( ctl);
- Node* marking_adr = __ AddP(no_base, thread, __ ConX(marking_offset));
- Node* buffer_adr = __ AddP(no_base, thread, __ ConX(buffer_offset));
- Node* index_adr = __ AddP(no_base, thread, __ ConX(index_offset));
+ Node* marking_adr = __ AddP(no_base, tls, __ ConX(marking_offset));
+ Node* buffer_adr = __ AddP(no_base, tls, __ ConX(buffer_offset));
+ Node* index_adr = __ AddP(no_base, tls, __ ConX(index_offset));
// Now some of the values
@@ -3261,55 +3252,52 @@
Node* next_index = __ SubI(index, __ ConI(sizeof(intptr_t)));
Node* next_indexX = next_index;
#ifdef _LP64
- // We could refine the type for what it's worth
- // const TypeLong* lidxtype = TypeLong::make(CONST64(0), get_size_from_queue);
- next_indexX = _gvn.transform( new (C, 2) ConvI2LNode(next_index, TypeLong::make(0, max_jlong, Type::WidenMax)) );
-#endif // _LP64
+ // We could refine the type for what it's worth
+ // const TypeLong* lidxtype = TypeLong::make(CONST64(0), get_size_from_queue);
+ next_indexX = _gvn.transform( new (C, 2) ConvI2LNode(next_index, TypeLong::make(0, max_jlong, Type::WidenMax)) );
+#endif
// Now get the buffer location we will log the original value into and store it
-
Node *log_addr = __ AddP(no_base, buffer, next_indexX);
- // __ store(__ ctrl(), log_addr, orig, T_OBJECT, C->get_alias_index(TypeOopPtr::BOTTOM));
__ store(__ ctrl(), log_addr, orig, T_OBJECT, Compile::AliasIdxRaw);
-
// update the index
- // __ store(__ ctrl(), index_adr, next_index, T_INT, Compile::AliasIdxRaw);
- // This is a hack to force this store to occur before the oop store that is coming up
- __ store(__ ctrl(), index_adr, next_index, T_INT, C->get_alias_index(TypeOopPtr::BOTTOM));
+ __ store(__ ctrl(), index_adr, next_index, T_INT, Compile::AliasIdxRaw);
} __ else_(); {
// logging buffer is full, call the runtime
const TypeFunc *tf = OptoRuntime::g1_wb_pre_Type();
- // __ make_leaf_call(tf, OptoRuntime::g1_wb_pre_Java(), "g1_wb_pre", orig, thread);
- __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), "g1_wb_pre", orig, thread);
- } __ end_if();
- } __ end_if();
- } __ end_if();
-
- __ drain_delay_transform();
- set_control( __ ctrl());
- set_all_memory( __ merged_memory());
-
-#undef __
+ __ make_leaf_call(tf, CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), "g1_wb_pre", orig, tls);
+ } __ end_if(); // (!index)
+ } __ end_if(); // (orig != NULL)
+ } __ end_if(); // (!marking)
+
+ // Final sync IdealKit and GraphKit.
+ sync_kit(ideal);
}
//
// Update the card table and add card address to the queue
//
-void GraphKit::g1_mark_card(IdealKit* ideal, Node* card_adr, Node* store, Node* index, Node* index_adr, Node* buffer, const TypeFunc* tf) {
-#define __ ideal->
+void GraphKit::g1_mark_card(IdealKit& ideal,
+ Node* card_adr,
+ Node* oop_store,
+ Node* index,
+ Node* index_adr,
+ Node* buffer,
+ const TypeFunc* tf) {
+
Node* zero = __ ConI(0);
Node* no_base = __ top();
BasicType card_bt = T_BYTE;
// Smash zero into card. MUST BE ORDERED WRT TO STORE
- __ storeCM(__ ctrl(), card_adr, zero, store, card_bt, Compile::AliasIdxRaw);
+ __ storeCM(__ ctrl(), card_adr, zero, oop_store, card_bt, Compile::AliasIdxRaw);
// Now do the queue work
__ if_then(index, BoolTest::ne, zero); {
- Node* next_index = __ SubI(index, __ ConI(sizeof(intptr_t)));
+ Node* next_index = __ SubI(index, __ ConI(sizeof(intptr_t)));
Node* next_indexX = next_index;
#ifdef _LP64
// We could refine the type for what it's worth
@@ -3324,10 +3312,10 @@
} __ else_(); {
__ make_leaf_call(tf, CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), "g1_wb_post", card_adr, __ thread());
} __ end_if();
-#undef __
+
}
-void GraphKit::g1_write_barrier_post(Node* store,
+void GraphKit::g1_write_barrier_post(Node* oop_store,
Node* obj,
Node* adr,
uint alias_idx,
@@ -3352,10 +3340,8 @@
assert(adr != NULL, "");
IdealKit ideal(gvn(), control(), merged_memory(), true);
-#define __ ideal.
- __ declares_done();
-
- Node* thread = __ thread();
+
+ Node* tls = __ thread(); // ThreadLocalStorage
Node* no_ctrl = NULL;
Node* no_base = __ top();
@@ -3377,8 +3363,8 @@
// Pointers into the thread
- Node* buffer_adr = __ AddP(no_base, thread, __ ConX(buffer_offset));
- Node* index_adr = __ AddP(no_base, thread, __ ConX(index_offset));
+ Node* buffer_adr = __ AddP(no_base, tls, __ ConX(buffer_offset));
+ Node* index_adr = __ AddP(no_base, tls, __ ConX(index_offset));
// Now some values
@@ -3387,18 +3373,14 @@
// Convert the store obj pointer to an int prior to doing math on it
- // Use addr not obj gets accurate card marks
-
- // Node* cast = __ CastPX(no_ctrl, adr /* obj */);
-
// Must use ctrl to prevent "integerized oop" existing across safepoint
- Node* cast = __ CastPX(__ ctrl(), ( use_precise ? adr : obj ));
+ Node* cast = __ CastPX(__ ctrl(), adr);
// Divide pointer by card size
Node* card_offset = __ URShiftX( cast, __ ConI(CardTableModRefBS::card_shift) );
// Combine card table base and card offset
- Node *card_adr = __ AddP(no_base, byte_map_base_node(), card_offset );
+ Node* card_adr = __ AddP(no_base, byte_map_base_node(), card_offset );
// If we know the value being stored does it cross regions?
@@ -3422,18 +3404,17 @@
Node* card_val = __ load(__ ctrl(), card_adr, TypeInt::INT, T_BYTE, Compile::AliasIdxRaw);
__ if_then(card_val, BoolTest::ne, zero); {
- g1_mark_card(&ideal, card_adr, store, index, index_adr, buffer, tf);
+ g1_mark_card(ideal, card_adr, oop_store, index, index_adr, buffer, tf);
} __ end_if();
} __ end_if();
} __ end_if();
} else {
- g1_mark_card(&ideal, card_adr, store, index, index_adr, buffer, tf);
+ // Object.clone() instrinsic uses this path.
+ g1_mark_card(ideal, card_adr, oop_store, index, index_adr, buffer, tf);
}
-
- __ drain_delay_transform();
- set_control( __ ctrl());
- set_all_memory( __ merged_memory());
+ // Final sync IdealKit and GraphKit.
+ sync_kit(ideal);
+}
#undef __
-}
--- a/hotspot/src/share/vm/opto/graphKit.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/graphKit.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -449,21 +449,34 @@
//
// If val==NULL, it is taken to be a completely unknown value. QQQ
+ Node* store_oop(Node* ctl,
+ Node* obj, // containing obj
+ Node* adr, // actual adress to store val at
+ const TypePtr* adr_type,
+ Node* val,
+ const TypeOopPtr* val_type,
+ BasicType bt,
+ bool use_precise);
+
Node* store_oop_to_object(Node* ctl,
Node* obj, // containing obj
Node* adr, // actual adress to store val at
const TypePtr* adr_type,
Node* val,
- const Type* val_type,
- BasicType bt);
+ const TypeOopPtr* val_type,
+ BasicType bt) {
+ return store_oop(ctl, obj, adr, adr_type, val, val_type, bt, false);
+ }
Node* store_oop_to_array(Node* ctl,
Node* obj, // containing obj
Node* adr, // actual adress to store val at
const TypePtr* adr_type,
Node* val,
- const Type* val_type,
- BasicType bt);
+ const TypeOopPtr* val_type,
+ BasicType bt) {
+ return store_oop(ctl, obj, adr, adr_type, val, val_type, bt, true);
+ }
// Could be an array or object we don't know at compile time (unsafe ref.)
Node* store_oop_to_unknown(Node* ctl,
@@ -471,12 +484,11 @@
Node* adr, // actual adress to store val at
const TypePtr* adr_type,
Node* val,
- const Type* val_type,
BasicType bt);
// For the few case where the barriers need special help
void pre_barrier(Node* ctl, Node* obj, Node* adr, uint adr_idx,
- Node* val, const Type* val_type, BasicType bt);
+ Node* val, const TypeOopPtr* val_type, BasicType bt);
void post_barrier(Node* ctl, Node* store, Node* obj, Node* adr, uint adr_idx,
Node* val, BasicType bt, bool use_precise);
@@ -489,9 +501,6 @@
// Return a load of array element at idx.
Node* load_array_element(Node* ctl, Node* ary, Node* idx, const TypeAryPtr* arytype);
- // CMS card-marks have an input from the corresponding oop_store
- void cms_card_mark(Node* ctl, Node* adr, Node* val, Node* oop_store);
-
//---------------- Dtrace support --------------------
void make_dtrace_method_entry_exit(ciMethod* method, bool is_entry);
void make_dtrace_method_entry(ciMethod* method) {
@@ -583,9 +592,6 @@
return C->too_many_recompiles(method(), bci(), reason);
}
- // vanilla/CMS post barrier
- void write_barrier_post(Node *store, Node* obj, Node* adr, Node* val, bool use_precise);
-
// Returns the object (if any) which was created the moment before.
Node* just_allocated_object(Node* current_control);
@@ -594,12 +600,17 @@
&& Universe::heap()->can_elide_tlab_store_barriers());
}
+ void sync_kit(IdealKit& ideal);
+
+ // vanilla/CMS post barrier
+ void write_barrier_post(Node *store, Node* obj, Node* adr, Node* val, bool use_precise);
+
// G1 pre/post barriers
void g1_write_barrier_pre(Node* obj,
Node* adr,
uint alias_idx,
Node* val,
- const Type* val_type,
+ const TypeOopPtr* val_type,
BasicType bt);
void g1_write_barrier_post(Node* store,
@@ -611,7 +622,7 @@
bool use_precise);
// Helper function for g1
private:
- void g1_mark_card(IdealKit* ideal, Node* card_adr, Node* store, Node* index, Node* index_adr,
+ void g1_mark_card(IdealKit& ideal, Node* card_adr, Node* store, Node* index, Node* index_adr,
Node* buffer, const TypeFunc* tf);
public:
--- a/hotspot/src/share/vm/opto/idealKit.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/idealKit.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -34,7 +34,7 @@
const uint IdealKit::first_var = TypeFunc::Parms + 1;
//----------------------------IdealKit-----------------------------------------
-IdealKit::IdealKit(PhaseGVN &gvn, Node* control, Node* mem, bool delay_all_transforms) :
+IdealKit::IdealKit(PhaseGVN &gvn, Node* control, Node* mem, bool delay_all_transforms, bool has_declarations) :
_gvn(gvn), C(gvn.C) {
_initial_ctrl = control;
_initial_memory = mem;
@@ -47,6 +47,9 @@
_pending_cvstates = new (C->node_arena()) GrowableArray<Node*>(C->node_arena(), init_size, 0, 0);
_delay_transform = new (C->node_arena()) GrowableArray<Node*>(C->node_arena(), init_size, 0, 0);
DEBUG_ONLY(_state = new (C->node_arena()) GrowableArray<int>(C->node_arena(), init_size, 0, 0));
+ if (!has_declarations) {
+ declarations_done();
+ }
}
//-------------------------------if_then-------------------------------------
@@ -97,7 +100,7 @@
//-------------------------------end_if-------------------------------------
// Merge the "then" and "else" cvstates.
//
-// The if_then() pushed the current state for later use
+// The if_then() pushed a copy of the current state for later use
// as the initial state for a future "else" clause. The
// current state then became the initial state for the
// then clause. If an "else" clause was encountered, it will
@@ -258,8 +261,8 @@
return delay_transform(PhiNode::make(reg, n, ct));
}
-//-----------------------------declares_done-----------------------------------
-void IdealKit::declares_done() {
+//-----------------------------declarations_done-------------------------------
+void IdealKit::declarations_done() {
_cvstate = new_cvstate(); // initialize current cvstate
set_ctrl(_initial_ctrl); // initialize control in current cvstate
set_all_memory(_initial_memory);// initialize memory in current cvstate
@@ -277,7 +280,9 @@
//-----------------------------delay_transform-----------------------------------
Node* IdealKit::delay_transform(Node* n) {
- gvn().set_type(n, n->bottom_type());
+ if (!gvn().is_IterGVN() || !gvn().is_IterGVN()->delay_transform()) {
+ gvn().set_type(n, n->bottom_type());
+ }
_delay_transform->push(n);
return n;
}
@@ -321,7 +326,9 @@
Node* IdealKit::memory(uint alias_idx) {
MergeMemNode* mem = merged_memory();
Node* p = mem->memory_at(alias_idx);
- _gvn.set_type(p, Type::MEMORY); // must be mapped
+ if (!gvn().is_IterGVN() || !gvn().is_IterGVN()->delay_transform()) {
+ _gvn.set_type(p, Type::MEMORY); // must be mapped
+ }
return p;
}
@@ -462,9 +469,6 @@
const TypePtr* adr_type = TypeRawPtr::BOTTOM;
uint adr_idx = C->get_alias_index(adr_type);
- // Clone initial memory
- MergeMemNode* cloned_mem = MergeMemNode::make(C, merged_memory());
-
// Slow-path leaf call
int size = slow_call_type->domain()->cnt();
CallNode *call = (CallNode*)new (C, size) CallLeafNode( slow_call_type, slow_call, leaf_name, adr_type);
@@ -489,9 +493,6 @@
set_ctrl(transform( new (C, 1) ProjNode(call,TypeFunc::Control) ));
- // Set the incoming clone of memory as current memory
- set_all_memory(cloned_mem);
-
// Make memory for the call
Node* mem = _gvn.transform( new (C, 1) ProjNode(call, TypeFunc::Memory) );
--- a/hotspot/src/share/vm/opto/idealKit.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/idealKit.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -49,7 +49,7 @@
// Example:
// Node* limit = ??
// IdealVariable i(kit), j(kit);
-// declares_done();
+// declarations_done();
// Node* exit = make_label(1); // 1 goto
// set(j, ConI(0));
// loop(i, ConI(0), BoolTest::lt, limit); {
@@ -101,10 +101,7 @@
Node* new_cvstate(); // Create a new cvstate
Node* cvstate() { return _cvstate; } // current cvstate
Node* copy_cvstate(); // copy current cvstate
- void set_ctrl(Node* ctrl) { _cvstate->set_req(TypeFunc::Control, ctrl); }
- // Should this assert this is a MergeMem???
- void set_all_memory(Node* mem){ _cvstate->set_req(TypeFunc::Memory, mem); }
void set_memory(Node* mem, uint alias_idx );
void do_memory_merge(Node* merging, Node* join);
void clear(Node* m); // clear a cvstate
@@ -132,15 +129,17 @@
Node* memory(uint alias_idx);
public:
- IdealKit(PhaseGVN &gvn, Node* control, Node* memory, bool delay_all_transforms = false);
+ IdealKit(PhaseGVN &gvn, Node* control, Node* memory, bool delay_all_transforms = false, bool has_declarations = false);
~IdealKit() {
stop();
drain_delay_transform();
}
// Control
Node* ctrl() { return _cvstate->in(TypeFunc::Control); }
+ void set_ctrl(Node* ctrl) { _cvstate->set_req(TypeFunc::Control, ctrl); }
Node* top() { return C->top(); }
MergeMemNode* merged_memory() { return _cvstate->in(TypeFunc::Memory)->as_MergeMem(); }
+ void set_all_memory(Node* mem) { _cvstate->set_req(TypeFunc::Memory, mem); }
void set(IdealVariable& v, Node* rhs) { _cvstate->set_req(first_var + v.id(), rhs); }
Node* value(IdealVariable& v) { return _cvstate->in(first_var + v.id()); }
void dead(IdealVariable& v) { set(v, (Node*)NULL); }
@@ -155,7 +154,7 @@
Node* make_label(int goto_ct);
void bind(Node* lab);
void goto_(Node* lab, bool bind = false);
- void declares_done();
+ void declarations_done();
void drain_delay_transform();
Node* IfTrue(IfNode* iff) { return transform(new (C,1) IfTrueNode(iff)); }
--- a/hotspot/src/share/vm/opto/ifnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/ifnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -378,7 +378,18 @@
// Force the original merge dead
igvn->hash_delete(r);
- r->set_req_X(0,NULL,igvn);
+ // First, remove region's dead users.
+ for (DUIterator_Last lmin, l = r->last_outs(lmin); l >= lmin;) {
+ Node* u = r->last_out(l);
+ if( u == r ) {
+ r->set_req(0, NULL);
+ } else {
+ assert(u->outcnt() == 0, "only dead users");
+ igvn->remove_dead_node(u);
+ }
+ l -= 1;
+ }
+ igvn->remove_dead_node(r);
// Now remove the bogus extra edges used to keep things alive
igvn->remove_dead_node( hook );
--- a/hotspot/src/share/vm/opto/library_call.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/library_call.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -165,6 +165,7 @@
bool inline_native_getLength();
bool inline_array_copyOf(bool is_copyOfRange);
bool inline_array_equals();
+ void copy_to_clone(Node* obj, Node* alloc_obj, Node* obj_size, bool is_array, bool card_mark);
bool inline_native_clone(bool is_virtual);
bool inline_native_Reflection_getCallerClass();
bool inline_native_AtomicLong_get();
@@ -181,7 +182,6 @@
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
Node* copy_length,
- int nargs, // arguments on stack for debug info
bool disjoint_bases = false,
bool length_never_negative = false,
RegionNode* slow_region = NULL);
@@ -202,17 +202,16 @@
void generate_slow_arraycopy(const TypePtr* adr_type,
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
- Node* copy_length,
- int nargs);
+ Node* copy_length);
Node* generate_checkcast_arraycopy(const TypePtr* adr_type,
Node* dest_elem_klass,
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
- Node* copy_length, int nargs);
+ Node* copy_length);
Node* generate_generic_arraycopy(const TypePtr* adr_type,
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
- Node* copy_length, int nargs);
+ Node* copy_length);
void generate_unchecked_arraycopy(const TypePtr* adr_type,
BasicType basic_elem_type,
bool disjoint_bases,
@@ -311,11 +310,6 @@
if (!InlineAtomicLong) return NULL;
break;
- case vmIntrinsics::_Object_init:
- case vmIntrinsics::_invoke:
- // We do not intrinsify these; they are marked for other purposes.
- return NULL;
-
case vmIntrinsics::_getCallerClass:
if (!UseNewReflection) return NULL;
if (!InlineReflectionGetCallerClass) return NULL;
@@ -328,6 +322,8 @@
break;
default:
+ assert(id <= vmIntrinsics::LAST_COMPILER_INLINE, "caller responsibility");
+ assert(id != vmIntrinsics::_Object_init && id != vmIntrinsics::_invoke, "enum out of order?");
break;
}
@@ -395,18 +391,11 @@
}
if (PrintIntrinsics) {
- switch (intrinsic_id()) {
- case vmIntrinsics::_invoke:
- case vmIntrinsics::_Object_init:
- // We do not expect to inline these, so do not produce any noise about them.
- break;
- default:
- tty->print("Did not inline intrinsic %s%s at bci:%d in",
- vmIntrinsics::name_at(intrinsic_id()),
- (is_virtual() ? " (virtual)" : ""), kit.bci());
- kit.caller()->print_short_name(tty);
- tty->print_cr(" (%d bytes)", kit.caller()->code_size());
- }
+ tty->print("Did not inline intrinsic %s%s at bci:%d in",
+ vmIntrinsics::name_at(intrinsic_id()),
+ (is_virtual() ? " (virtual)" : ""), kit.bci());
+ kit.caller()->print_short_name(tty);
+ tty->print_cr(" (%d bytes)", kit.caller()->code_size());
}
C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
return NULL;
@@ -1031,7 +1020,7 @@
const TypeAry* target_array_type = TypeAry::make(TypeInt::CHAR, TypeInt::make(0, target_length, Type::WidenMin));
const TypeAryPtr* target_type = TypeAryPtr::make(TypePtr::BotPTR, target_array_type, target_array->klass(), true, Type::OffsetBot);
- IdealKit kit(gvn(), control(), merged_memory());
+ IdealKit kit(gvn(), control(), merged_memory(), false, true);
#define __ kit.
Node* zero = __ ConI(0);
Node* one = __ ConI(1);
@@ -1043,7 +1032,7 @@
Node* targetOffset = __ ConI(targetOffset_i);
Node* sourceEnd = __ SubI(__ AddI(sourceOffset, sourceCount), targetCountLess1);
- IdealVariable rtn(kit), i(kit), j(kit); __ declares_done();
+ IdealVariable rtn(kit), i(kit), j(kit); __ declarations_done();
Node* outer_loop = __ make_label(2 /* goto */);
Node* return_ = __ make_label(1);
@@ -1080,9 +1069,9 @@
__ bind(outer_loop);
}__ end_loop(); __ dead(i);
__ bind(return_);
- __ drain_delay_transform();
-
- set_control(__ ctrl());
+
+ // Final sync IdealKit and GraphKit.
+ sync_kit(kit);
Node* result = __ value(rtn);
#undef __
C->set_has_loops(true);
@@ -2178,21 +2167,29 @@
// Possibly an oop being stored to Java heap or native memory
if (!TypePtr::NULL_PTR->higher_equal(_gvn.type(heap_base_oop))) {
// oop to Java heap.
- (void) store_oop_to_unknown(control(), heap_base_oop, adr, adr_type, val, val->bottom_type(), type);
+ (void) store_oop_to_unknown(control(), heap_base_oop, adr, adr_type, val, type);
} else {
-
// We can't tell at compile time if we are storing in the Java heap or outside
// of it. So we need to emit code to conditionally do the proper type of
// store.
- IdealKit kit(gvn(), control(), merged_memory());
- kit.declares_done();
+ IdealKit ideal(gvn(), control(), merged_memory());
+#define __ ideal.
// QQQ who knows what probability is here??
- kit.if_then(heap_base_oop, BoolTest::ne, null(), PROB_UNLIKELY(0.999)); {
- (void) store_oop_to_unknown(control(), heap_base_oop, adr, adr_type, val, val->bottom_type(), type);
- } kit.else_(); {
- (void) store_to_memory(control(), adr, val, type, adr_type, is_volatile);
- } kit.end_if();
+ __ if_then(heap_base_oop, BoolTest::ne, null(), PROB_UNLIKELY(0.999)); {
+ // Sync IdealKit and graphKit.
+ set_all_memory( __ merged_memory());
+ set_control(__ ctrl());
+ Node* st = store_oop_to_unknown(control(), heap_base_oop, adr, adr_type, val, type);
+ // Update IdealKit memory.
+ __ set_all_memory(merged_memory());
+ __ set_ctrl(control());
+ } __ else_(); {
+ __ store(__ ctrl(), adr, val, type, alias_type->index(), is_volatile);
+ } __ end_if();
+ // Final sync IdealKit and GraphKit.
+ sync_kit(ideal);
+#undef __
}
}
}
@@ -2394,7 +2391,7 @@
case T_OBJECT:
// reference stores need a store barrier.
// (They don't if CAS fails, but it isn't worth checking.)
- pre_barrier(control(), base, adr, alias_idx, newval, value_type, T_OBJECT);
+ pre_barrier(control(), base, adr, alias_idx, newval, value_type->make_oopptr(), T_OBJECT);
#ifdef _LP64
if (adr->bottom_type()->is_ptr_to_narrowoop()) {
Node *newval_enc = _gvn.transform(new (C, 2) EncodePNode(newval, newval->bottom_type()->make_narrowoop()));
@@ -2489,7 +2486,7 @@
bool require_atomic_access = true;
Node* store;
if (type == T_OBJECT) // reference stores need a store barrier.
- store = store_oop_to_unknown(control(), base, adr, adr_type, val, value_type, type);
+ store = store_oop_to_unknown(control(), base, adr, adr_type, val, type);
else {
store = store_to_memory(control(), adr, val, type, adr_type, require_atomic_access);
}
@@ -3230,7 +3227,8 @@
Node* orig_tail = _gvn.transform( new(C, 3) SubINode(orig_length, start) );
Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length);
- Node* newcopy = new_array(klass_node, length, nargs);
+ const bool raw_mem_only = true;
+ Node* newcopy = new_array(klass_node, length, nargs, raw_mem_only);
// Generate a direct call to the right arraycopy function(s).
// We know the copy is disjoint but we might not know if the
@@ -3241,7 +3239,7 @@
bool length_never_negative = true;
generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
original, start, newcopy, intcon(0), moved,
- nargs, disjoint_bases, length_never_negative);
+ disjoint_bases, length_never_negative);
push(newcopy);
}
@@ -3883,6 +3881,98 @@
return true;
}
+//------------------------clone_coping-----------------------------------
+// Helper function for inline_native_clone.
+void LibraryCallKit::copy_to_clone(Node* obj, Node* alloc_obj, Node* obj_size, bool is_array, bool card_mark) {
+ assert(obj_size != NULL, "");
+ Node* raw_obj = alloc_obj->in(1);
+ assert(alloc_obj->is_CheckCastPP() && raw_obj->is_Proj() && raw_obj->in(0)->is_Allocate(), "");
+
+ if (ReduceBulkZeroing) {
+ // We will be completely responsible for initializing this object -
+ // mark Initialize node as complete.
+ AllocateNode* alloc = AllocateNode::Ideal_allocation(alloc_obj, &_gvn);
+ // The object was just allocated - there should be no any stores!
+ guarantee(alloc != NULL && alloc->maybe_set_complete(&_gvn), "");
+ }
+
+ // Cast to Object for arraycopy.
+ // We can't use the original CheckCastPP since it should be moved
+ // after the arraycopy to prevent stores flowing above it.
+ Node* new_obj = new(C, 2) CheckCastPPNode(alloc_obj->in(0), raw_obj,
+ TypeInstPtr::NOTNULL);
+ new_obj = _gvn.transform(new_obj);
+ // Substitute in the locally valid dest_oop.
+ replace_in_map(alloc_obj, new_obj);
+
+ // Copy the fastest available way.
+ // TODO: generate fields copies for small objects instead.
+ Node* src = obj;
+ Node* dest = new_obj;
+ Node* size = _gvn.transform(obj_size);
+
+ // Exclude the header but include array length to copy by 8 bytes words.
+ // Can't use base_offset_in_bytes(bt) since basic type is unknown.
+ int base_off = is_array ? arrayOopDesc::length_offset_in_bytes() :
+ instanceOopDesc::base_offset_in_bytes();
+ // base_off:
+ // 8 - 32-bit VM
+ // 12 - 64-bit VM, compressed oops
+ // 16 - 64-bit VM, normal oops
+ if (base_off % BytesPerLong != 0) {
+ assert(UseCompressedOops, "");
+ if (is_array) {
+ // Exclude length to copy by 8 bytes words.
+ base_off += sizeof(int);
+ } else {
+ // Include klass to copy by 8 bytes words.
+ base_off = instanceOopDesc::klass_offset_in_bytes();
+ }
+ assert(base_off % BytesPerLong == 0, "expect 8 bytes alignment");
+ }
+ src = basic_plus_adr(src, base_off);
+ dest = basic_plus_adr(dest, base_off);
+
+ // Compute the length also, if needed:
+ Node* countx = size;
+ countx = _gvn.transform( new (C, 3) SubXNode(countx, MakeConX(base_off)) );
+ countx = _gvn.transform( new (C, 3) URShiftXNode(countx, intcon(LogBytesPerLong) ));
+
+ const TypePtr* raw_adr_type = TypeRawPtr::BOTTOM;
+ bool disjoint_bases = true;
+ generate_unchecked_arraycopy(raw_adr_type, T_LONG, disjoint_bases,
+ src, NULL, dest, NULL, countx);
+
+ // If necessary, emit some card marks afterwards. (Non-arrays only.)
+ if (card_mark) {
+ assert(!is_array, "");
+ // Put in store barrier for any and all oops we are sticking
+ // into this object. (We could avoid this if we could prove
+ // that the object type contains no oop fields at all.)
+ Node* no_particular_value = NULL;
+ Node* no_particular_field = NULL;
+ int raw_adr_idx = Compile::AliasIdxRaw;
+ post_barrier(control(),
+ memory(raw_adr_type),
+ new_obj,
+ no_particular_field,
+ raw_adr_idx,
+ no_particular_value,
+ T_OBJECT,
+ false);
+ }
+
+ // Move the original CheckCastPP after arraycopy.
+ _gvn.hash_delete(alloc_obj);
+ alloc_obj->set_req(0, control());
+ // Replace raw memory edge with new CheckCastPP to have a live oop
+ // at safepoints instead of raw value.
+ assert(new_obj->is_CheckCastPP() && new_obj->in(1) == alloc_obj->in(1), "sanity");
+ alloc_obj->set_req(1, new_obj); // cast to the original type
+ _gvn.hash_find_insert(alloc_obj); // put back into GVN table
+ // Restore in the locally valid dest_oop.
+ replace_in_map(new_obj, alloc_obj);
+}
//------------------------inline_native_clone----------------------------
// Here are the simple edge cases:
@@ -3917,8 +4007,9 @@
// paths into result_reg:
enum {
_slow_path = 1, // out-of-line call to clone method (virtual or not)
- _objArray_path, // plain allocation, plus arrayof_oop_arraycopy
- _fast_path, // plain allocation, plus a CopyArray operation
+ _objArray_path, // plain array allocation, plus arrayof_oop_arraycopy
+ _array_path, // plain array allocation, plus arrayof_long_arraycopy
+ _instance_path, // plain instance allocation, plus arrayof_long_arraycopy
PATH_LIMIT
};
RegionNode* result_reg = new(C, PATH_LIMIT) RegionNode(PATH_LIMIT);
@@ -3933,18 +4024,6 @@
int raw_adr_idx = Compile::AliasIdxRaw;
const bool raw_mem_only = true;
- // paths into alloc_reg (on the fast path, just before the CopyArray):
- enum { _typeArray_alloc = 1, _instance_alloc, ALLOC_LIMIT };
- RegionNode* alloc_reg = new(C, ALLOC_LIMIT) RegionNode(ALLOC_LIMIT);
- PhiNode* alloc_val = new(C, ALLOC_LIMIT) PhiNode(alloc_reg, raw_adr_type);
- PhiNode* alloc_siz = new(C, ALLOC_LIMIT) PhiNode(alloc_reg, TypeX_X);
- PhiNode* alloc_i_o = new(C, ALLOC_LIMIT) PhiNode(alloc_reg, Type::ABIO);
- PhiNode* alloc_mem = new(C, ALLOC_LIMIT) PhiNode(alloc_reg, Type::MEMORY,
- raw_adr_type);
- record_for_igvn(alloc_reg);
-
- bool card_mark = false; // (see below)
-
Node* array_ctl = generate_array_guard(obj_klass, (RegionNode*)NULL);
if (array_ctl != NULL) {
// It's an array.
@@ -3954,16 +4033,6 @@
Node* obj_size = NULL;
Node* alloc_obj = new_array(obj_klass, obj_length, nargs,
raw_mem_only, &obj_size);
- assert(obj_size != NULL, "");
- Node* raw_obj = alloc_obj->in(1);
- assert(raw_obj->is_Proj() && raw_obj->in(0)->is_Allocate(), "");
- if (ReduceBulkZeroing) {
- AllocateNode* alloc = AllocateNode::Ideal_allocation(alloc_obj, &_gvn);
- if (alloc != NULL) {
- // We will be completely responsible for initializing this object.
- alloc->maybe_set_complete(&_gvn);
- }
- }
if (!use_ReduceInitialCardMarks()) {
// If it is an oop array, it requires very special treatment,
@@ -3977,7 +4046,7 @@
bool length_never_negative = true;
generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
obj, intcon(0), alloc_obj, intcon(0),
- obj_length, nargs,
+ obj_length,
disjoint_bases, length_never_negative);
result_reg->init_req(_objArray_path, control());
result_val->init_req(_objArray_path, alloc_obj);
@@ -3992,19 +4061,24 @@
// the object.
// Otherwise, there are no card marks to worry about.
- alloc_val->init_req(_typeArray_alloc, raw_obj);
- alloc_siz->init_req(_typeArray_alloc, obj_size);
- alloc_reg->init_req(_typeArray_alloc, control());
- alloc_i_o->init_req(_typeArray_alloc, i_o());
- alloc_mem->init_req(_typeArray_alloc, memory(raw_adr_type));
+
+ if (!stopped()) {
+ copy_to_clone(obj, alloc_obj, obj_size, true, false);
+
+ // Present the results of the copy.
+ result_reg->init_req(_array_path, control());
+ result_val->init_req(_array_path, alloc_obj);
+ result_i_o ->set_req(_array_path, i_o());
+ result_mem ->set_req(_array_path, reset_memory());
+ }
}
- // We only go to the fast case code if we pass a number of guards.
+ // We only go to the instance fast case code if we pass a number of guards.
// The paths which do not pass are accumulated in the slow_region.
RegionNode* slow_region = new (C, 1) RegionNode(1);
record_for_igvn(slow_region);
if (!stopped()) {
- // It's an instance. Make the slow-path tests.
+ // It's an instance (we did array above). Make the slow-path tests.
// If this is a virtual call, we generate a funny guard. We grab
// the vtable entry corresponding to clone() from the target object.
// If the target method which we are calling happens to be the
@@ -4031,25 +4105,14 @@
PreserveJVMState pjvms(this);
Node* obj_size = NULL;
Node* alloc_obj = new_instance(obj_klass, NULL, raw_mem_only, &obj_size);
- assert(obj_size != NULL, "");
- Node* raw_obj = alloc_obj->in(1);
- assert(raw_obj->is_Proj() && raw_obj->in(0)->is_Allocate(), "");
- if (ReduceBulkZeroing) {
- AllocateNode* alloc = AllocateNode::Ideal_allocation(alloc_obj, &_gvn);
- if (alloc != NULL && !alloc->maybe_set_complete(&_gvn))
- alloc = NULL;
- }
- if (!use_ReduceInitialCardMarks()) {
- // Put in store barrier for any and all oops we are sticking
- // into this object. (We could avoid this if we could prove
- // that the object type contains no oop fields at all.)
- card_mark = true;
- }
- alloc_val->init_req(_instance_alloc, raw_obj);
- alloc_siz->init_req(_instance_alloc, obj_size);
- alloc_reg->init_req(_instance_alloc, control());
- alloc_i_o->init_req(_instance_alloc, i_o());
- alloc_mem->init_req(_instance_alloc, memory(raw_adr_type));
+
+ copy_to_clone(obj, alloc_obj, obj_size, false, !use_ReduceInitialCardMarks());
+
+ // Present the results of the slow call.
+ result_reg->init_req(_instance_path, control());
+ result_val->init_req(_instance_path, alloc_obj);
+ result_i_o ->set_req(_instance_path, i_o());
+ result_mem ->set_req(_instance_path, reset_memory());
}
// Generate code for the slow case. We make a call to clone().
@@ -4065,82 +4128,12 @@
result_mem ->set_req(_slow_path, reset_memory());
}
- // The object is allocated, as an array and/or an instance. Now copy it.
- set_control( _gvn.transform(alloc_reg) );
- set_i_o( _gvn.transform(alloc_i_o) );
- set_memory( _gvn.transform(alloc_mem), raw_adr_type );
- Node* raw_obj = _gvn.transform(alloc_val);
-
- if (!stopped()) {
- // Copy the fastest available way.
- // (No need for PreserveJVMState, since we're using it all up now.)
- // TODO: generate fields/elements copies for small objects instead.
- Node* src = obj;
- Node* dest = raw_obj;
- Node* size = _gvn.transform(alloc_siz);
-
- // Exclude the header.
- int base_off = instanceOopDesc::base_offset_in_bytes();
- if (UseCompressedOops) {
- assert(base_off % BytesPerLong != 0, "base with compressed oops");
- // With compressed oops base_offset_in_bytes is 12 which creates
- // the gap since countx is rounded by 8 bytes below.
- // Copy klass and the gap.
- base_off = instanceOopDesc::klass_offset_in_bytes();
- }
- src = basic_plus_adr(src, base_off);
- dest = basic_plus_adr(dest, base_off);
-
- // Compute the length also, if needed:
- Node* countx = size;
- countx = _gvn.transform( new (C, 3) SubXNode(countx, MakeConX(base_off)) );
- countx = _gvn.transform( new (C, 3) URShiftXNode(countx, intcon(LogBytesPerLong) ));
-
- // Select an appropriate instruction to initialize the range.
- // The CopyArray instruction (if supported) can be optimized
- // into a discrete set of scalar loads and stores.
- bool disjoint_bases = true;
- generate_unchecked_arraycopy(raw_adr_type, T_LONG, disjoint_bases,
- src, NULL, dest, NULL, countx);
-
- // Now that the object is properly initialized, type it as an oop.
- // Use a secondary InitializeNode memory barrier.
- InitializeNode* init = insert_mem_bar_volatile(Op_Initialize, raw_adr_idx,
- raw_obj)->as_Initialize();
- init->set_complete(&_gvn); // (there is no corresponding AllocateNode)
- Node* new_obj = new(C, 2) CheckCastPPNode(control(), raw_obj,
- TypeInstPtr::NOTNULL);
- new_obj = _gvn.transform(new_obj);
-
- // If necessary, emit some card marks afterwards. (Non-arrays only.)
- if (card_mark) {
- Node* no_particular_value = NULL;
- Node* no_particular_field = NULL;
- post_barrier(control(),
- memory(raw_adr_type),
- new_obj,
- no_particular_field,
- raw_adr_idx,
- no_particular_value,
- T_OBJECT,
- false);
- }
- // Present the results of the slow call.
- result_reg->init_req(_fast_path, control());
- result_val->init_req(_fast_path, new_obj);
- result_i_o ->set_req(_fast_path, i_o());
- result_mem ->set_req(_fast_path, reset_memory());
- }
-
// Return the combined state.
set_control( _gvn.transform(result_reg) );
set_i_o( _gvn.transform(result_i_o) );
set_all_memory( _gvn.transform(result_mem) );
- // Cast the result to a sharper type, since we know what clone does.
- Node* new_obj = _gvn.transform(result_val);
- Node* cast = new (C, 2) CheckCastPPNode(control(), new_obj, toop);
- push(_gvn.transform(cast));
+ push(_gvn.transform(result_val));
return true;
}
@@ -4279,8 +4272,7 @@
// Call StubRoutines::generic_arraycopy stub.
generate_arraycopy(TypeRawPtr::BOTTOM, T_CONFLICT,
- src, src_offset, dest, dest_offset, length,
- nargs);
+ src, src_offset, dest, dest_offset, length);
// Do not let reads from the destination float above the arraycopy.
// Since we cannot type the arrays, we don't know which slices
@@ -4303,8 +4295,7 @@
// The component types are not the same or are not recognized. Punt.
// (But, avoid the native method wrapper to JVM_ArrayCopy.)
generate_slow_arraycopy(TypePtr::BOTTOM,
- src, src_offset, dest, dest_offset, length,
- nargs);
+ src, src_offset, dest, dest_offset, length);
return true;
}
@@ -4361,7 +4352,7 @@
const TypePtr* adr_type = TypeAryPtr::get_array_body_type(dest_elem);
generate_arraycopy(adr_type, dest_elem,
src, src_offset, dest, dest_offset, length,
- nargs, false, false, slow_region);
+ false, false, slow_region);
return true;
}
@@ -4406,7 +4397,6 @@
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
Node* copy_length,
- int nargs,
bool disjoint_bases,
bool length_never_negative,
RegionNode* slow_region) {
@@ -4418,7 +4408,6 @@
Node* original_dest = dest;
AllocateArrayNode* alloc = NULL; // used for zeroing, if needed
- Node* raw_dest = NULL; // used before zeroing, if needed
bool must_clear_dest = false;
// See if this is the initialization of a newly-allocated array.
@@ -4437,15 +4426,18 @@
// "You break it, you buy it."
InitializeNode* init = alloc->initialization();
assert(init->is_complete(), "we just did this");
- assert(dest->Opcode() == Op_CheckCastPP, "sanity");
+ assert(dest->is_CheckCastPP(), "sanity");
assert(dest->in(0)->in(0) == init, "dest pinned");
- raw_dest = dest->in(1); // grab the raw pointer!
- original_dest = dest;
- dest = raw_dest;
+
+ // Cast to Object for arraycopy.
+ // We can't use the original CheckCastPP since it should be moved
+ // after the arraycopy to prevent stores flowing above it.
+ Node* new_obj = new(C, 2) CheckCastPPNode(dest->in(0), dest->in(1),
+ TypeInstPtr::NOTNULL);
+ dest = _gvn.transform(new_obj);
+ // Substitute in the locally valid dest_oop.
+ replace_in_map(original_dest, dest);
adr_type = TypeRawPtr::BOTTOM; // all initializations are into raw memory
- // Decouple the original InitializeNode, turning it into a simple membar.
- // We will build a new one at the end of this routine.
- init->set_req(InitializeNode::RawAddress, top());
// From this point on, every exit path is responsible for
// initializing any non-copied parts of the object to zero.
must_clear_dest = true;
@@ -4488,7 +4480,7 @@
assert(!must_clear_dest, "");
Node* cv = generate_generic_arraycopy(adr_type,
src, src_offset, dest, dest_offset,
- copy_length, nargs);
+ copy_length);
if (cv == NULL) cv = intcon(-1); // failure (no stub available)
checked_control = control();
checked_i_o = i_o();
@@ -4507,16 +4499,24 @@
generate_negative_guard(copy_length, slow_region);
}
+ // copy_length is 0.
if (!stopped() && must_clear_dest) {
Node* dest_length = alloc->in(AllocateNode::ALength);
if (_gvn.eqv_uncast(copy_length, dest_length)
|| _gvn.find_int_con(dest_length, 1) <= 0) {
- // There is no zeroing to do.
+ // There is no zeroing to do. No need for a secondary raw memory barrier.
} else {
// Clear the whole thing since there are no source elements to copy.
generate_clear_array(adr_type, dest, basic_elem_type,
intcon(0), NULL,
alloc->in(AllocateNode::AllocSize));
+ // Use a secondary InitializeNode as raw memory barrier.
+ // Currently it is needed only on this path since other
+ // paths have stub or runtime calls as raw memory barriers.
+ InitializeNode* init = insert_mem_bar_volatile(Op_Initialize,
+ Compile::AliasIdxRaw,
+ top())->as_Initialize();
+ init->set_complete(&_gvn); // (there is no corresponding AllocateNode)
}
}
@@ -4638,8 +4638,7 @@
Node* cv = generate_checkcast_arraycopy(adr_type,
dest_elem_klass,
src, src_offset, dest, dest_offset,
- copy_length,
- nargs);
+ copy_length);
if (cv == NULL) cv = intcon(-1); // failure (no stub available)
checked_control = control();
checked_i_o = i_o();
@@ -4701,8 +4700,8 @@
slow_i_o2 ->init_req(1, slow_i_o);
slow_mem2 ->init_req(1, slow_mem);
slow_reg2 ->init_req(2, control());
- slow_i_o2 ->init_req(2, i_o());
- slow_mem2 ->init_req(2, memory(adr_type));
+ slow_i_o2 ->init_req(2, checked_i_o);
+ slow_mem2 ->init_req(2, checked_mem);
slow_control = _gvn.transform(slow_reg2);
slow_i_o = _gvn.transform(slow_i_o2);
@@ -4747,21 +4746,9 @@
alloc->in(AllocateNode::AllocSize));
}
- if (dest != original_dest) {
- // Promote from rawptr to oop, so it looks right in the call's GC map.
- dest = _gvn.transform( new(C,2) CheckCastPPNode(control(), dest,
- TypeInstPtr::NOTNULL) );
-
- // Edit the call's debug-info to avoid referring to original_dest.
- // (The problem with original_dest is that it isn't ready until
- // after the InitializeNode completes, but this stuff is before.)
- // Substitute in the locally valid dest_oop.
- replace_in_map(original_dest, dest);
- }
-
generate_slow_arraycopy(adr_type,
src, src_offset, dest, dest_offset,
- copy_length, nargs);
+ copy_length);
result_region->init_req(slow_call_path, control());
result_i_o ->init_req(slow_call_path, i_o());
@@ -4781,16 +4768,16 @@
if (dest != original_dest) {
// Pin the "finished" array node after the arraycopy/zeroing operations.
- // Use a secondary InitializeNode memory barrier.
- InitializeNode* init = insert_mem_bar_volatile(Op_Initialize,
- Compile::AliasIdxRaw,
- raw_dest)->as_Initialize();
- init->set_complete(&_gvn); // (there is no corresponding AllocateNode)
_gvn.hash_delete(original_dest);
original_dest->set_req(0, control());
+ // Replace raw memory edge with new CheckCastPP to have a live oop
+ // at safepoints instead of raw value.
+ assert(dest->is_CheckCastPP() && dest->in(1) == original_dest->in(1), "sanity");
+ original_dest->set_req(1, dest); // cast to the original type
_gvn.hash_find_insert(original_dest); // put back into GVN table
+ // Restore in the locally valid dest_oop.
+ replace_in_map(dest, original_dest);
}
-
// The memory edges above are precise in order to model effects around
// array copies accurately to allow value numbering of field loads around
// arraycopy. Such field loads, both before and after, are common in Java
@@ -5074,16 +5061,13 @@
LibraryCallKit::generate_slow_arraycopy(const TypePtr* adr_type,
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
- Node* copy_length,
- int nargs) {
- _sp += nargs; // any deopt will start just before call to enclosing method
+ Node* copy_length) {
Node* call = make_runtime_call(RC_NO_LEAF | RC_UNCOMMON,
OptoRuntime::slow_arraycopy_Type(),
OptoRuntime::slow_arraycopy_Java(),
"slow_arraycopy", adr_type,
src, src_offset, dest, dest_offset,
copy_length);
- _sp -= nargs;
// Handle exceptions thrown by this fellow:
make_slow_call_ex(call, env()->Throwable_klass(), false);
@@ -5095,8 +5079,7 @@
Node* dest_elem_klass,
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
- Node* copy_length,
- int nargs) {
+ Node* copy_length) {
if (stopped()) return NULL;
address copyfunc_addr = StubRoutines::checkcast_arraycopy();
@@ -5137,8 +5120,7 @@
LibraryCallKit::generate_generic_arraycopy(const TypePtr* adr_type,
Node* src, Node* src_offset,
Node* dest, Node* dest_offset,
- Node* copy_length,
- int nargs) {
+ Node* copy_length) {
if (stopped()) return NULL;
address copyfunc_addr = StubRoutines::generic_arraycopy();
--- a/hotspot/src/share/vm/opto/loopTransform.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/loopopts.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/loopopts.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -346,7 +346,10 @@
// Yes! Reshape address expression!
Node *inv_scale = new (C, 3) LShiftINode( add_invar, scale );
- register_new_node( inv_scale, add_invar_ctrl );
+ Node *inv_scale_ctrl =
+ dom_depth(add_invar_ctrl) > dom_depth(scale_ctrl) ?
+ add_invar_ctrl : scale_ctrl;
+ register_new_node( inv_scale, inv_scale_ctrl );
Node *var_scale = new (C, 3) LShiftINode( add_var, scale );
register_new_node( var_scale, n_ctrl );
Node *var_add = new (C, 3) AddINode( var_scale, inv_scale );
@@ -667,7 +670,6 @@
}
}
-#ifdef _LP64
static bool merge_point_safe(Node* region) {
// 4799512: Stop split_if_with_blocks from splitting a block with a ConvI2LNode
// having a PhiNode input. This sidesteps the dangerous case where the split
@@ -676,20 +678,25 @@
// uses.
// A better fix for this problem can be found in the BugTraq entry, but
// expediency for Mantis demands this hack.
+ // 6855164: If the merge point has a FastLockNode with a PhiNode input, we stop
+ // split_if_with_blocks from splitting a block because we could not move around
+ // the FastLockNode.
for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) {
Node* n = region->fast_out(i);
if (n->is_Phi()) {
for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++) {
Node* m = n->fast_out(j);
- if (m->Opcode() == Op_ConvI2L) {
+ if (m->is_FastLock())
return false;
- }
+#ifdef _LP64
+ if (m->Opcode() == Op_ConvI2L)
+ return false;
+#endif
}
}
}
return true;
}
-#endif
//------------------------------place_near_use---------------------------------
@@ -771,12 +778,10 @@
if( get_loop(n_ctrl->in(j)) != n_loop )
return;
-#ifdef _LP64
// Check for safety of the merge point.
if( !merge_point_safe(n_ctrl) ) {
return;
}
-#endif
// Split compare 'n' through the merge point if it is profitable
Node *phi = split_thru_phi( n, n_ctrl, policy );
--- a/hotspot/src/share/vm/opto/machnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/machnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -300,6 +300,12 @@
}
}
adr_type = t_disp->add_offset(offset);
+ } else if( base == NULL && offset != 0 && offset != Type::OffsetBot ) {
+ // Use ideal type if it is oop ptr.
+ const TypePtr *tp = oper->type()->isa_ptr();
+ if( tp != NULL) {
+ adr_type = tp;
+ }
}
}
--- a/hotspot/src/share/vm/opto/macro.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/macro.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -198,14 +198,79 @@
}
// Eliminate a card mark sequence. p2x is a ConvP2XNode
-void PhaseMacroExpand::eliminate_card_mark(Node *p2x) {
+void PhaseMacroExpand::eliminate_card_mark(Node* p2x) {
assert(p2x->Opcode() == Op_CastP2X, "ConvP2XNode required");
- Node *shift = p2x->unique_out();
- Node *addp = shift->unique_out();
- for (DUIterator_Last jmin, j = addp->last_outs(jmin); j >= jmin; --j) {
- Node *st = addp->last_out(j);
- assert(st->is_Store(), "store required");
- _igvn.replace_node(st, st->in(MemNode::Memory));
+ if (!UseG1GC) {
+ // vanilla/CMS post barrier
+ Node *shift = p2x->unique_out();
+ Node *addp = shift->unique_out();
+ for (DUIterator_Last jmin, j = addp->last_outs(jmin); j >= jmin; --j) {
+ Node *st = addp->last_out(j);
+ assert(st->is_Store(), "store required");
+ _igvn.replace_node(st, st->in(MemNode::Memory));
+ }
+ } else {
+ // G1 pre/post barriers
+ assert(p2x->outcnt() == 2, "expects 2 users: Xor and URShift nodes");
+ // It could be only one user, URShift node, in Object.clone() instrinsic
+ // but the new allocation is passed to arraycopy stub and it could not
+ // be scalar replaced. So we don't check the case.
+
+ // Remove G1 post barrier.
+
+ // Search for CastP2X->Xor->URShift->Cmp path which
+ // checks if the store done to a different from the value's region.
+ // And replace Cmp with #0 (false) to collapse G1 post barrier.
+ Node* xorx = NULL;
+ for (DUIterator_Fast imax, i = p2x->fast_outs(imax); i < imax; i++) {
+ Node* u = p2x->fast_out(i);
+ if (u->Opcode() == Op_XorX) {
+ xorx = u;
+ break;
+ }
+ }
+ assert(xorx != NULL, "missing G1 post barrier");
+ Node* shift = xorx->unique_out();
+ Node* cmpx = shift->unique_out();
+ assert(cmpx->is_Cmp() && cmpx->unique_out()->is_Bool() &&
+ cmpx->unique_out()->as_Bool()->_test._test == BoolTest::ne,
+ "missing region check in G1 post barrier");
+ _igvn.replace_node(cmpx, makecon(TypeInt::CC_EQ));
+
+ // Remove G1 pre barrier.
+
+ // Search "if (marking != 0)" check and set it to "false".
+ Node* this_region = p2x->in(0);
+ assert(this_region != NULL, "");
+ // There is no G1 pre barrier if previous stored value is NULL
+ // (for example, after initialization).
+ if (this_region->is_Region() && this_region->req() == 3) {
+ int ind = 1;
+ if (!this_region->in(ind)->is_IfFalse()) {
+ ind = 2;
+ }
+ if (this_region->in(ind)->is_IfFalse()) {
+ Node* bol = this_region->in(ind)->in(0)->in(1);
+ assert(bol->is_Bool(), "");
+ cmpx = bol->in(1);
+ if (bol->as_Bool()->_test._test == BoolTest::ne &&
+ cmpx->is_Cmp() && cmpx->in(2) == intcon(0) &&
+ cmpx->in(1)->is_Load()) {
+ Node* adr = cmpx->in(1)->as_Load()->in(MemNode::Address);
+ const int marking_offset = in_bytes(JavaThread::satb_mark_queue_offset() +
+ PtrQueue::byte_offset_of_active());
+ if (adr->is_AddP() && adr->in(AddPNode::Base) == top() &&
+ adr->in(AddPNode::Address)->Opcode() == Op_ThreadLocal &&
+ adr->in(AddPNode::Offset) == MakeConX(marking_offset)) {
+ _igvn.replace_node(cmpx, makecon(TypeInt::CC_EQ));
+ }
+ }
+ }
+ }
+ // Now CastP2X can be removed since it is used only on dead path
+ // which currently still alive until igvn optimize it.
+ assert(p2x->unique_out()->Opcode() == Op_URShiftX, "");
+ _igvn.replace_node(p2x, top());
}
}
@@ -760,14 +825,11 @@
if (n->is_Store()) {
_igvn.replace_node(n, n->in(MemNode::Memory));
} else {
- assert( n->Opcode() == Op_CastP2X, "CastP2X required");
eliminate_card_mark(n);
}
k -= (oc2 - use->outcnt());
}
} else {
- assert( !use->is_SafePoint(), "safepoint uses must have been already elimiated");
- assert( use->Opcode() == Op_CastP2X, "CastP2X required");
eliminate_card_mark(use);
}
j -= (oc1 - res->outcnt());
--- a/hotspot/src/share/vm/opto/matcher.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/matcher.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -141,6 +141,10 @@
//---------------------------match---------------------------------------------
void Matcher::match( ) {
+ if( MaxLabelRootDepth < 100 ) { // Too small?
+ assert(false, "invalid MaxLabelRootDepth, increase it to 100 minimum");
+ MaxLabelRootDepth = 100;
+ }
// One-time initialization of some register masks.
init_spill_mask( C->root()->in(1) );
_return_addr_mask = return_addr();
@@ -1485,8 +1489,7 @@
#ifdef ASSERT
// Verify adr type after matching memory operation
const MachOper* oper = mach->memory_operand();
- if (oper != NULL && oper != (MachOper*)-1 &&
- mach->adr_type() != TypeRawPtr::BOTTOM) { // non-direct addressing mode
+ if (oper != NULL && oper != (MachOper*)-1) {
// It has a unique memory operand. Find corresponding ideal mem node.
Node* m = NULL;
if (leaf->is_Mem()) {
--- a/hotspot/src/share/vm/opto/matcher.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/matcher.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/mulnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/mulnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -430,31 +430,28 @@
// x & x => x
if (phase->eqv(in(1), in(2))) return in(1);
- Node *load = in(1);
- const TypeInt *t2 = phase->type( in(2) )->isa_int();
- if( t2 && t2->is_con() ) {
+ Node* in1 = in(1);
+ uint op = in1->Opcode();
+ const TypeInt* t2 = phase->type(in(2))->isa_int();
+ if (t2 && t2->is_con()) {
int con = t2->get_con();
// Masking off high bits which are always zero is useless.
const TypeInt* t1 = phase->type( in(1) )->isa_int();
if (t1 != NULL && t1->_lo >= 0) {
- jint t1_support = ((jint)1 << (1 + log2_intptr(t1->_hi))) - 1;
+ jint t1_support = right_n_bits(1 + log2_intptr(t1->_hi));
if ((t1_support & con) == t1_support)
- return load;
+ return in1;
}
- uint lop = load->Opcode();
- if( lop == Op_LoadUS &&
- con == 0x0000FFFF ) // Already zero-extended
- return load;
// Masking off the high bits of a unsigned-shift-right is not
// needed either.
- if( lop == Op_URShiftI ) {
- const TypeInt *t12 = phase->type( load->in(2) )->isa_int();
- if( t12 && t12->is_con() ) { // Shift is by a constant
+ if (op == Op_URShiftI) {
+ const TypeInt* t12 = phase->type(in1->in(2))->isa_int();
+ if (t12 && t12->is_con()) { // Shift is by a constant
int shift = t12->get_con();
shift &= BitsPerJavaInteger - 1; // semantics of Java shifts
int mask = max_juint >> shift;
- if( (mask&con) == mask ) // If AND is useless, skip it
- return load;
+ if ((mask & con) == mask) // If AND is useless, skip it
+ return in1;
}
}
}
@@ -476,26 +473,17 @@
return new (phase->C, 3) AndINode(load,phase->intcon(mask&0xFFFF));
// Masking bits off of a Short? Loading a Character does some masking
- if( lop == Op_LoadS &&
- (mask & 0xFFFF0000) == 0 ) {
+ if (lop == Op_LoadS && (mask & 0xFFFF0000) == 0 ) {
Node *ldus = new (phase->C, 3) LoadUSNode(load->in(MemNode::Control),
- load->in(MemNode::Memory),
- load->in(MemNode::Address),
- load->adr_type());
+ load->in(MemNode::Memory),
+ load->in(MemNode::Address),
+ load->adr_type());
ldus = phase->transform(ldus);
- return new (phase->C, 3) AndINode(ldus, phase->intcon(mask&0xFFFF));
+ return new (phase->C, 3) AndINode(ldus, phase->intcon(mask & 0xFFFF));
}
- // Masking sign bits off of a Byte? Do an unsigned byte load.
- if (lop == Op_LoadB && mask == 0x000000FF) {
- return new (phase->C, 3) LoadUBNode(load->in(MemNode::Control),
- load->in(MemNode::Memory),
- load->in(MemNode::Address),
- load->adr_type());
- }
-
- // Masking sign bits off of a Byte plus additional lower bits? Do
- // an unsigned byte load plus an and.
+ // Masking sign bits off of a Byte? Do an unsigned byte load plus
+ // an and.
if (lop == Op_LoadB && (mask & 0xFFFFFF00) == 0) {
Node* ldub = new (phase->C, 3) LoadUBNode(load->in(MemNode::Control),
load->in(MemNode::Memory),
@@ -605,8 +593,13 @@
Node* in1 = in(1);
uint op = in1->Opcode();
- // Masking sign bits off of an integer? Do an unsigned integer to long load.
- if (op == Op_ConvI2L && in1->in(1)->Opcode() == Op_LoadI && mask == 0x00000000FFFFFFFFL) {
+ // Masking sign bits off of an integer? Do an unsigned integer to
+ // long load.
+ // NOTE: This check must be *before* we try to convert the AndLNode
+ // to an AndINode and commute it with ConvI2LNode because
+ // 0xFFFFFFFFL masks the whole integer and we get a sign extension,
+ // which is wrong.
+ if (op == Op_ConvI2L && in1->in(1)->Opcode() == Op_LoadI && mask == CONST64(0x00000000FFFFFFFF)) {
Node* load = in1->in(1);
return new (phase->C, 3) LoadUI2LNode(load->in(MemNode::Control),
load->in(MemNode::Memory),
@@ -614,9 +607,22 @@
load->adr_type());
}
+ // Are we masking a long that was converted from an int with a mask
+ // that fits in 32-bits? Commute them and use an AndINode.
+ if (op == Op_ConvI2L && (mask & CONST64(0xFFFFFFFF00000000)) == 0) {
+ // If we are doing an UI2L conversion (i.e. the mask is
+ // 0x00000000FFFFFFFF) we cannot convert the AndL to an AndI
+ // because the AndI would be optimized away later in Identity.
+ if (mask != CONST64(0x00000000FFFFFFFF)) {
+ Node* andi = new (phase->C, 3) AndINode(in1->in(1), phase->intcon(mask));
+ andi = phase->transform(andi);
+ return new (phase->C, 2) ConvI2LNode(andi);
+ }
+ }
+
// Masking off sign bits? Dont make them!
if (op == Op_RShiftL) {
- const TypeInt *t12 = phase->type(in1->in(2))->isa_int();
+ const TypeInt* t12 = phase->type(in1->in(2))->isa_int();
if( t12 && t12->is_con() ) { // Shift is by a constant
int shift = t12->get_con();
shift &= BitsPerJavaLong - 1; // semantics of Java shifts
@@ -626,7 +632,7 @@
if( (sign_bits_mask & mask) == 0 ) {
// Use zero-fill shift instead
Node *zshift = phase->transform(new (phase->C, 3) URShiftLNode(in1->in(1), in1->in(2)));
- return new (phase->C, 3) AndLNode( zshift, in(2) );
+ return new (phase->C, 3) AndLNode(zshift, in(2));
}
}
}
--- a/hotspot/src/share/vm/opto/output.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/output.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,13 @@
init_scratch_buffer_blob();
if (failing()) return; // Out of memory
+ // The number of new nodes (mostly MachNop) is proportional to
+ // the number of java calls and inner loops which are aligned.
+ if ( C->check_node_count((NodeLimitFudgeFactor + C->java_calls()*3 +
+ C->inner_loops()*(OptoLoopAlignment-1)),
+ "out of nodes before code generation" ) ) {
+ return;
+ }
// Make sure I can find the Start Node
Block_Array& bbs = _cfg->_bbs;
Block *entry = _cfg->_blocks[1];
@@ -1105,7 +1112,7 @@
uint *call_returns = NEW_RESOURCE_ARRAY(uint, _cfg->_num_blocks+1);
uint return_offset = 0;
- MachNode *nop = new (this) MachNopNode();
+ int nop_size = (new (this) MachNopNode())->size(_regalloc);
int previous_offset = 0;
int current_offset = 0;
@@ -1188,7 +1195,6 @@
}
// align the instruction if necessary
- int nop_size = nop->size(_regalloc);
int padding = mach->compute_padding(current_offset);
// Make sure safepoint node for polling is distinct from a call's
// return by adding a nop if needed.
@@ -1372,7 +1378,6 @@
// If the next block is the top of a loop, pad this block out to align
// the loop top a little. Helps prevent pipe stalls at loop back branches.
- int nop_size = (new (this) MachNopNode())->size(_regalloc);
if( i<_cfg->_num_blocks-1 ) {
Block *nb = _cfg->_blocks[i+1];
uint padding = nb->alignment_padding(current_offset);
--- a/hotspot/src/share/vm/opto/parse.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/parse.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/parse1.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/parse1.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/parse2.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/parse2.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1565,7 +1565,7 @@
c = pop(); // Oop to store
b = pop(); // index (already used)
a = pop(); // the array itself
- const Type* elemtype = _gvn.type(a)->is_aryptr()->elem();
+ const TypeOopPtr* elemtype = _gvn.type(a)->is_aryptr()->elem()->make_oopptr();
const TypeAryPtr* adr_type = TypeAryPtr::OOPS;
Node* store = store_oop_to_array(control(), a, d, adr_type, c, elemtype, T_OBJECT);
break;
--- a/hotspot/src/share/vm/opto/parse3.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/parse3.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -222,7 +222,7 @@
// Store the value.
Node* store;
if (bt == T_OBJECT) {
- const TypePtr* field_type;
+ const TypeOopPtr* field_type;
if (!field->type()->is_loaded()) {
field_type = TypeInstPtr::BOTTOM;
} else {
@@ -361,7 +361,7 @@
guarantee(length_con >= 0, "non-constant multianewarray");
ciArrayKlass* array_klass_1 = array_klass->as_obj_array_klass()->element_klass()->as_array_klass();
const TypePtr* adr_type = TypeAryPtr::OOPS;
- const Type* elemtype = _gvn.type(array)->is_aryptr()->elem();
+ const TypeOopPtr* elemtype = _gvn.type(array)->is_aryptr()->elem()->make_oopptr();
const intptr_t header = arrayOopDesc::base_offset_in_bytes(T_OBJECT);
for (jint i = 0; i < length_con; i++) {
Node* elem = expand_multianewarray(array_klass_1, &lengths[1], ndimensions-1, nargs);
--- a/hotspot/src/share/vm/opto/parseHelper.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/parseHelper.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/phaseX.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/phaseX.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -450,6 +450,8 @@
subsume_node(old, nn);
}
+ bool delay_transform() const { return _delay_transform; }
+
void set_delay_transform(bool delay) {
_delay_transform = delay;
}
--- a/hotspot/src/share/vm/opto/subnode.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/subnode.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/superword.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/superword.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/opto/type.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/type.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -487,6 +487,23 @@
return false;
}
+//----------------------interface_vs_oop---------------------------------------
+#ifdef ASSERT
+bool Type::interface_vs_oop(const Type *t) const {
+ bool result = false;
+
+ const TypeInstPtr* this_inst = this->isa_instptr();
+ const TypeInstPtr* t_inst = t->isa_instptr();
+ if( this_inst && this_inst->is_loaded() && t_inst && t_inst->is_loaded() ) {
+ bool this_interface = this_inst->klass()->is_interface();
+ bool t_interface = t_inst->klass()->is_interface();
+ result = this_interface ^ t_interface;
+ }
+
+ return result;
+}
+#endif
+
//------------------------------meet-------------------------------------------
// Compute the MEET of two types. NOT virtual. It enforces that meet is
// commutative and the lattice is symmetric.
@@ -507,16 +524,8 @@
// Interface meet Oop is Not Symmetric:
// Interface:AnyNull meet Oop:AnyNull == Interface:AnyNull
// Interface:NotNull meet Oop:NotNull == java/lang/Object:NotNull
- const TypeInstPtr* this_inst = this->isa_instptr();
- const TypeInstPtr* t_inst = t->isa_instptr();
- bool interface_vs_oop = false;
- if( this_inst && this_inst->is_loaded() && t_inst && t_inst->is_loaded() ) {
- bool this_interface = this_inst->klass()->is_interface();
- bool t_interface = t_inst->klass()->is_interface();
- interface_vs_oop = this_interface ^ t_interface;
- }
-
- if( !interface_vs_oop && (t2t != t->_dual || t2this != _dual) ) {
+
+ if( !interface_vs_oop(t) && (t2t != t->_dual || t2this != _dual) ) {
tty->print_cr("=== Meet Not Symmetric ===");
tty->print("t = "); t->dump(); tty->cr();
tty->print("this= "); dump(); tty->cr();
@@ -1800,6 +1809,17 @@
return (intptr_t)_elem + (intptr_t)_size;
}
+//----------------------interface_vs_oop---------------------------------------
+#ifdef ASSERT
+bool TypeAry::interface_vs_oop(const Type *t) const {
+ const TypeAry* t_ary = t->is_ary();
+ if (t_ary) {
+ return _elem->interface_vs_oop(t_ary->_elem);
+ }
+ return false;
+}
+#endif
+
//------------------------------dump2------------------------------------------
#ifndef PRODUCT
void TypeAry::dump2( Dict &d, uint depth, outputStream *st ) const {
@@ -3389,6 +3409,17 @@
return new TypeAryPtr( dual_ptr(), _const_oop, _ary->dual()->is_ary(),_klass, _klass_is_exact, dual_offset(), dual_instance_id() );
}
+//----------------------interface_vs_oop---------------------------------------
+#ifdef ASSERT
+bool TypeAryPtr::interface_vs_oop(const Type *t) const {
+ const TypeAryPtr* t_aryptr = t->isa_aryptr();
+ if (t_aryptr) {
+ return _ary->interface_vs_oop(t_aryptr->_ary);
+ }
+ return false;
+}
+#endif
+
//------------------------------dump2------------------------------------------
#ifndef PRODUCT
void TypeAryPtr::dump2( Dict &d, uint depth, outputStream *st ) const {
@@ -3453,27 +3484,27 @@
//------------------------------hash-------------------------------------------
// Type-specific hashing function.
int TypeNarrowOop::hash(void) const {
- return _ooptype->hash() + 7;
+ return _ptrtype->hash() + 7;
}
bool TypeNarrowOop::eq( const Type *t ) const {
const TypeNarrowOop* tc = t->isa_narrowoop();
if (tc != NULL) {
- if (_ooptype->base() != tc->_ooptype->base()) {
+ if (_ptrtype->base() != tc->_ptrtype->base()) {
return false;
}
- return tc->_ooptype->eq(_ooptype);
+ return tc->_ptrtype->eq(_ptrtype);
}
return false;
}
bool TypeNarrowOop::singleton(void) const { // TRUE if type is a singleton
- return _ooptype->singleton();
+ return _ptrtype->singleton();
}
bool TypeNarrowOop::empty(void) const {
- return _ooptype->empty();
+ return _ptrtype->empty();
}
//------------------------------xmeet------------------------------------------
@@ -3507,7 +3538,7 @@
return this;
case NarrowOop: {
- const Type* result = _ooptype->xmeet(t->make_ptr());
+ const Type* result = _ptrtype->xmeet(t->make_ptr());
if (result->isa_ptr()) {
return TypeNarrowOop::make(result->is_ptr());
}
@@ -3523,13 +3554,13 @@
}
const Type *TypeNarrowOop::xdual() const { // Compute dual right now.
- const TypePtr* odual = _ooptype->dual()->is_ptr();
+ const TypePtr* odual = _ptrtype->dual()->is_ptr();
return new TypeNarrowOop(odual);
}
const Type *TypeNarrowOop::filter( const Type *kills ) const {
if (kills->isa_narrowoop()) {
- const Type* ft =_ooptype->filter(kills->is_narrowoop()->_ooptype);
+ const Type* ft =_ptrtype->filter(kills->is_narrowoop()->_ptrtype);
if (ft->empty())
return Type::TOP; // Canonical empty value
if (ft->isa_ptr()) {
@@ -3537,7 +3568,7 @@
}
return ft;
} else if (kills->isa_ptr()) {
- const Type* ft = _ooptype->join(kills);
+ const Type* ft = _ptrtype->join(kills);
if (ft->empty())
return Type::TOP; // Canonical empty value
return ft;
@@ -3548,13 +3579,13 @@
intptr_t TypeNarrowOop::get_con() const {
- return _ooptype->get_con();
+ return _ptrtype->get_con();
}
#ifndef PRODUCT
void TypeNarrowOop::dump2( Dict & d, uint depth, outputStream *st ) const {
st->print("narrowoop: ");
- _ooptype->dump2(d, depth, st);
+ _ptrtype->dump2(d, depth, st);
}
#endif
--- a/hotspot/src/share/vm/opto/type.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/opto/type.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -190,6 +190,11 @@
// Currently, it also works around limitations involving interface types.
virtual const Type *filter( const Type *kills ) const;
+#ifdef ASSERT
+ // One type is interface, the other is oop
+ virtual bool interface_vs_oop(const Type *t) const;
+#endif
+
// Returns true if this pointer points at memory which contains a
// compressed oop references.
bool is_ptr_to_narrowoop() const;
@@ -227,6 +232,11 @@
// Returns this ptr type or the equivalent ptr type for this compressed pointer.
const TypePtr* make_ptr() const;
+
+ // Returns this oopptr type or the equivalent oopptr type for this compressed pointer.
+ // Asserts if the underlying type is not an oopptr or narrowoop.
+ const TypeOopPtr* make_oopptr() const;
+
// Returns this compressed pointer or the equivalent compressed version
// of this pointer type.
const TypeNarrowOop* make_narrowoop() const;
@@ -546,6 +556,10 @@
virtual const Type *xmeet( const Type *t ) const;
virtual const Type *xdual() const; // Compute dual right now.
bool ary_must_be_exact() const; // true if arrays of such are never generic
+#ifdef ASSERT
+ // One type is interface, the other is oop
+ virtual bool interface_vs_oop(const Type *t) const;
+#endif
#ifndef PRODUCT
virtual void dump2( Dict &d, uint, outputStream *st ) const; // Specialized per-Type dumping
#endif
@@ -867,6 +881,10 @@
}
static const TypeAryPtr *_array_body_type[T_CONFLICT+1];
// sharpen the type of an int which is used as an array size
+#ifdef ASSERT
+ // One type is interface, the other is oop
+ virtual bool interface_vs_oop(const Type *t) const;
+#endif
#ifndef PRODUCT
virtual void dump2( Dict &d, uint depth, outputStream *st ) const; // Specialized per-Type dumping
#endif
@@ -919,13 +937,13 @@
// between the normal and the compressed form.
class TypeNarrowOop : public Type {
protected:
- const TypePtr* _ooptype; // Could be TypePtr::NULL_PTR
+ const TypePtr* _ptrtype; // Could be TypePtr::NULL_PTR
- TypeNarrowOop( const TypePtr* ooptype): Type(NarrowOop),
- _ooptype(ooptype) {
- assert(ooptype->offset() == 0 ||
- ooptype->offset() == OffsetBot ||
- ooptype->offset() == OffsetTop, "no real offsets");
+ TypeNarrowOop( const TypePtr* ptrtype): Type(NarrowOop),
+ _ptrtype(ptrtype) {
+ assert(ptrtype->offset() == 0 ||
+ ptrtype->offset() == OffsetBot ||
+ ptrtype->offset() == OffsetTop, "no real offsets");
}
public:
virtual bool eq( const Type *t ) const;
@@ -949,8 +967,8 @@
}
// returns the equivalent ptr type for this compressed pointer
- const TypePtr *make_oopptr() const {
- return _ooptype;
+ const TypePtr *get_ptrtype() const {
+ return _ptrtype;
}
static const TypeNarrowOop *BOTTOM;
@@ -1137,10 +1155,14 @@
}
inline const TypePtr* Type::make_ptr() const {
- return (_base == NarrowOop) ? is_narrowoop()->make_oopptr() :
+ return (_base == NarrowOop) ? is_narrowoop()->get_ptrtype() :
(isa_ptr() ? is_ptr() : NULL);
}
+inline const TypeOopPtr* Type::make_oopptr() const {
+ return (_base == NarrowOop) ? is_narrowoop()->get_ptrtype()->is_oopptr() : is_oopptr();
+}
+
inline const TypeNarrowOop* Type::make_narrowoop() const {
return (_base == NarrowOop) ? is_narrowoop() :
(isa_ptr() ? TypeNarrowOop::make(is_ptr()) : NULL);
@@ -1194,6 +1216,8 @@
#define Op_AndX Op_AndL
#define Op_AddX Op_AddL
#define Op_SubX Op_SubL
+#define Op_XorX Op_XorL
+#define Op_URShiftX Op_URShiftL
// conversions
#define ConvI2X(x) ConvI2L(x)
#define ConvL2X(x) (x)
@@ -1236,6 +1260,8 @@
#define Op_AndX Op_AndI
#define Op_AddX Op_AddI
#define Op_SubX Op_SubI
+#define Op_XorX Op_XorI
+#define Op_URShiftX Op_URShiftI
// conversions
#define ConvI2X(x) (x)
#define ConvL2X(x) ConvL2I(x)
--- a/hotspot/src/share/vm/prims/jvm_misc.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/prims/jvm_misc.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -606,6 +606,7 @@
if (!mons->is_empty()) {
for (int i = 0; i < mons->length(); i++) {
MonitorInfo *mi = mons->at(i);
+ if (mi->owner_is_scalar_replaced()) continue;
// see if owner of the monitor is our object
if (mi->owner() != NULL && mi->owner() == hobj()) {
@@ -726,6 +727,8 @@
for (int i = 0; i < mons->length(); i++) {
MonitorInfo *mi = mons->at(i);
+ if (mi->owner_is_scalar_replaced()) continue;
+
oop obj = mi->owner();
if (obj == NULL) {
// this monitor doesn't have an owning object so skip it
--- a/hotspot/src/share/vm/prims/methodComparator.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/prims/methodComparator.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/prims/unsafe.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/prims/unsafe.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1048,7 +1048,11 @@
oop e = JNIHandles::resolve(e_h);
oop p = JNIHandles::resolve(obj);
HeapWord* addr = (HeapWord *)index_oop_from_field_offset_long(p, offset);
- update_barrier_set_pre((void*)addr, e);
+ if (UseCompressedOops) {
+ update_barrier_set_pre((narrowOop*)addr, e);
+ } else {
+ update_barrier_set_pre((oop*)addr, e);
+ }
oop res = oopDesc::atomic_compare_exchange_oop(x, addr, e);
jboolean success = (res == e);
if (success)
--- a/hotspot/src/share/vm/runtime/arguments.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1202,18 +1202,13 @@
}
#ifdef _LP64
- // Compressed Headers do not work with CMS, which uses a bit in the klass
- // field offset to determine free list chunk markers.
// Check that UseCompressedOops can be set with the max heap size allocated
// by ergonomics.
if (MaxHeapSize <= max_heap_for_compressed_oops()) {
- if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
+ if (FLAG_IS_DEFAULT(UseCompressedOops)) {
// Turn off until bug is fixed.
// the following line to return it to default status.
// FLAG_SET_ERGO(bool, UseCompressedOops, true);
- } else if (UseCompressedOops && UseG1GC) {
- warning(" UseCompressedOops does not currently work with UseG1GC; switching off UseCompressedOops. ");
- FLAG_SET_DEFAULT(UseCompressedOops, false);
}
#ifdef _WIN64
if (UseLargePages && UseCompressedOops) {
@@ -1454,6 +1449,7 @@
if (UseSerialGC) i++;
if (UseConcMarkSweepGC || UseParNewGC) i++;
if (UseParallelGC || UseParallelOldGC) i++;
+ if (UseG1GC) i++;
if (i > 1) {
jio_fprintf(defaultStream::error_stream(),
"Conflicting collector combinations in option list; "
@@ -2603,22 +2599,6 @@
return result;
}
- // These are hacks until G1 is fully supported and tested
- // but lets you force -XX:+UseG1GC in PRT and get it where it (mostly) works
- if (UseG1GC) {
- if (UseConcMarkSweepGC || UseParNewGC || UseParallelGC || UseParallelOldGC || UseSerialGC) {
-#ifndef PRODUCT
- tty->print_cr("-XX:+UseG1GC is incompatible with other collectors, using UseG1GC");
-#endif // PRODUCT
- UseConcMarkSweepGC = false;
- UseParNewGC = false;
- UseParallelGC = false;
- UseParallelOldGC = false;
- UseSerialGC = false;
- }
- no_shared_spaces();
- }
-
#ifndef PRODUCT
if (TraceBytecodesAt != 0) {
TraceBytecodes = true;
@@ -2676,10 +2656,7 @@
} else if (UseParNewGC) {
// Set some flags for ParNew
set_parnew_gc_flags();
- }
- // Temporary; make the "if" an "else-if" before
- // we integrate G1. XXX
- if (UseG1GC) {
+ } else if (UseG1GC) {
// Set some flags for garbage-first, if needed.
set_g1_gc_flags();
}
--- a/hotspot/src/share/vm/runtime/biasedLocking.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/biasedLocking.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -121,6 +121,7 @@
// Walk monitors youngest to oldest
for (int i = len - 1; i >= 0; i--) {
MonitorInfo* mon_info = monitors->at(i);
+ if (mon_info->owner_is_scalar_replaced()) continue;
oop owner = mon_info->owner();
if (owner != NULL) {
info->append(mon_info);
@@ -694,6 +695,7 @@
// Walk monitors youngest to oldest
for (int i = len - 1; i >= 0; i--) {
MonitorInfo* mon_info = monitors->at(i);
+ if (mon_info->owner_is_scalar_replaced()) continue;
oop owner = mon_info->owner();
if (owner != NULL) {
markOop mark = owner->mark();
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -933,7 +933,7 @@
GrowableArray<MonitorInfo*>* monitors = cvf->monitors();
for (int i = 0; i < monitors->length(); i++) {
MonitorInfo* mon_info = monitors->at(i);
- if (mon_info->owner() != NULL && !mon_info->eliminated()) {
+ if (!mon_info->eliminated() && mon_info->owner() != NULL) {
objects_to_revoke->append(Handle(mon_info->owner()));
}
}
--- a/hotspot/src/share/vm/runtime/dtraceJSDT.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/dtraceJSDT.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/frame.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/frame.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/globals.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/globals.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1994,6 +1994,10 @@
product_rw(bool, PrintHeapAtGC, false, \
"Print heap layout before and after each GC") \
\
+ product_rw(bool, PrintHeapAtGCExtended, false, \
+ "Prints extended information about the layout of the heap " \
+ "when -XX:+PrintHeapAtGC is set") \
+ \
product(bool, PrintHeapAtSIGBREAK, true, \
"Print heap layout in response to SIGBREAK") \
\
--- a/hotspot/src/share/vm/runtime/hpi.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/hpi.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/interfaceSupport.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/orderAccess.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/orderAccess.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/orderAccess.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/orderAccess.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/safepoint.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -49,7 +49,7 @@
// In the future we should investigate whether CMS can use the
// more-general mechanism below. DLD (01/05).
ConcurrentMarkSweepThread::synchronize(false);
- } else {
+ } else if (UseG1GC) {
ConcurrentGCThread::safepoint_synchronize();
}
#endif // SERIALGC
@@ -400,7 +400,7 @@
// If there are any concurrent GC threads resume them.
if (UseConcMarkSweepGC) {
ConcurrentMarkSweepThread::desynchronize(false);
- } else {
+ } else if (UseG1GC) {
ConcurrentGCThread::safepoint_desynchronize();
}
#endif // SERIALGC
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -119,6 +119,7 @@
assert(false, "should be optimized out");
return;
}
+ assert(orig->is_oop(true /* ignore mark word */), "Error");
// store the original value that was in the field reference
thread->satb_mark_queue().enqueue(orig);
JRT_END
--- a/hotspot/src/share/vm/runtime/stackValue.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/stackValue.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,17 @@
}
#endif
case Location::oop: {
- Handle h(*(oop *)value_addr); // Wrap a handle around the oop
+ oop val = *(oop *)value_addr;
+#ifdef _LP64
+ if (Universe::is_narrow_oop_base(val)) {
+ // Compiled code may produce decoded oop = narrow_oop_base
+ // when a narrow oop implicit null check is used.
+ // The narrow_oop_base could be NULL or be the address
+ // of the page below heap. Use NULL value for both cases.
+ val = (oop)NULL;
+ }
+#endif
+ Handle h(val); // Wrap a handle around the oop
return new StackValue(h);
}
case Location::addr: {
@@ -146,8 +156,9 @@
value.jl = ((ConstantLongValue *)sv)->value();
return new StackValue(value.p);
#endif
- } else if (sv->is_object()) {
- return new StackValue(((ObjectValue *)sv)->value());
+ } else if (sv->is_object()) { // Scalar replaced object in compiled frame
+ Handle ov = ((ObjectValue *)sv)->value();
+ return new StackValue(ov, (ov.is_null()) ? 1 : 0);
}
// Unknown ScopeValue type
--- a/hotspot/src/share/vm/runtime/stackValue.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/stackValue.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,11 @@
_i = value;
}
- StackValue(Handle value) {
+ StackValue(Handle value, intptr_t scalar_replaced = 0) {
_type = T_OBJECT;
+ _i = scalar_replaced;
_o = value;
+ assert(_i == 0 || _o.is_null(), "not null object should not be marked as scalar replaced");
}
StackValue() {
@@ -56,6 +58,11 @@
return _o;
}
+ bool obj_is_scalar_replaced() const {
+ assert(type() == T_OBJECT, "type check");
+ return _i != 0;
+ }
+
void set_obj(Handle value) {
assert(type() == T_OBJECT, "type check");
_o = value;
--- a/hotspot/src/share/vm/runtime/thread.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/thread.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/thread.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/thread.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/vframe.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vframe.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -106,6 +106,7 @@
for (int index = (mons->length()-1); index >= 0; index--) {
MonitorInfo* monitor = mons->at(index);
+ if (monitor->eliminated() && is_compiled_frame()) continue; // skip eliminated monitor
oop obj = monitor->owner();
if (obj == NULL) continue; // skip unowned monitor
//
@@ -162,6 +163,18 @@
bool found_first_monitor = false;
for (int index = (mons->length()-1); index >= 0; index--) {
MonitorInfo* monitor = mons->at(index);
+ if (monitor->eliminated() && is_compiled_frame()) { // Eliminated in compiled code
+ if (monitor->owner_is_scalar_replaced()) {
+ Klass* k = Klass::cast(monitor->owner_klass());
+ st->print("\t- eliminated <owner is scalar replaced> (a %s)", k->external_name());
+ } else {
+ oop obj = monitor->owner();
+ if (obj != NULL) {
+ print_locked_object_class_name(st, obj, "eliminated");
+ }
+ }
+ continue;
+ }
if (monitor->owner() != NULL) {
// First, assume we have the monitor locked. If we haven't found an
@@ -171,11 +184,11 @@
const char *lock_state = "locked"; // assume we have the monitor locked
if (!found_first_monitor && frame_count == 0) {
- markOop mark = monitor->owner()->mark();
- if (mark->has_monitor() &&
- mark->monitor() == thread()->current_pending_monitor()) {
+ markOop mark = monitor->owner()->mark();
+ if (mark->has_monitor() &&
+ mark->monitor() == thread()->current_pending_monitor()) {
lock_state = "waiting to lock";
- }
+ }
}
found_first_monitor = true;
@@ -206,7 +219,7 @@
for (BasicObjectLock* current = (fr().previous_monitor_in_interpreter_frame(fr().interpreter_frame_monitor_begin()));
current >= fr().interpreter_frame_monitor_end();
current = fr().previous_monitor_in_interpreter_frame(current)) {
- result->push(new MonitorInfo(current->obj(), current->lock(), false));
+ result->push(new MonitorInfo(current->obj(), current->lock(), false, false));
}
return result;
}
@@ -531,8 +544,18 @@
tty->print_cr("\tmonitor list:");
for (int index = (list->length()-1); index >= 0; index--) {
MonitorInfo* monitor = list->at(index);
- tty->print("\t obj\t"); monitor->owner()->print_value();
- tty->print("(" INTPTR_FORMAT ")", (address)monitor->owner());
+ tty->print("\t obj\t");
+ if (monitor->owner_is_scalar_replaced()) {
+ Klass* k = Klass::cast(monitor->owner_klass());
+ tty->print("( is scalar replaced %s)", k->external_name());
+ } else if (monitor->owner() == NULL) {
+ tty->print("( null )");
+ } else {
+ monitor->owner()->print_value();
+ tty->print("(" INTPTR_FORMAT ")", (address)monitor->owner());
+ }
+ if (monitor->eliminated() && is_compiled_frame())
+ tty->print(" ( lock is eliminated )");
tty->cr();
tty->print("\t ");
monitor->lock()->print_on(tty);
--- a/hotspot/src/share/vm/runtime/vframe.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vframe.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -230,18 +230,36 @@
private:
oop _owner; // the object owning the monitor
BasicLock* _lock;
+ oop _owner_klass; // klass if owner was scalar replaced
bool _eliminated;
+ bool _owner_is_scalar_replaced;
public:
// Constructor
- MonitorInfo(oop owner, BasicLock* lock, bool eliminated) {
- _owner = owner;
+ MonitorInfo(oop owner, BasicLock* lock, bool eliminated, bool owner_is_scalar_replaced) {
+ if (!owner_is_scalar_replaced) {
+ _owner = owner;
+ _owner_klass = NULL;
+ } else {
+ assert(eliminated, "monitor should be eliminated for scalar replaced object");
+ _owner = NULL;
+ _owner_klass = owner;
+ }
_lock = lock;
_eliminated = eliminated;
+ _owner_is_scalar_replaced = owner_is_scalar_replaced;
}
// Accessors
- oop owner() const { return _owner; }
+ oop owner() const {
+ assert(!_owner_is_scalar_replaced, "should not be called for scalar replaced object");
+ return _owner;
+ }
+ klassOop owner_klass() const {
+ assert(_owner_is_scalar_replaced, "should not be called for not scalar replaced object");
+ return (klassOop)_owner_klass;
+ }
BasicLock* lock() const { return _lock; }
bool eliminated() const { return _eliminated; }
+ bool owner_is_scalar_replaced() const { return _owner_is_scalar_replaced; }
};
class vframeStreamCommon : StackObj {
--- a/hotspot/src/share/vm/runtime/vframeArray.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vframeArray.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@
// Migrate the BasicLocks from the stack to the monitor chunk
for (index = 0; index < list->length(); index++) {
MonitorInfo* monitor = list->at(index);
+ assert(!monitor->owner_is_scalar_replaced(), "object should be reallocated already");
assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased");
BasicObjectLock* dest = _monitors->at(index);
dest->set_obj(monitor->owner());
@@ -89,6 +90,7 @@
StackValue* value = locs->at(index);
switch(value->type()) {
case T_OBJECT:
+ assert(!value->obj_is_scalar_replaced(), "object should be reallocated already");
// preserve object type
_locals->add( new StackValue((intptr_t) (value->get_obj()()), T_OBJECT ));
break;
@@ -113,6 +115,7 @@
StackValue* value = exprs->at(index);
switch(value->type()) {
case T_OBJECT:
+ assert(!value->obj_is_scalar_replaced(), "object should be reallocated already");
// preserve object type
_expressions->add( new StackValue((intptr_t) (value->get_obj()()), T_OBJECT ));
break;
--- a/hotspot/src/share/vm/runtime/vframe_hp.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vframe_hp.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -190,7 +190,7 @@
// Casting away const
frame& fr = (frame&) _fr;
MonitorInfo* info = new MonitorInfo(fr.compiled_synchronized_native_monitor_owner(nm),
- fr.compiled_synchronized_native_monitor(nm), false);
+ fr.compiled_synchronized_native_monitor(nm), false, false);
monitors->push(info);
return monitors;
}
@@ -201,8 +201,20 @@
GrowableArray<MonitorInfo*>* result = new GrowableArray<MonitorInfo*>(monitors->length());
for (int index = 0; index < monitors->length(); index++) {
MonitorValue* mv = monitors->at(index);
- StackValue *owner_sv = create_stack_value(mv->owner()); // it is an oop
- result->push(new MonitorInfo(owner_sv->get_obj()(), resolve_monitor_lock(mv->basic_lock()), mv->eliminated()));
+ ScopeValue* ov = mv->owner();
+ StackValue *owner_sv = create_stack_value(ov); // it is an oop
+ if (ov->is_object() && owner_sv->obj_is_scalar_replaced()) { // The owner object was scalar replaced
+ assert(mv->eliminated(), "monitor should be eliminated for scalar replaced object");
+ // Put klass for scalar replaced object.
+ ScopeValue* kv = ((ObjectValue *)ov)->klass();
+ assert(kv->is_constant_oop(), "klass should be oop constant for scalar replaced object");
+ KlassHandle k(((ConstantOopReadValue*)kv)->value()());
+ result->push(new MonitorInfo(k->as_klassOop(), resolve_monitor_lock(mv->basic_lock()),
+ mv->eliminated(), true));
+ } else {
+ result->push(new MonitorInfo(owner_sv->get_obj()(), resolve_monitor_lock(mv->basic_lock()),
+ mv->eliminated(), false));
+ }
}
return result;
}
--- a/hotspot/src/share/vm/runtime/virtualspace.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/virtualspace.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/virtualspace.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/virtualspace.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/vmThread.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/vm_operations.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vm_operations.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/runtime/vm_version.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/bitMap.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/bitMap.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/bitMap.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/bitMap.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/bitMap.inline.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/bitMap.inline.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/exceptions.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/exceptions.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/macros.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/macros.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/hotspot/src/share/vm/utilities/taskqueue.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/taskqueue.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -64,15 +64,18 @@
}
void ParallelTaskTerminator::yield() {
+ assert(_offered_termination <= _n_threads, "Invariant");
os::yield();
}
void ParallelTaskTerminator::sleep(uint millis) {
+ assert(_offered_termination <= _n_threads, "Invariant");
os::sleep(Thread::current(), millis, false);
}
bool
ParallelTaskTerminator::offer_termination(TerminatorTerminator* terminator) {
+ assert(_offered_termination < _n_threads, "Invariant");
Atomic::inc(&_offered_termination);
uint yield_count = 0;
@@ -96,6 +99,7 @@
// Loop waiting for all threads to offer termination or
// more work.
while (true) {
+ assert(_offered_termination <= _n_threads, "Invariant");
// Are all threads offering termination?
if (_offered_termination == _n_threads) {
return true;
@@ -151,6 +155,7 @@
if (peek_in_queue_set() ||
(terminator != NULL && terminator->should_exit_termination())) {
Atomic::dec(&_offered_termination);
+ assert(_offered_termination < _n_threads, "Invariant");
return false;
}
}
--- a/hotspot/src/share/vm/utilities/taskqueue.hpp Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/src/share/vm/utilities/taskqueue.hpp Thu Jul 30 12:25:39 2009 -0700
@@ -560,8 +560,14 @@
class StarTask {
void* _holder; // either union oop* or narrowOop*
public:
- StarTask(narrowOop *p) { _holder = (void *)((uintptr_t)p | COMPRESSED_OOP_MASK); }
- StarTask(oop *p) { _holder = (void*)p; }
+ StarTask(narrowOop* p) {
+ assert(((uintptr_t)p & COMPRESSED_OOP_MASK) == 0, "Information loss!");
+ _holder = (void *)((uintptr_t)p | COMPRESSED_OOP_MASK);
+ }
+ StarTask(oop* p) {
+ assert(((uintptr_t)p & COMPRESSED_OOP_MASK) == 0, "Information loss!");
+ _holder = (void*)p;
+ }
StarTask() { _holder = NULL; }
operator oop*() { return (oop*)_holder; }
operator narrowOop*() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/5057225/Test5057225.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 5057225
+ * @summary Remove useless I2L conversions
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test5057225.doload Test5057225
+ */
+
+import java.net.URLClassLoader;
+
+public class Test5057225 {
+ static byte[] ba = new byte[] { -1 };
+ static short[] sa = new short[] { -1 };
+ static int[] ia = new int[] { -1 };
+
+ static final long[] BYTE_MASKS = {
+ 0x0FL,
+ 0x7FL, // 7-bit
+ 0xFFL,
+ };
+
+ static final long[] SHORT_MASKS = {
+ 0x000FL,
+ 0x007FL, // 7-bit
+ 0x00FFL,
+ 0x0FFFL,
+ 0x3FFFL, // 14-bit
+ 0x7FFFL, // 15-bit
+ 0xFFFFL,
+ };
+
+ static final long[] INT_MASKS = {
+ 0x0000000FL,
+ 0x0000007FL, // 7-bit
+ 0x000000FFL,
+ 0x00000FFFL,
+ 0x00003FFFL, // 14-bit
+ 0x00007FFFL, // 15-bit
+ 0x0000FFFFL,
+ 0x00FFFFFFL,
+ 0x7FFFFFFFL, // 31-bit
+ 0xFFFFFFFFL,
+ };
+
+ public static void main(String[] args) throws Exception {
+ for (int i = 0; i < BYTE_MASKS.length; i++) {
+ System.setProperty("value", "" + BYTE_MASKS[i]);
+ loadAndRunClass("Test5057225$loadUB2L");
+ }
+
+ for (int i = 0; i < SHORT_MASKS.length; i++) {
+ System.setProperty("value", "" + SHORT_MASKS[i]);
+ loadAndRunClass("Test5057225$loadUS2L");
+ }
+
+ for (int i = 0; i < INT_MASKS.length; i++) {
+ System.setProperty("value", "" + INT_MASKS[i]);
+ loadAndRunClass("Test5057225$loadUI2L");
+ }
+ }
+
+ static void check(long result, long expected) {
+ if (result != expected)
+ throw new InternalError(result + " != " + expected);
+ }
+
+ static void loadAndRunClass(String classname) throws Exception {
+ Class cl = Class.forName(classname);
+ URLClassLoader apploader = (URLClassLoader) cl.getClassLoader();
+ ClassLoader loader = new URLClassLoader(apploader.getURLs(), apploader.getParent());
+ Class c = loader.loadClass(classname);
+ Runnable r = (Runnable) c.newInstance();
+ r.run();
+ }
+
+ public static class loadUB2L implements Runnable {
+ static final long MASK;
+ static {
+ long value = 0;
+ try {
+ value = Long.decode(System.getProperty("value"));
+ } catch (Throwable e) {}
+ MASK = value;
+ }
+
+ public void run() { check(doload(ba), MASK); }
+ static long doload(byte[] ba) { return ba[0] & MASK; }
+ }
+
+ public static class loadUS2L implements Runnable {
+ static final long MASK;
+ static {
+ long value = 0;
+ try {
+ value = Long.decode(System.getProperty("value"));
+ } catch (Throwable e) {}
+ MASK = value;
+ }
+
+ public void run() { check(doload(sa), MASK); }
+ static long doload(short[] sa) { return sa[0] & MASK; }
+ }
+
+ public static class loadUI2L implements Runnable {
+ static final long MASK;
+ static {
+ long value = 0;
+ try {
+ value = Long.decode(System.getProperty("value"));
+ } catch (Throwable e) {}
+ MASK = value;
+ }
+
+ public void run() { check(doload(ia), MASK); }
+ static long doload(int[] ia) { return ia[0] & MASK; }
+ }
+}
--- a/hotspot/test/compiler/6772683/InterruptedTest.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/test/compiler/6772683/InterruptedTest.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6826736/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6826736
+ * @summary CMS: core dump with -XX:+UseCompressedOops
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xbatch -XX:+ScavengeALot -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g -XX:CompileThreshold=100 -XX:CompileOnly=Test.test -XX:-BlockLayoutRotateLoops -XX:LoopUnrollLimit=0 Test
+ */
+
+public class Test {
+ int[] arr;
+ int[] arr2;
+ int test(int r) {
+ for (int i = 0; i < 100; i++) {
+ for (int j = i; j < 100; j++) {
+ int a = 0;
+ for (long k = 0; k < 100; k++) {
+ a += k;
+ }
+ if (arr != null)
+ a = arr[j];
+ r += a;
+ }
+ }
+ return r;
+ }
+
+ public static void main(String[] args) {
+ int r = 0;
+ Test t = new Test();
+ for (int i = 0; i < 100; i++) {
+ t.arr = new int[100];
+ r = t.test(r);
+ }
+ System.out.println("Warmup 1 is done.");
+ for (int i = 0; i < 100; i++) {
+ t.arr = null;
+ r = t.test(r);
+ }
+ System.out.println("Warmup 2 is done.");
+ for (int i = 0; i < 100; i++) {
+ t.arr = new int[100];
+ r = t.test(r);
+ }
+ System.out.println("Warmup is done.");
+ for (int i = 0; i < 100; i++) {
+ t.arr = new int[1000000];
+ t.arr = null;
+ r = t.test(r);
+ }
+ }
+}
--- a/hotspot/test/compiler/6832293/Test.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/test/compiler/6832293/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6837094/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2009 Google Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6837094
+ * @summary False positive for "meet not symmetric" failure
+ *
+ * @run main/othervm -Xbatch -XX:CompileOnly=Test.collectIs,Test$Factory$1.getArray,Test$Factory$2.getArray Test
+ */
+
+import java.util.Set;
+import java.util.HashSet;
+
+public class Test {
+
+ private interface Factory<M extends Interface> {
+ Factory<Child0> Zero = new Factory<Child0>() {
+ public Child0[] getArray() { return new Child0[1]; }
+ };
+
+ Factory<Child1> One = new Factory<Child1>() {
+ public Child1[] getArray() { return new Child1[1]; }
+ };
+
+ M[] getArray();
+ }
+
+ /**
+ * C2 asserts when compiling this method. Bimorphic inlining happens at
+ * getArray call site. A Phi in the catch block tries to join the meet type
+ * from he inline site (Parent[]) with the type expected by CI (Interface[]).
+ *
+ * C2 throws an assert when it doesn't need to.
+ */
+ private static <I extends Interface> void collectIs(
+ Factory<I> factory, Set<Interface> s) {
+ for (I i : factory.getArray()) {
+ try {
+ s.add(i);
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ static public void main(String argv[]) {
+ Set<Interface> s = new HashSet();
+
+ for (int i = 0; i < 25000; i++) {
+ collectIs(Factory.Zero, s);
+ collectIs(Factory.One, s);
+ }
+ }
+}
+
+/**
+ * Establish necessary class hierarchy
+ */
+
+interface Interface {
+}
+
+class Parent {
+}
+
+class Child0 extends Parent implements Interface {
+}
+
+class Child1 extends Parent implements Interface {
+}
+
+class Child2 extends Parent implements Interface {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6849574/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6849574
+ * @summary VM crash using NonBlockingHashMap (high_scale_lib)
+ *
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+VerifyBeforeGC Test
+ */
+
+import java.util.concurrent.atomic.*;
+
+public class Test extends Thread {
+
+ public static void main(String[] args) {
+ AtomicReferenceArray a = new AtomicReferenceArray(10000);
+ for (int i = 0; i < 100000; i++) {
+ a.getAndSet(9999, new Object());
+ if (i > 99990) System.gc();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6851282/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6851282
+ * @summary JIT miscompilation results in null entry in array when using CompressedOops
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops Test
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Test {
+ void foo(A a, A[] as) {
+ for (A a1 : as) {
+ B[] filtered = a.c(a1);
+ for (B b : filtered) {
+ if (b == null) {
+ System.out.println("bug: b == null");
+ System.exit(97);
+ }
+ }
+ }
+ }
+
+ public static void main(String[] args) {
+ List<A> as = new ArrayList<A>();
+ for (int i = 0; i < 5000; i++) {
+ List<B> bs = new ArrayList<B>();
+ for (int j = i; j < i + 1000; j++)
+ bs.add(new B(j));
+ as.add(new A(bs.toArray(new B[0])));
+ }
+ new Test().foo(as.get(0), as.subList(1, as.size()).toArray(new A[0]));
+ }
+}
+
+class A {
+ final B[] bs;
+
+ public A(B[] bs) {
+ this.bs = bs;
+ }
+
+ final B[] c(final A a) {
+ return new BoxedArray<B>(bs).filter(new Function<B, Boolean>() {
+ public Boolean apply(B arg) {
+ for (B b : a.bs) {
+ if (b.d == arg.d)
+ return true;
+ }
+ return false;
+ }
+ });
+ }
+}
+
+class BoxedArray<T> {
+
+ private final T[] array;
+
+ BoxedArray(T[] array) {
+ this.array = array;
+ }
+
+ public T[] filter(Function<T, Boolean> function) {
+ boolean[] include = new boolean[array.length];
+ int len = 0;
+ int i = 0;
+ while (i < array.length) {
+ if (function.apply(array[i])) {
+ include[i] = true;
+ len += 1;
+ }
+ i += 1;
+ }
+ T[] result = (T[]) java.lang.reflect.Array.newInstance(array.getClass().getComponentType(), len);
+ len = 0;
+ i = 0;
+ while (len < result.length) {
+ if (include[i]) {
+ result[len] = array[i];
+ len += 1;
+ }
+ i += 1;
+ }
+ return result;
+ }
+}
+
+interface Function<T, R> {
+ R apply(T arg);
+}
+
+class B {
+ final int d;
+ public B(int d) {
+ this.d = d;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6855164/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6855164
+ * @summary SIGSEGV during compilation of method involving loop over CharSequence
+ * @run main/othervm -Xbatch Test
+ */
+
+public class Test{
+ public static void main(String[] args) throws Exception {
+ StringBuffer builder = new StringBuffer();
+
+ for(int i = 0; i < 100; i++)
+ builder.append("I am the very model of a modern major general\n");
+
+ for(int j = 0; j < builder.length(); j++){
+ previousSpaceIndex(builder, j);
+ }
+ }
+
+ private static final int previousSpaceIndex(CharSequence sb, int seek) {
+ seek--;
+ while (seek > 0) {
+ if (sb.charAt(seek) == ' ') {
+ while (seek > 0 && sb.charAt(seek - 1) == ' ')
+ seek--;
+ return seek;
+ }
+ seek--;
+ }
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6857159/Test6857159.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6857159
+ * @summary local schedule failed with checkcast of Thread.currentThread()
+ *
+ * @run shell Test6857159.sh
+ */
+
+public class Test6857159 extends Thread {
+ static class ct0 extends Test6857159 {
+ public void message() {
+ // System.out.println("message");
+ }
+
+ public void run() {
+ message();
+ ct0 ct = (ct0) Thread.currentThread();
+ ct.message();
+ }
+ }
+ static class ct1 extends ct0 {
+ public void message() {
+ // System.out.println("message");
+ }
+ }
+ static class ct2 extends ct0 {
+ public void message() {
+ // System.out.println("message");
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ for (int i = 0; i < 100000; i++) {
+ Thread t = null;
+ switch (i % 3) {
+ case 0: t = new ct0(); break;
+ case 1: t = new ct1(); break;
+ case 2: t = new ct2(); break;
+ }
+ t.start();
+ t.join();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6857159/Test6857159.sh Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+#
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTSRC=${TESTSRC}"
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTJAVA=${TESTJAVA}"
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTCLASSES=${TESTCLASSES}"
+echo "CLASSPATH=${CLASSPATH}"
+
+set -x
+
+cp ${TESTSRC}/Test6857159.java .
+cp ${TESTSRC}/Test6857159.sh .
+
+${TESTJAVA}/bin/javac -d . Test6857159.java
+
+${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbatch -XX:+PrintCompilation -XX:CompileOnly=Test6857159\$ct.run Test6857159 > test.out 2>&1
+
+grep "COMPILE SKIPPED" test.out
+
+result=$?
+if [ $result -eq 1 ]
+then
+ echo "Passed"
+ exit 0
+else
+ echo "Failed"
+ exit 1
+fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6859338/Test6859338.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6859338
+ * @summary Assertion failure in sharedRuntime.cpp
+ *
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-InlineObjectHash -Xbatch -XX:-ProfileInterpreter Test6859338
+ */
+
+public class Test6859338 {
+ static Object[] o = new Object[] { new Object(), null };
+ public static void main(String[] args) {
+ int total = 0;
+ try {
+ // Exercise the implicit null check in the unverified entry point
+ for (int i = 0; i < 40000; i++) {
+ int limit = o.length;
+ if (i < 20000) limit = 1;
+ for (int j = 0; j < limit; j++) {
+ total += o[j].hashCode();
+ }
+ }
+
+ } catch (NullPointerException e) {
+ // this is expected. A true failure causes a crash
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/6860469/Test.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2009 Google Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6860469
+ * @summary remix_address_expressions reshapes address expression with bad control
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test.C Test
+ */
+
+public class Test {
+
+ private static final int H = 16;
+ private static final int F = 9;
+
+ static int[] fl = new int[1 << F];
+
+ static int C(int ll, int f) {
+ int max = -1;
+ int min = H + 1;
+
+ if (ll != 0) {
+ if (ll < min) {
+ min = ll;
+ }
+ if (ll > max) {
+ max = ll;
+ }
+ }
+
+ if (f > max) {
+ f = max;
+ }
+ if (min > f) {
+ min = f;
+ }
+
+ for (int mc = 1 >> max - f; mc <= 0; mc++) {
+ int i = mc << (32 - f);
+ fl[i] = max;
+ }
+
+ return min;
+ }
+
+ public static void main(String argv[]) {
+ C(0, 10);
+ }
+}
--- a/hotspot/test/runtime/6819213/TestBootNativeLibraryPath.java Wed Jul 22 15:52:41 2009 +0200
+++ b/hotspot/test/runtime/6819213/TestBootNativeLibraryPath.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxp/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
f1ac756616eaaad795f77f7f5e7f7c7bfdc9c1de jdk7-b61
a97dd57a62604c35c79bc2fa77a612ed547f6135 jdk7-b62
ae449e9c04c1fe651bd30f0f4d4cc24ba794e0c4 jdk7-b63
+a10eec7a1edf536f39b5828d8623054dbc62c2b7 jdk7-b64
+008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65
+22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66
--- a/jaxp/make/build.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/make/build.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jaxp/make/build.xml Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/make/build.xml Thu Jul 30 12:25:39 2009 -0700
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
--- a/jaxp/make/jprt.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/make/jprt.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
*/
/*
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
*/
/*
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxp/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxp/src/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jaxws/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxws/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
aeabf802f2a1ca72b87d7397c5ece58058e000a9 jdk7-b61
75c801c13ea1ddebc58b1a8c8da9318d72750e62 jdk7-b62
b8a6e883c0a6708f6d818815040525d472262495 jdk7-b63
+aaa25dfd3de68c6f1a1d3ef8c45fd99f76bca6dd jdk7-b64
+aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65
+fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66
--- a/jaxws/make/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxws/make/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jaxws/make/build.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxws/make/build.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jaxws/make/build.xml Wed Jul 22 15:52:41 2009 +0200
+++ b/jaxws/make/build.xml Thu Jul 30 12:25:39 2009 -0700
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
--- a/jdk/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
f72c0dc047b9b2e797beee68ae0b50decb1f020d jdk7-b61
12e11fab9a839a9666a996a8f9a02fd8fa03aab6 jdk7-b62
2ed6ed6b5bfc7dd724925b90dbb31223df59c25d jdk7-b63
+a50217eb3ee10b9f9547e0708e5c9625405083ef jdk7-b64
+382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65
+bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66
--- a/jdk/make/common/Defs-linux.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/common/Defs-linux.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -193,7 +193,7 @@
CPPFLAGS_COMMON += -D_LP64=1
endif
-CPPFLAGS_OPT =
+CPPFLAGS_OPT = -DNDEBUG
CPPFLAGS_DBG = -DDEBUG
ifneq ($(PRODUCT), java)
CPPFLAGS_DBG += -DLOGGING
--- a/jdk/make/common/Defs-windows.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/common/Defs-windows.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -363,7 +363,7 @@
CFLAGS_COMMON += -WX
endif
-CPPFLAGS_OPT =
+CPPFLAGS_OPT = -DNDEBUG
CPPFLAGS_DBG = -DDEBUG -DLOGGING
CXXFLAGS_COMMON = $(CFLAGS_COMMON)
--- a/jdk/make/common/Release.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/common/Release.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jdk/make/common/shared/Defs-windows.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/common/shared/Defs-windows.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jdk/make/common/shared/Defs.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/common/shared/Defs.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jdk/make/common/shared/Sanity.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/common/shared/Sanity.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jdk/make/java/redist/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/java/redist/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jdk/make/sun/Makefile Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/make/sun/Makefile Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/com/sun/awt/AWTUtilities.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/com/sun/awt/AWTUtilities.java Thu Jul 30 12:25:39 2009 -0700
@@ -374,7 +374,7 @@
"The window argument should not be null.");
}
- return AWTAccessor.getWindowAccessor().isOpaque(window);
+ return window.isOpaque();
}
/**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+import java.beans.BeanDescriptor;
+import java.beans.BeanInfo;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * This is utility class that provides functionality
+ * to find a {@link BeanInfo} for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class BeanInfoFinder
+ extends InstanceFinder<BeanInfo> {
+
+ private static final String DEFAULT = "sun.beans.infos";
+
+ public BeanInfoFinder() {
+ super(BeanInfo.class, true, "BeanInfo", DEFAULT);
+ }
+
+ private static boolean isValid(Class<?> type, Method method) {
+ return (method != null) && type.equals(method.getDeclaringClass());
+ }
+
+ @Override
+ protected BeanInfo instantiate(Class<?> type, String name) {
+ BeanInfo info = super.instantiate(type, name);
+ if (info != null) {
+ // make sure that the returned BeanInfo matches the class
+ BeanDescriptor bd = info.getBeanDescriptor();
+ if (bd != null) {
+ if (type.equals(bd.getBeanClass())) {
+ return info;
+ }
+ }
+ else {
+ PropertyDescriptor[] pds = info.getPropertyDescriptors();
+ if (pds != null) {
+ for (PropertyDescriptor pd : pds) {
+ Method method = pd.getReadMethod();
+ if (method == null) {
+ method = pd.getWriteMethod();
+ }
+ if (isValid(type, method)) {
+ return info;
+ }
+ }
+ }
+ else {
+ MethodDescriptor[] mds = info.getMethodDescriptors();
+ if (mds != null) {
+ for (MethodDescriptor md : mds) {
+ if (isValid(type, md.getMethod())) {
+ return info;
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
+ // this optimization will only use the BeanInfo search path
+ // if is has changed from the original
+ // or trying to get the ComponentBeanInfo
+ return !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name)
+ ? super.instantiate(type, prefix, name)
+ : null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/InstanceFinder.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+/**
+ * This is utility class that provides basic functionality
+ * to find an auxiliary class for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+class InstanceFinder<T> {
+
+ private static final String[] EMPTY = { };
+
+ private final Class<? extends T> type;
+ private final boolean allow;
+ private final String suffix;
+ private String[] packages;
+
+ InstanceFinder(Class<? extends T> type, boolean allow, String suffix, String... packages) {
+ this.type = type;
+ this.allow = allow;
+ this.suffix = suffix;
+ this.packages = packages.clone();
+ }
+
+ public String[] getPackages() {
+ return (this.packages.length > 0)
+ ? this.packages.clone()
+ : this.packages;
+ }
+
+ public void setPackages(String... packages) {
+ this.packages = (packages != null) && (packages.length > 0)
+ ? packages.clone()
+ : EMPTY;
+ }
+
+ public T find(Class<?> type) {
+ if (type == null) {
+ return null;
+ }
+ String name = type.getName() + this.suffix;
+ T object = instantiate(type, name);
+ if (object != null) {
+ return object;
+ }
+ if (this.allow) {
+ object = instantiate(type, null);
+ if (object != null) {
+ return object;
+ }
+ }
+ int index = name.lastIndexOf('.') + 1;
+ if (index > 0) {
+ name = name.substring(index);
+ }
+ for (String prefix : this.packages) {
+ object = instantiate(type, prefix, name);
+ if (object != null) {
+ return object;
+ }
+ }
+ return null;
+ }
+
+ protected T instantiate(Class<?> type, String name) {
+ if (type != null) {
+ try {
+ if (name != null) {
+ type = ClassFinder.findClass(name, type.getClassLoader());
+ }
+ if (this.type.isAssignableFrom(type)) {
+ return (T) type.newInstance();
+ }
+ }
+ catch (Exception exception) {
+ // ignore any exceptions
+ }
+ }
+ return null;
+ }
+
+ protected T instantiate(Class<?> type, String prefix, String name) {
+ return instantiate(type, prefix + '.' + name);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+import java.beans.PersistenceDelegate;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This is utility class that provides functionality
+ * to find a {@link PersistenceDelegate} for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class PersistenceDelegateFinder
+ extends InstanceFinder<PersistenceDelegate> {
+
+ private final Map<Class<?>, PersistenceDelegate> registry;
+
+ public PersistenceDelegateFinder() {
+ super(PersistenceDelegate.class, true, "PersistenceDelegate");
+ this.registry = new HashMap<Class<?>, PersistenceDelegate>();
+ }
+
+ public void register(Class<?> type, PersistenceDelegate delegate) {
+ if (delegate != null) {
+ this.registry.put(type, delegate);
+ }
+ else {
+ this.registry.remove(type);
+ }
+ }
+
+ @Override
+ public PersistenceDelegate find(Class<?> type) {
+ PersistenceDelegate delegate = this.registry.get(type);
+ return (delegate != null) ? delegate : super.find(type);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans.finder;
+
+import com.sun.beans.WeakCache;
+
+import java.beans.PropertyEditor;
+
+import sun.beans.editors.BooleanEditor;
+import sun.beans.editors.ByteEditor;
+import sun.beans.editors.DoubleEditor;
+import sun.beans.editors.EnumEditor;
+import sun.beans.editors.FloatEditor;
+import sun.beans.editors.IntegerEditor;
+import sun.beans.editors.LongEditor;
+import sun.beans.editors.ShortEditor;
+
+/**
+ * This is utility class that provides functionality
+ * to find a {@link PropertyEditor} for a JavaBean specified by its type.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class PropertyEditorFinder
+ extends InstanceFinder<PropertyEditor> {
+
+ private final WeakCache<Class<?>, Class<?>> registry;
+
+ public PropertyEditorFinder() {
+ super(PropertyEditor.class, false, "Editor", "sun.beans.editors");
+
+ this.registry = new WeakCache<Class<?>, Class<?>>();
+ this.registry.put(Byte.TYPE, ByteEditor.class);
+ this.registry.put(Short.TYPE, ShortEditor.class);
+ this.registry.put(Integer.TYPE, IntegerEditor.class);
+ this.registry.put(Long.TYPE, LongEditor.class);
+ this.registry.put(Boolean.TYPE, BooleanEditor.class);
+ this.registry.put(Float.TYPE, FloatEditor.class);
+ this.registry.put(Double.TYPE, DoubleEditor.class);
+ }
+
+ public void register(Class<?> type, Class<?> editor) {
+ this.registry.put(type, editor);
+ }
+
+ @Override
+ public PropertyEditor find(Class<?> type) {
+ PropertyEditor editor = instantiate(this.registry.get(type), null);
+ if (editor == null) {
+ editor = super.find(type);
+ if ((editor == null) && (null != type.getEnumConstants())) {
+ editor = new EnumEditor(type);
+ }
+ }
+ return editor;
+ }
+}
--- a/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -493,9 +493,9 @@
* Tests whether a name contains a nonempty component.
*/
protected static boolean allEmpty(Name name) {
- Enumeration enum_ = name.getAll();
+ Enumeration<String> enum_ = name.getAll();
while (enum_.hasMoreElements()) {
- if (!enum_.equals("")) {
+ if (!enum_.nextElement().isEmpty()) {
return false;
}
}
--- a/jdk/src/share/classes/java/awt/Component.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/awt/Component.java Thu Jul 30 12:25:39 2009 -0700
@@ -2370,12 +2370,10 @@
* rectangular region. A non-opaque component paints only some of
* its pixels, allowing the pixels underneath it to "show through".
* A component that does not fully paint its pixels therefore
- * provides a degree of transparency. Only lightweight
- * components can be transparent.
+ * provides a degree of transparency.
* <p>
* Subclasses that guarantee to always completely paint their
- * contents should override this method and return true. All
- * of the "heavyweight" AWT components are opaque.
+ * contents should override this method and return true.
*
* @return true if this component is completely opaque
* @see #isLightweight
--- a/jdk/src/share/classes/java/awt/GraphicsDevice.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/awt/GraphicsDevice.java Thu Jul 30 12:25:39 2009 -0700
@@ -281,8 +281,8 @@
if (w.getOpacity() < 1.0f) {
w.setOpacity(1.0f);
}
- Color bgColor = w.getBackground();
- if ((bgColor != null) && (bgColor.getAlpha() < 255)) {
+ if (!w.isOpaque()) {
+ Color bgColor = w.getBackground();
bgColor = new Color(bgColor.getRed(), bgColor.getGreen(),
bgColor.getBlue(), 255);
w.setBackground(bgColor);
--- a/jdk/src/share/classes/java/awt/Robot.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/awt/Robot.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@
private RobotPeer peer;
private boolean isAutoWaitForIdle = false;
private int autoDelay = 0;
- private static int LEGAL_BUTTON_MASK;
+ private static int LEGAL_BUTTON_MASK = 0;
// location of robot's GC, used in mouseMove(), getPixelColor() and captureScreenImage()
private Point gdLoc;
@@ -95,23 +95,6 @@
}
init(GraphicsEnvironment.getLocalGraphicsEnvironment()
.getDefaultScreenDevice());
- int tmpMask = 0;
-
- if (Toolkit.getDefaultToolkit().areExtraMouseButtonsEnabled()){
- if (Toolkit.getDefaultToolkit() instanceof SunToolkit) {
- final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
- for (int i = 0; i < buttonsNumber; i++){
- tmpMask |= InputEvent.getMaskForButton(i+1);
- }
- }
- }
- tmpMask |= InputEvent.BUTTON1_MASK|
- InputEvent.BUTTON2_MASK|
- InputEvent.BUTTON3_MASK|
- InputEvent.BUTTON1_DOWN_MASK|
- InputEvent.BUTTON2_DOWN_MASK|
- InputEvent.BUTTON3_DOWN_MASK;
- LEGAL_BUTTON_MASK = tmpMask;
}
/**
@@ -156,6 +139,28 @@
disposer = new RobotDisposer(peer);
sun.java2d.Disposer.addRecord(anchor, disposer);
}
+ initLegalButtonMask();
+ }
+
+ private static synchronized void initLegalButtonMask() {
+ if (LEGAL_BUTTON_MASK != 0) return;
+
+ int tmpMask = 0;
+ if (Toolkit.getDefaultToolkit().areExtraMouseButtonsEnabled()){
+ if (Toolkit.getDefaultToolkit() instanceof SunToolkit) {
+ final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
+ for (int i = 0; i < buttonsNumber; i++){
+ tmpMask |= InputEvent.getMaskForButton(i+1);
+ }
+ }
+ }
+ tmpMask |= InputEvent.BUTTON1_MASK|
+ InputEvent.BUTTON2_MASK|
+ InputEvent.BUTTON3_MASK|
+ InputEvent.BUTTON1_DOWN_MASK|
+ InputEvent.BUTTON2_DOWN_MASK|
+ InputEvent.BUTTON3_DOWN_MASK;
+ LEGAL_BUTTON_MASK = tmpMask;
}
/* determine if the security policy allows Robot's to be created */
--- a/jdk/src/share/classes/java/awt/TrayIcon.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/awt/TrayIcon.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -143,6 +143,9 @@
*/
public TrayIcon(Image image) {
this();
+ if (image == null) {
+ throw new IllegalArgumentException("creating TrayIcon with null Image");
+ }
setImage(image);
}
--- a/jdk/src/share/classes/java/awt/Window.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/awt/Window.java Thu Jul 30 12:25:39 2009 -0700
@@ -3521,6 +3521,7 @@
* @return this component's background color
*
* @see Window#setBackground
+ * @see Window#isOpaque
* @see GraphicsDevice.WindowTranslucency
*/
@Override
@@ -3583,6 +3584,7 @@
* PERPIXEL_TRANSLUCENT} translucency is not supported
*
* @see Window#getBackground
+ * @see Window#isOpaque
* @see Window#setOpacity()
* @see Window#setShape()
* @see GraphicsDevice.WindowTranslucency
@@ -3597,7 +3599,7 @@
return;
}
int oldAlpha = oldBg != null ? oldBg.getAlpha() : 255;
- int alpha = bgColor.getAlpha();
+ int alpha = bgColor != null ? bgColor.getAlpha() : 255;
if ((oldAlpha == 255) && (alpha < 255)) { // non-opaque window
GraphicsConfiguration gc = getGraphicsConfiguration();
GraphicsDevice gd = gc.getDevice();
@@ -3623,6 +3625,25 @@
}
}
+ /**
+ * Indicates if the window is currently opaque.
+ * <p>
+ * The method returns {@code false} if the background color of the window
+ * is not {@code null} and the alpha component of the color is less than
+ * 1.0f. The method returns {@code true} otherwise.
+ *
+ * @return {@code true} if the window is opaque, {@code false} otherwise
+ *
+ * @see Window#getBackground
+ * @see Window#setBackground
+ * @since 1.7
+ */
+ @Override
+ public boolean isOpaque() {
+ Color bg = getBackground();
+ return bg != null ? bg.getAlpha() == 255 : true;
+ }
+
private void updateWindow() {
synchronized (getTreeLock()) {
WindowPeer peer = (WindowPeer)getPeer();
@@ -3639,12 +3660,11 @@
*/
@Override
public void paint(Graphics g) {
- Color bgColor = getBackground();
- if ((bgColor != null) && (bgColor.getAlpha() < 255)) {
+ if (!isOpaque()) {
Graphics gg = g.create();
try {
if (gg instanceof Graphics2D) {
- gg.setColor(bgColor);
+ gg.setColor(getBackground());
((Graphics2D)gg).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC));
gg.fillRect(0, 0, getWidth(), getHeight());
}
@@ -3749,10 +3769,6 @@
public void setShape(Window window, Shape shape) {
window.setShape(shape);
}
- public boolean isOpaque(Window window) {
- Color bg = window.getBackground();
- return (bg != null) ? bg.getAlpha() == 255 : true;
- }
public void setOpaque(Window window, boolean opaque) {
Color bg = window.getBackground();
if (bg == null) {
--- a/jdk/src/share/classes/java/awt/color/ICC_Profile.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/awt/color/ICC_Profile.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/java/beans/Encoder.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/Encoder.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,8 @@
*/
package java.beans;
-import java.util.Collections;
+import com.sun.beans.finder.PersistenceDelegateFinder;
+
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Map;
@@ -45,8 +46,7 @@
*/
public class Encoder {
- private final Map<Class<?>, PersistenceDelegate> delegates
- = Collections.synchronizedMap(new HashMap<Class<?>, PersistenceDelegate>());
+ private final PersistenceDelegateFinder finder = new PersistenceDelegateFinder();
private Map bindings = new IdentityHashMap();
private ExceptionListener exceptionListener;
boolean executeStatements = true;
@@ -166,8 +166,13 @@
* @see java.beans.BeanInfo#getBeanDescriptor
*/
public PersistenceDelegate getPersistenceDelegate(Class<?> type) {
- PersistenceDelegate pd = this.delegates.get(type);
- return (pd != null) ? pd : MetaData.getPersistenceDelegate(type);
+ synchronized (this.finder) {
+ PersistenceDelegate pd = this.finder.find(type);
+ if (pd != null) {
+ return pd;
+ }
+ }
+ return MetaData.getPersistenceDelegate(type);
}
/**
@@ -184,10 +189,8 @@
public void setPersistenceDelegate(Class<?> type,
PersistenceDelegate persistenceDelegate)
{
- if (persistenceDelegate != null) {
- this.delegates.put(type, persistenceDelegate);
- } else {
- this.delegates.remove(type);
+ synchronized (this.finder) {
+ this.finder.register(type, persistenceDelegate);
}
}
@@ -243,12 +246,11 @@
for (int i = 0; i < oldArgs.length; i++) {
newArgs[i] = writeObject1(oldArgs[i]);
}
- if (oldExp.getClass() == Statement.class) {
- return new Statement(newTarget, oldExp.getMethodName(), newArgs);
- }
- else {
- return new Expression(newTarget, oldExp.getMethodName(), newArgs);
- }
+ Statement newExp = Statement.class.equals(oldExp.getClass())
+ ? new Statement(newTarget, oldExp.getMethodName(), newArgs)
+ : new Expression(newTarget, oldExp.getMethodName(), newArgs);
+ newExp.loader = oldExp.loader;
+ return newExp;
}
/**
--- a/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -274,6 +274,11 @@
}
indexedWriteMethod = Introspector.findMethod(cls, indexedWriteMethodName,
2, (type == null) ? null : new Class[] { int.class, type });
+ if (indexedWriteMethod != null) {
+ if (!indexedWriteMethod.getReturnType().equals(void.class)) {
+ indexedWriteMethod = null;
+ }
+ }
setIndexedWriteMethod0(indexedWriteMethod);
}
return indexedWriteMethod;
--- a/jdk/src/share/classes/java/beans/Introspector.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/Introspector.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package java.beans;
+import com.sun.beans.finder.BeanInfoFinder;
import com.sun.beans.finder.ClassFinder;
import java.lang.ref.Reference;
@@ -45,6 +46,8 @@
import java.util.List;
import java.util.WeakHashMap;
import java.util.TreeMap;
+
+import sun.awt.AppContext;
import sun.reflect.misc.ReflectUtil;
/**
@@ -137,10 +140,6 @@
// events maps from String names to EventSetDescriptors
private Map events;
- private final static String DEFAULT_INFO_PATH = "sun.beans.infos";
-
- private static String[] searchPath = { DEFAULT_INFO_PATH };
-
private final static EventSetDescriptor[] EMPTY_EVENTSETDESCRIPTORS = new EventSetDescriptor[0];
static final String ADD_PREFIX = "add";
@@ -149,7 +148,7 @@
static final String SET_PREFIX = "set";
static final String IS_PREFIX = "is";
- private static final String BEANINFO_SUFFIX = "BeanInfo";
+ private static final Object FINDER_KEY = new Object();
//======================================================================
// Public methods
@@ -309,13 +308,11 @@
* Sun implementation initially sets to {"sun.beans.infos"}.
*/
- public static synchronized String[] getBeanInfoSearchPath() {
- // Return a copy of the searchPath.
- String result[] = new String[searchPath.length];
- for (int i = 0; i < searchPath.length; i++) {
- result[i] = searchPath[i];
+ public static String[] getBeanInfoSearchPath() {
+ BeanInfoFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.getPackages();
}
- return result;
}
/**
@@ -334,12 +331,15 @@
* @see SecurityManager#checkPropertiesAccess
*/
- public static synchronized void setBeanInfoSearchPath(String path[]) {
+ public static void setBeanInfoSearchPath(String[] path) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- searchPath = path;
+ BeanInfoFinder finder = getFinder();
+ synchronized (finder) {
+ finder.setPackages(path);
+ }
}
@@ -447,67 +447,14 @@
* then it checks to see if the class is its own BeanInfo. Finally,
* the BeanInfo search path is prepended to the class and searched.
*
+ * @param beanClass the class type of the bean
* @return Instance of an explicit BeanInfo class or null if one isn't found.
*/
- private static synchronized BeanInfo findExplicitBeanInfo(Class beanClass) {
- String name = beanClass.getName() + BEANINFO_SUFFIX;
- try {
- return (java.beans.BeanInfo)instantiate(beanClass, name);
- } catch (Exception ex) {
- // Just drop through
-
- }
- // Now try checking if the bean is its own BeanInfo.
- try {
- if (isSubclass(beanClass, java.beans.BeanInfo.class)) {
- return (java.beans.BeanInfo)beanClass.newInstance();
- }
- } catch (Exception ex) {
- // Just drop through
+ private static BeanInfo findExplicitBeanInfo(Class beanClass) {
+ BeanInfoFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.find(beanClass);
}
- // Now try looking for <searchPath>.fooBeanInfo
- name = name.substring(name.lastIndexOf('.')+1);
-
- for (int i = 0; i < searchPath.length; i++) {
- // This optimization will only use the BeanInfo search path if is has changed
- // from the original or trying to get the ComponentBeanInfo.
- if (!DEFAULT_INFO_PATH.equals(searchPath[i]) ||
- DEFAULT_INFO_PATH.equals(searchPath[i]) && "ComponentBeanInfo".equals(name)) {
- try {
- String fullName = searchPath[i] + "." + name;
- java.beans.BeanInfo bi = (java.beans.BeanInfo)instantiate(beanClass, fullName);
-
- // Make sure that the returned BeanInfo matches the class.
- if (bi.getBeanDescriptor() != null) {
- if (bi.getBeanDescriptor().getBeanClass() == beanClass) {
- return bi;
- }
- } else if (bi.getPropertyDescriptors() != null) {
- PropertyDescriptor[] pds = bi.getPropertyDescriptors();
- for (int j = 0; j < pds.length; j++) {
- Method method = pds[j].getReadMethod();
- if (method == null) {
- method = pds[j].getWriteMethod();
- }
- if (method != null && method.getDeclaringClass() == beanClass) {
- return bi;
- }
- }
- } else if (bi.getMethodDescriptors() != null) {
- MethodDescriptor[] mds = bi.getMethodDescriptors();
- for (int j = 0; j < mds.length; j++) {
- Method method = mds[j].getMethod();
- if (method != null && method.getDeclaringClass() == beanClass) {
- return bi;
- }
- }
- }
- } catch (Exception ex) {
- // Silently ignore any errors.
- }
- }
- }
- return null;
}
/**
@@ -577,9 +524,9 @@
pd = new PropertyDescriptor(this.beanClass, name.substring(2), method, null);
}
} else if (argCount == 1) {
- if (argTypes[0] == int.class && name.startsWith(GET_PREFIX)) {
+ if (int.class.equals(argTypes[0]) && name.startsWith(GET_PREFIX)) {
pd = new IndexedPropertyDescriptor(this.beanClass, name.substring(3), null, null, method, null);
- } else if (resultType == void.class && name.startsWith(SET_PREFIX)) {
+ } else if (void.class.equals(resultType) && name.startsWith(SET_PREFIX)) {
// Simple setter
pd = new PropertyDescriptor(this.beanClass, name.substring(3), null, method);
if (throwsException(method, PropertyVetoException.class)) {
@@ -587,7 +534,7 @@
}
}
} else if (argCount == 2) {
- if (argTypes[0] == int.class && name.startsWith(SET_PREFIX)) {
+ if (void.class.equals(resultType) && int.class.equals(argTypes[0]) && name.startsWith(SET_PREFIX)) {
pd = new IndexedPropertyDescriptor(this.beanClass, name.substring(3), null, null, null, method);
if (throwsException(method, PropertyVetoException.class)) {
pd.setConstrained(true);
@@ -1483,6 +1430,16 @@
return false;
}
+ private static BeanInfoFinder getFinder() {
+ AppContext context = AppContext.getAppContext();
+ Object object = context.get(FINDER_KEY);
+ if (object instanceof BeanInfoFinder) {
+ return (BeanInfoFinder) object;
+ }
+ BeanInfoFinder finder = new BeanInfoFinder();
+ context.put(FINDER_KEY, finder);
+ return finder;
+ }
/**
* Try to create an instance of a named class.
--- a/jdk/src/share/classes/java/beans/MetaData.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/MetaData.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -219,7 +219,9 @@
return new Expression(oldInstance, String.class, "getClass", new Object[]{});
}
else {
- return new Expression(oldInstance, Class.class, "forName", new Object[]{c.getName()});
+ Expression newInstance = new Expression(oldInstance, Class.class, "forName", new Object[] { c.getName() });
+ newInstance.loader = c.getClassLoader();
+ return newInstance;
}
}
}
--- a/jdk/src/share/classes/java/beans/PropertyDescriptor.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/PropertyDescriptor.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -294,6 +294,11 @@
writeMethod = Introspector.findMethod(cls, writeMethodName, 1,
(type == null) ? null : new Class[] { type });
+ if (writeMethod != null) {
+ if (!writeMethod.getReturnType().equals(void.class)) {
+ writeMethod = null;
+ }
+ }
try {
setWriteMethod(writeMethod);
} catch (IntrospectionException ex) {
--- a/jdk/src/share/classes/java/beans/PropertyEditorManager.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/PropertyEditorManager.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,8 @@
package java.beans;
-import com.sun.beans.WeakCache;
-import sun.beans.editors.*;
+import com.sun.beans.finder.PropertyEditorFinder;
+import sun.awt.AppContext;
/**
* The PropertyEditorManager can be used to locate a property editor for
@@ -55,6 +55,8 @@
public class PropertyEditorManager {
+ private static final Object FINDER_KEY = new Object();
+
/**
* Registers an editor class to edit values of the given target class.
* If the editor class is {@code null},
@@ -74,12 +76,15 @@
*
* @see SecurityManager#checkPropertiesAccess
*/
- public static synchronized void registerEditor(Class<?> targetType, Class<?> editorClass) {
+ public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- registry.put(targetType, editorClass);
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ finder.register(targetType, editorClass);
+ }
}
/**
@@ -89,46 +94,11 @@
* @return An editor object for the given target class.
* The result is null if no suitable editor can be found.
*/
- public static synchronized PropertyEditor findEditor(Class<?> targetType) {
- Class editorClass = registry.get(targetType);
- if (editorClass != null) {
- try {
- Object o = editorClass.newInstance();
- return (PropertyEditor)o;
- } catch (Exception ex) {
- System.err.println("Couldn't instantiate type editor \"" +
- editorClass.getName() + "\" : " + ex);
- }
- }
-
- // Now try adding "Editor" to the class name.
-
- String editorName = targetType.getName() + "Editor";
- try {
- return (PropertyEditor) Introspector.instantiate(targetType, editorName);
- } catch (Exception ex) {
- // Silently ignore any errors.
+ public static PropertyEditor findEditor(Class<?> targetType) {
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.find(targetType);
}
-
- // Now try looking for <searchPath>.fooEditor
- int index = editorName.lastIndexOf('.') + 1;
- if (index > 0) {
- editorName = editorName.substring(index);
- }
- for (String path : searchPath) {
- String name = path + '.' + editorName;
- try {
- return (PropertyEditor) Introspector.instantiate(targetType, name);
- } catch (Exception ex) {
- // Silently ignore any errors.
- }
- }
-
- if (null != targetType.getEnumConstants()) {
- return new EnumEditor(targetType);
- }
- // We couldn't find a suitable Editor.
- return null;
}
/**
@@ -139,8 +109,11 @@
* <p> The default value for this array is implementation-dependent,
* e.g. Sun implementation initially sets to {"sun.beans.editors"}.
*/
- public static synchronized String[] getEditorSearchPath() {
- return searchPath.clone();
+ public static String[] getEditorSearchPath() {
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ return finder.getPackages();
+ }
}
/**
@@ -156,28 +129,25 @@
* of system properties.
* @see SecurityManager#checkPropertiesAccess
*/
- public static synchronized void setEditorSearchPath(String[] path) {
+ public static void setEditorSearchPath(String[] path) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- searchPath = (path != null)
- ? path.clone()
- : EMPTY;
+ PropertyEditorFinder finder = getFinder();
+ synchronized (finder) {
+ finder.setPackages(path);
+ }
}
- private static String[] searchPath = { "sun.beans.editors" };
- private static final String[] EMPTY = {};
- private static final WeakCache<Class<?>, Class<?>> registry;
-
- static {
- registry = new WeakCache<Class<?>, Class<?>>();
- registry.put(Byte.TYPE, ByteEditor.class);
- registry.put(Short.TYPE, ShortEditor.class);
- registry.put(Integer.TYPE, IntegerEditor.class);
- registry.put(Long.TYPE, LongEditor.class);
- registry.put(Boolean.TYPE, BooleanEditor.class);
- registry.put(Float.TYPE, FloatEditor.class);
- registry.put(Double.TYPE, DoubleEditor.class);
+ private static PropertyEditorFinder getFinder() {
+ AppContext context = AppContext.getAppContext();
+ Object object = context.get(FINDER_KEY);
+ if (object instanceof PropertyEditorFinder) {
+ return (PropertyEditorFinder) object;
+ }
+ PropertyEditorFinder finder = new PropertyEditorFinder();
+ context.put(FINDER_KEY, finder);
+ return finder;
}
}
--- a/jdk/src/share/classes/java/beans/Statement.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/beans/Statement.java Thu Jul 30 12:25:39 2009 -0700
@@ -66,6 +66,7 @@
Object target;
String methodName;
Object[] arguments;
+ ClassLoader loader;
/**
* Creates a new <code>Statement</code> object with a <code>target</code>,
@@ -157,7 +158,7 @@
// of core from a class inside core. Special
// case this method.
if (target == Class.class && methodName.equals("forName")) {
- return ClassFinder.resolveClass((String)arguments[0]);
+ return ClassFinder.resolveClass((String)arguments[0], this.loader);
}
Class[] argClasses = new Class[arguments.length];
for(int i = 0; i < arguments.length; i++) {
--- a/jdk/src/share/classes/java/lang/Byte.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/Byte.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -90,8 +90,8 @@
* If a new {@code Byte} instance is not required, this method
* should generally be used in preference to the constructor
* {@link #Byte(byte)}, as this method is likely to yield
- * significantly better space and time performance by caching
- * frequently requested values.
+ * significantly better space and time performance since
+ * all byte values are cached.
*
* @param b a byte value.
* @return a {@code Byte} instance representing {@code b}.
--- a/jdk/src/share/classes/java/lang/Character.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/Character.java Thu Jul 30 12:25:39 2009 -0700
@@ -2571,6 +2571,10 @@
* significantly better space and time performance by caching
* frequently requested values.
*
+ * This method will always cache values in the range '\u0000'
+ * to '\u007f'", inclusive, and may cache other values outside
+ * of this range.
+ *
* @param c a char value.
* @return a <tt>Character</tt> instance representing <tt>c</tt>.
* @since 1.5
--- a/jdk/src/share/classes/java/lang/Class.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/Class.java Thu Jul 30 12:25:39 2009 -0700
@@ -627,7 +627,7 @@
*
* @return an array of {@code TypeVariable} objects that represent
* the type variables declared by this generic declaration
- * @throws GenericSignatureFormatError if the generic
+ * @throws java.lang.reflect.GenericSignatureFormatError if the generic
* signature of this generic declaration does not conform to
* the format specified in the Java Virtual Machine Specification,
* 3rd edition
@@ -673,12 +673,12 @@
* {@code Class} object representing the {@code Object} class is
* returned.
*
- * @throws GenericSignatureFormatError if the generic
+ * @throws java.lang.reflect.GenericSignatureFormatError if the generic
* class signature does not conform to the format specified in the
* Java Virtual Machine Specification, 3rd edition
* @throws TypeNotPresentException if the generic superclass
* refers to a non-existent type declaration
- * @throws MalformedParameterizedTypeException if the
+ * @throws java.lang.reflect.MalformedParameterizedTypeException if the
* generic superclass refers to a parameterized type that cannot be
* instantiated for any reason
* @return the superclass of the class represented by this object
@@ -795,14 +795,14 @@
* <p>If this object represents a primitive type or void, the
* method returns an array of length 0.
*
- * @throws GenericSignatureFormatError
+ * @throws java.lang.reflect.GenericSignatureFormatError
* if the generic class signature does not conform to the format
* specified in the Java Virtual Machine Specification, 3rd edition
* @throws TypeNotPresentException if any of the generic
* superinterfaces refers to a non-existent type declaration
- * @throws MalformedParameterizedTypeException if any of the
- * generic superinterfaces refer to a parameterized type that cannot
- * be instantiated for any reason
+ * @throws java.lang.reflect.MalformedParameterizedTypeException
+ * if any of the generic superinterfaces refer to a parameterized
+ * type that cannot be instantiated for any reason
* @return an array of interfaces implemented by this class
* @since 1.5
*/
--- a/jdk/src/share/classes/java/lang/Integer.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/Integer.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -638,6 +638,9 @@
* to yield significantly better space and time performance by
* caching frequently requested values.
*
+ * This method will always cache values in the range -128 to 127,
+ * inclusive, and may cache other values outside of this range.
+ *
* @param i an {@code int} value.
* @return an {@code Integer} instance representing {@code i}.
* @since 1.5
--- a/jdk/src/share/classes/java/lang/Long.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/Long.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -560,6 +560,11 @@
* significantly better space and time performance by caching
* frequently requested values.
*
+ * Note that unlike the {@linkplain Integer#valueOf(int)
+ * corresponding method} in the {@code Integer} class, this method
+ * is <em>not</em> required to cache values within a particular
+ * range.
+ *
* @param l a long value.
* @return a {@code Long} instance representing {@code l}.
* @since 1.5
--- a/jdk/src/share/classes/java/lang/Short.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/Short.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -219,6 +219,9 @@
* significantly better space and time performance by caching
* frequently requested values.
*
+ * This method will always cache values in the range -128 to 127,
+ * inclusive, and may cache other values outside of this range.
+ *
* @param s a short value.
* @return a {@code Short} instance representing {@code s}.
* @since 1.5
--- a/jdk/src/share/classes/java/lang/System.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/lang/System.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/jdk/src/share/classes/java/net/URLClassLoader.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/net/URLClassLoader.java Thu Jul 30 12:25:39 2009 -0700
@@ -306,6 +306,35 @@
}
/*
+ * Retrieve the package using the specified package name.
+ * If non-null, verify the package using the specified code
+ * source and manifest.
+ */
+ private Package getAndVerifyPackage(String pkgname,
+ Manifest man, URL url) {
+ Package pkg = getPackage(pkgname);
+ if (pkg != null) {
+ // Package found, so check package sealing.
+ if (pkg.isSealed()) {
+ // Verify that code source URL is the same.
+ if (!pkg.isSealed(url)) {
+ throw new SecurityException(
+ "sealing violation: package " + pkgname + " is sealed");
+ }
+ } else {
+ // Make sure we are not attempting to seal the package
+ // at this code source URL.
+ if ((man != null) && isSealed(pkgname, man)) {
+ throw new SecurityException(
+ "sealing violation: can't seal package " + pkgname +
+ ": already loaded");
+ }
+ }
+ }
+ return pkg;
+ }
+
+ /*
* Defines a Class using the class bytes obtained from the specified
* Resource. The resulting Class must be resolved before it can be
* used.
@@ -316,32 +345,23 @@
if (i != -1) {
String pkgname = name.substring(0, i);
// Check if package already loaded.
- Package pkg = getPackage(pkgname);
Manifest man = res.getManifest();
- if (pkg != null) {
- // Package found, so check package sealing.
- if (pkg.isSealed()) {
- // Verify that code source URL is the same.
- if (!pkg.isSealed(url)) {
- throw new SecurityException(
- "sealing violation: package " + pkgname + " is sealed");
+ if (getAndVerifyPackage(pkgname, man, url) == null) {
+ try {
+ if (man != null) {
+ definePackage(pkgname, man, url);
+ } else {
+ definePackage(pkgname, null, null, null, null, null, null, null);
}
-
- } else {
- // Make sure we are not attempting to seal the package
- // at this code source URL.
- if ((man != null) && isSealed(pkgname, man)) {
- throw new SecurityException(
- "sealing violation: can't seal package " + pkgname +
- ": already loaded");
+ } catch (IllegalArgumentException iae) {
+ // parallel-capable class loaders: re-verify in case of a
+ // race condition
+ if (getAndVerifyPackage(pkgname, man, url) == null) {
+ // Should never happen
+ throw new AssertionError("Cannot find package " +
+ pkgname);
}
}
- } else {
- if (man != null) {
- definePackage(pkgname, man, url);
- } else {
- definePackage(pkgname, null, null, null, null, null, null, null);
- }
}
}
// Now read the class bytes and define the class
--- a/jdk/src/share/classes/java/nio/file/LinkPermission.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/nio/file/LinkPermission.java Thu Jul 30 12:25:39 2009 -0700
@@ -46,7 +46,7 @@
* known as creating a link, or hard link. </td>
* <td> Extreme care should be taken when granting this permission. It allows
* linking to any file or directory in the file system thus allowing the
- * attacker to access to all files. </td>
+ * attacker access to all files. </td>
* </tr>
* <tr>
* <td>symbolic</td>
--- a/jdk/src/share/classes/java/nio/file/NotLinkException.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/nio/file/NotLinkException.java Thu Jul 30 12:25:39 2009 -0700
@@ -27,7 +27,7 @@
/**
* Checked exception thrown when a file system operation fails because a file
- * is not a link.
+ * is not a symbolic link.
*
* @since 1.7
*/
--- a/jdk/src/share/classes/java/nio/file/Path.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/nio/file/Path.java Thu Jul 30 12:25:39 2009 -0700
@@ -91,8 +91,8 @@
* iterate over the entries in the directory. </p></li>
* <li><p> Files can be {@link #copyTo(Path,CopyOption[]) copied} or
* {@link #moveTo(Path,CopyOption[]) moved}. </p></li>
- * <li><p> Symbolic-links may be {@link #createSymbolicLink created}, or the
- * target of a link may be {@link #readSymbolicLink read}. </p></li>
+ * <li><p> Symbolic links may be {@link #createSymbolicLink created}, or the
+ * target of a symbolic link may be {@link #readSymbolicLink read}. </p></li>
* <li><p> The {@link #toRealPath real} path of an existing file may be
* obtained. </li></p>
* </ul>
@@ -403,12 +403,12 @@
* <i>p</i><tt>.relativize(</tt><i>p</i><tt>.resolve(</tt><i>q</i><tt>)).equals(</tt><i>q</i><tt>)</tt>
* </blockquote>
*
- * <p> When symbolic-links are supported, then whether the resulting path,
+ * <p> When symbolic links are supported, then whether the resulting path,
* when resolved against this path, yields a path that can be used to locate
* the {@link #isSameFile same} file as {@code other} is implementation
* dependent. For example, if this path is {@code "/a/b"} and the given
* path is {@code "/a/x"} then the resulting relative path may be {@code
- * "../x"}. If {@code "b"} is a symbolic-link then is implementation
+ * "../x"}. If {@code "b"} is a symbolic link then is implementation
* dependent if {@code "a/b/../x"} would locate the same file as {@code "/a/x"}.
*
* @param other
@@ -430,8 +430,8 @@
*
* <p> An implementation may require to examine the file to determine if the
* file is a directory. Consequently this method may not be atomic with respect
- * to other file system operations. If the file is a symbolic-link then the
- * link is deleted and not the final target of the link.
+ * to other file system operations. If the file is a symbolic link then the
+ * symbolic link itself, not the final target of the link, is deleted.
*
* <p> If the file is a directory then the directory must be empty. In some
* implementations a directory has entries for special files or links that
@@ -459,11 +459,11 @@
/**
* Deletes the file located by this path, if it exists.
*
- * <p> As with the {@link #delete delete()} method, an implementation
- * may require to examine the file to determine if the file is a directory.
+ * <p> As with the {@link #delete delete()} method, an implementation may
+ * need to examine the file to determine if the file is a directory.
* Consequently this method may not be atomic with respect to other file
- * system operations. If the file is a symbolic-link then the link is
- * deleted and not the final target of the link.
+ * system operations. If the file is a symbolic link, then the symbolic
+ * link itself, not the final target of the link, is deleted.
*
* <p> If the file is a directory then the directory must be empty. In some
* implementations a directory has entries for special files or links that
@@ -507,7 +507,7 @@
* create symbolic links, in which case this method may throw {@code IOException}.
*
* @param target
- * the target of the link
+ * the target of the symbolic link
* @param attrs
* the array of attributes to set atomically when creating the
* symbolic link
@@ -573,9 +573,9 @@
* Reads the target of a symbolic link <i>(optional operation)</i>.
*
* <p> If the file system supports <a href="package-summary.html#links">symbolic
- * links</a> then this method is used read the target of the link, failing
- * if the file is not a link. The target of the link need not exist. The
- * returned {@code Path} object will be associated with the same file
+ * links</a> then this method is used to read the target of the link, failing
+ * if the file is not a symbolic link. The target of the link need not exist.
+ * The returned {@code Path} object will be associated with the same file
* system as this {@code Path}.
*
* @return a {@code Path} object representing the target of the link
@@ -584,7 +584,7 @@
* if the implementation does not support symbolic links
* @throws NotLinkException
* if the target could otherwise not be read because the file
- * is not a link <i>(optional specific exception)</i>
+ * is not a symbolic link <i>(optional specific exception)</i>
* @throws IOException
* if an I/O error occurs
* @throws SecurityException
@@ -724,8 +724,8 @@
* exists, except if the source and target are the {@link #isSameFile same}
* file, in which case this method has no effect. File attributes are not
* required to be copied to the target file. If symbolic links are supported,
- * and the file is a link, then the final target of the link is copied. If
- * the file is a directory then it creates an empty directory in the target
+ * and the file is a symbolic link, then the final target of the link is copied.
+ * If the file is a directory then it creates an empty directory in the target
* location (entries in the directory are not copied). This method can be
* used with the {@link Files#walkFileTree Files.walkFileTree} utility
* method to copy a directory and all entries in the directory, or an entire
@@ -740,8 +740,8 @@
* <td> {@link StandardCopyOption#REPLACE_EXISTING REPLACE_EXISTING} </td>
* <td> If the target file exists, then the target file is replaced if it
* is not a non-empty directory. If the target file exists and is a
- * symbolic-link then the symbolic-link is replaced (not the target of
- * the link. </td>
+ * symbolic link, then the symbolic link itself, not the target of
+ * the link, is replaced. </td>
* </tr>
* <tr>
* <td> {@link StandardCopyOption#COPY_ATTRIBUTES COPY_ATTRIBUTES} </td>
@@ -755,11 +755,11 @@
* </tr>
* <tr>
* <td> {@link LinkOption#NOFOLLOW_LINKS NOFOLLOW_LINKS} </td>
- * <td> Symbolic-links are not followed. If the file, located by this path,
- * is a symbolic-link then the link is copied rather than the target of
- * the link. It is implementation specific if file attributes can be
- * copied to the new link. In other words, the {@code COPY_ATTRIBUTES}
- * option may be ignored when copying a link. </td>
+ * <td> Symbolic links are not followed. If the file, located by this path,
+ * is a symbolic link, then the symbolic link itself, not the target of
+ * the link, is copied. It is implementation specific if file attributes
+ * can be copied to the new link. In other words, the {@code
+ * COPY_ATTRIBUTES} option may be ignored when copying a symbolic link. </td>
* </tr>
* </table>
*
@@ -807,18 +807,19 @@
* <p> By default, this method attempts to move the file to the target
* location, failing if the target file exists except if the source and
* target are the {@link #isSameFile same} file, in which case this method
- * has no effect. If the file is a symbolic link then the link is moved and
- * not the target of the link. This method may be invoked to move an empty
- * directory. In some implementations a directory has entries for special
- * files or links that are created when the directory is created. In such
- * implementations a directory is considered empty when only the special
- * entries exist. When invoked to move a directory that is not empty then the
- * directory is moved if it does not require moving the entries in the directory.
- * For example, renaming a directory on the same {@link FileStore} will usually
- * not require moving the entries in the directory. When moving a directory
- * requires that its entries be moved then this method fails (by throwing
- * an {@code IOException}). To move a <i>file tree</i> may involve copying
- * rather than moving directories and this can be done using the {@link
+ * has no effect. If the file is a symbolic link then the symbolic link
+ * itself, not the target of the link, is moved. This method may be
+ * invoked to move an empty directory. In some implementations a directory
+ * has entries for special files or links that are created when the
+ * directory is created. In such implementations a directory is considered
+ * empty when only the special entries exist. When invoked to move a
+ * directory that is not empty then the directory is moved if it does not
+ * require moving the entries in the directory. For example, renaming a
+ * directory on the same {@link FileStore} will usually not require moving
+ * the entries in the directory. When moving a directory requires that its
+ * entries be moved then this method fails (by throwing an {@code
+ * IOException}). To move a <i>file tree</i> may involve copying rather
+ * than moving directories and this can be done using the {@link
* #copyTo copyTo} method in conjunction with the {@link
* Files#walkFileTree Files.walkFileTree} utility method.
*
@@ -831,8 +832,8 @@
* <td> {@link StandardCopyOption#REPLACE_EXISTING REPLACE_EXISTING} </td>
* <td> If the target file exists, then the target file is replaced if it
* is not a non-empty directory. If the target file exists and is a
- * symbolic-link then the symbolic-link is replaced and not the target of
- * the link. </td>
+ * symbolic link, then the symbolic link itself, not the target of
+ * the link, is replaced. </td>
* </tr>
* <tr>
* <td> {@link StandardCopyOption#ATOMIC_MOVE ATOMIC_MOVE} </td>
@@ -1495,7 +1496,7 @@
*
* <p> Where a file is registered with a watch service by means of a symbolic
* link then it is implementation specific if the watch continues to depend
- * on the existence of the link after it is registered.
+ * on the existence of the symbolic link after it is registered.
*
* @param watcher
* the watch service to which this object is to be registered
--- a/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java Thu Jul 30 12:25:39 2009 -0700
@@ -166,12 +166,13 @@
/**
* Deletes a file.
*
- * <p> Unlike the {@link Path#delete delete()} method, this method
- * does not first examine the file to determine if the file is a directory.
+ * <p> Unlike the {@link Path#delete delete()} method, this method does
+ * not first examine the file to determine if the file is a directory.
* Whether a directory is deleted by this method is system dependent and
- * therefore not specified. If the file is a symbolic-link then the link is
- * deleted (not the final target of the link). When the parameter is a
- * relative path then the file to delete is relative to this open directory.
+ * therefore not specified. If the file is a symbolic link, then the link
+ * itself, not the final target of the link, is deleted. When the
+ * parameter is a relative path then the file to delete is relative to
+ * this open directory.
*
* @param path
* the path of the file to delete
--- a/jdk/src/share/classes/java/nio/file/attribute/Attributes.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/nio/file/attribute/Attributes.java Thu Jul 30 12:25:39 2009 -0700
@@ -48,9 +48,9 @@
* symbolic links are followed and the file attributes of the final target
* of the link are read. If the option {@link LinkOption#NOFOLLOW_LINKS
* NOFOLLOW_LINKS} is present then symbolic links are not followed and so
- * the method returns the file attributes of the symbolic link. This option
- * should be used where there is a need to determine if a file is a
- * symbolic link:
+ * the method returns the file attributes of the symbolic link itself.
+ * This option should be used where there is a need to determine if a
+ * file is a symbolic link:
* <pre>
* boolean isSymbolicLink = Attributes.readBasicFileAttributes(file, NOFOLLOW_LINKS).isSymbolicLink();
* </pre>
@@ -98,7 +98,7 @@
* symbolic links are followed and the file attributes of the final target
* of the link are read. If the option {@link LinkOption#NOFOLLOW_LINKS
* NOFOLLOW_LINKS} is present then symbolic links are not followed and so
- * the method returns the file attributes of the symbolic link.
+ * the method returns the file attributes of the symbolic link itself.
*
* @param file
* A file reference that locates the file
@@ -145,7 +145,7 @@
* symbolic links are followed and the file attributes of the final target
* of the link are read. If the option {@link LinkOption#NOFOLLOW_LINKS
* NOFOLLOW_LINKS} is present then symbolic links are not followed and so
- * the method returns the file attributes of the symbolic link.
+ * the method returns the file attributes of the symbolic link itself.
*
* @param file
* A file reference that locates the file
--- a/jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java Thu Jul 30 12:25:39 2009 -0700
@@ -81,13 +81,13 @@
boolean isDirectory();
/**
- * Tells whether the file is a symbolic-link.
+ * Tells whether the file is a symbolic link.
*/
boolean isSymbolicLink();
/**
* Tells whether the file is something other than a regular file, directory,
- * or link.
+ * or symbolic link.
*/
boolean isOther();
--- a/jdk/src/share/classes/javax/swing/DefaultDesktopManager.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/javax/swing/DefaultDesktopManager.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -708,7 +708,7 @@
// update window if it's non-opaque
Window topLevel = SwingUtilities.getWindowAncestor(f);
Toolkit tk = Toolkit.getDefaultToolkit();
- if (!AWTAccessor.getWindowAccessor().isOpaque(topLevel) &&
+ if (!topLevel.isOpaque() &&
(tk instanceof SunToolkit) &&
((SunToolkit)tk).needUpdateWindow())
{
--- a/jdk/src/share/classes/javax/swing/RepaintManager.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/javax/swing/RepaintManager.java Thu Jul 30 12:25:39 2009 -0700
@@ -732,7 +732,7 @@
(Window)dirty :
SwingUtilities.getWindowAncestor(dirty);
if (window != null &&
- !AWTAccessor.getWindowAccessor().isOpaque(window))
+ !window.isOpaque())
{
windows.add(window);
}
@@ -996,7 +996,7 @@
// If the window is non-opaque, it's double-buffered at peer's level
Window w = (c instanceof Window) ? (Window)c : SwingUtilities.getWindowAncestor(c);
- if (!AWTAccessor.getWindowAccessor().isOpaque(w)) {
+ if (!w.isOpaque()) {
Toolkit tk = Toolkit.getDefaultToolkit();
if ((tk instanceof SunToolkit) && (((SunToolkit)tk).needUpdateWindow())) {
return null;
@@ -1032,7 +1032,7 @@
// If the window is non-opaque, it's double-buffered at peer's level
Window w = (c instanceof Window) ? (Window)c : SwingUtilities.getWindowAncestor(c);
- if (!AWTAccessor.getWindowAccessor().isOpaque(w)) {
+ if (!w.isOpaque()) {
Toolkit tk = Toolkit.getDefaultToolkit();
if ((tk instanceof SunToolkit) && (((SunToolkit)tk).needUpdateWindow())) {
return null;
--- a/jdk/src/share/classes/sun/awt/AWTAccessor.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java Thu Jul 30 12:25:39 2009 -0700
@@ -137,11 +137,6 @@
*/
void setShape(Window window, Shape shape);
/*
- * Identify whether the given window is opaque (true)
- * or translucent (false).
- */
- boolean isOpaque(Window window);
- /*
* Set the opaque preoperty to the given window.
*/
void setOpaque(Window window, boolean isOpaque);
--- a/jdk/src/share/classes/sun/awt/SunToolkit.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/awt/SunToolkit.java Thu Jul 30 12:25:39 2009 -0700
@@ -1985,8 +1985,7 @@
*/
public static boolean isContainingTopLevelOpaque(Component c) {
Window w = getContainingWindow(c);
- return w != null && ((Window)w).getBackground() != null &&
- ((Window)w).getBackground().getAlpha() == 255;
+ return w != null && w.isOpaque();
}
/**
--- a/jdk/src/share/classes/sun/net/www/http/HttpCapture.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/net/www/http/HttpCapture.java Thu Jul 30 12:25:39 2009 -0700
@@ -25,6 +25,8 @@
package sun.net.www.http;
import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -60,6 +62,76 @@
private static boolean initialized = false;
private static volatile ArrayList<Pattern> patterns = null;
private static volatile ArrayList<String> capFiles = null;
+ /* Logging is done in an ugly way so that it does not require the presence
+ * the java.util.logging package. If the Logger class is not available, then
+ * logging is turned off. This is for helping the modularization effort.
+ */
+ private static Object logger = null;
+ private static boolean logging = false;
+
+ static {
+ Class cl;
+ try {
+ cl = Class.forName("java.util.logging.Logger");
+ } catch (ClassNotFoundException ex) {
+ cl = null;
+ }
+ if (cl != null) {
+ try {
+ Method m = cl.getMethod("getLogger", String.class);
+ logger = m.invoke(null, "sun.net.www.protocol.http.HttpURLConnection");
+ logging = true;
+ } catch (NoSuchMethodException noSuchMethodException) {
+ } catch (SecurityException securityException) {
+ } catch (IllegalAccessException illegalAccessException) {
+ } catch (IllegalArgumentException illegalArgumentException) {
+ } catch (InvocationTargetException invocationTargetException) {
+ }
+ }
+ }
+
+ public static void fine(String s) {
+ if (logging) {
+ ((Logger)logger).fine(s);
+ }
+ }
+
+ public static void finer(String s) {
+ if (logging) {
+ ((Logger)logger).finer(s);
+ }
+ }
+
+ public static void finest(String s) {
+ if (logging) {
+ ((Logger)logger).finest(s);
+ }
+ }
+
+ public static void severe(String s) {
+ if (logging) {
+ ((Logger)logger).finest(s);
+ }
+ }
+
+ public static void info(String s) {
+ if (logging) {
+ ((Logger)logger).info(s);
+ }
+ }
+
+ public static void warning(String s) {
+ if (logging) {
+ ((Logger)logger).warning(s);
+ }
+ }
+
+ public static boolean isLoggable(String level) {
+ if (!logging) {
+ return false;
+ }
+ return ((Logger)logger).isLoggable(Level.parse(level));
+ }
private static synchronized void init() {
initialized = true;
--- a/jdk/src/share/classes/sun/net/www/http/HttpClient.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/net/www/http/HttpClient.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,6 @@
import java.io.*;
import java.net.*;
import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import sun.net.NetworkClient;
import sun.net.ProgressSource;
import sun.net.www.MessageHeader;
@@ -66,10 +64,6 @@
/** Default port number for http daemons. REMIND: make these private */
static final int httpPortNumber = 80;
- // Use same logger as HttpURLConnection since we want to combine both event
- // streams into one single HTTP log
- private static Logger logger = Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection");
-
/** return default port number (subclasses may override) */
protected int getDefaultPort () { return httpPortNumber; }
@@ -810,8 +804,8 @@
if (isKeepingAlive()) {
// Wrap KeepAliveStream if keep alive is enabled.
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("KeepAlive stream used: " + url);
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("KeepAlive stream used: " + url);
}
serverInput = new KeepAliveStream(serverInput, pi, cl, this);
failedOnce = false;
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpLogFormatter.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpLogFormatter.java Thu Jul 30 12:25:39 2009 -0700
@@ -49,8 +49,7 @@
@Override
public String format(LogRecord record) {
- if (!"sun.net.www.protocol.http.HttpURLConnection".equalsIgnoreCase(record.getSourceClassName())
- && !"sun.net.www.http.HttpClient".equalsIgnoreCase(record.getSourceClassName())) {
+ if (!"sun.net.www.http.HttpCapture".equalsIgnoreCase(record.getSourceClassName())) {
// Don't change format for stuff that doesn't concern us
return super.format(record);
}
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Thu Jul 30 12:25:39 2009 -0700
@@ -51,14 +51,13 @@
import java.util.Locale;
import java.util.StringTokenizer;
import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import sun.net.*;
import sun.net.www.*;
import sun.net.www.http.HttpClient;
import sun.net.www.http.PosterOutputStream;
import sun.net.www.http.ChunkedInputStream;
import sun.net.www.http.ChunkedOutputStream;
+import sun.net.www.http.HttpCapture;
import java.text.SimpleDateFormat;
import java.util.TimeZone;
import java.net.MalformedURLException;
@@ -71,8 +70,6 @@
public class HttpURLConnection extends java.net.HttpURLConnection {
- private static Logger logger = Logger.getLogger("sun.net.www.protocol.http.HttpURLConnection");
-
static String HTTP_CONNECT = "CONNECT";
static final String version;
@@ -304,14 +301,14 @@
return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<PasswordAuthentication>() {
public PasswordAuthentication run() {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Requesting Authentication: host =" + host + " url = " + url);
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("Requesting Authentication: host =" + host + " url = " + url);
}
PasswordAuthentication pass = Authenticator.requestPasswordAuthentication(
host, addr, port, protocol,
prompt, scheme, url, authType);
- if (pass != null && logger.isLoggable(Level.FINEST)) {
- logger.finest("Authentication returned: " + pass.toString());
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("Authentication returned: " + (pass != null ? pass.toString() : "null"));
}
return pass;
}
@@ -466,8 +463,8 @@
setRequests=true;
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine(requests.toString());
+ if (HttpCapture.isLoggable("FINE")) {
+ HttpCapture.fine(requests.toString());
}
http.writeRequests(requests, poster);
if (ps.checkError()) {
@@ -723,11 +720,9 @@
&& !(cachedResponse instanceof SecureCacheResponse)) {
cachedResponse = null;
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Cache Request for " + uri + " / " + getRequestMethod());
- if (cachedResponse != null) {
- logger.finest("From cache: "+cachedResponse.toString());
- }
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("Cache Request for " + uri + " / " + getRequestMethod());
+ HttpCapture.finest("From cache: " + (cachedResponse != null ? cachedResponse.toString() : "null"));
}
if (cachedResponse != null) {
cachedHeaders = mapToMessageHeader(cachedResponse.getHeaders());
@@ -766,8 +761,8 @@
});
if (sel != null) {
URI uri = sun.net.www.ParseUtil.toURI(url);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("ProxySelector Request for " + uri);
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("ProxySelector Request for " + uri);
}
Iterator<Proxy> it = sel.select(uri).iterator();
Proxy p;
@@ -783,9 +778,9 @@
http = getNewHttpClient(url, p, connectTimeout, false);
http.setReadTimeout(readTimeout);
}
- if (logger.isLoggable(Level.FINEST)) {
+ if (HttpCapture.isLoggable("FINEST")) {
if (p != null) {
- logger.finest("Proxy used: " + p.toString());
+ HttpCapture.finest("Proxy used: " + p.toString());
}
}
break;
@@ -1015,15 +1010,15 @@
URI uri = ParseUtil.toURI(url);
if (uri != null) {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("CookieHandler request for " + uri);
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("CookieHandler request for " + uri);
}
Map<String, List<String>> cookies
= cookieHandler.get(
uri, requests.getHeaders(EXCLUDE_HEADERS));
if (!cookies.isEmpty()) {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Cookies retrieved: " + cookies.toString());
+ if (HttpCapture.isLoggable("FINEST")) {
+ HttpCapture.finest("Cookies retrieved: " + cookies.toString());
}
for (Map.Entry<String, List<String>> entry :
cookies.entrySet()) {
@@ -1154,8 +1149,8 @@
writeRequests();
}
http.parseHTTP(responses, pi, this);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine(responses.toString());
+ if (HttpCapture.isLoggable("FINE")) {
+ HttpCapture.fine(responses.toString());
}
inputStream = http.getInputStream();
@@ -1599,8 +1594,8 @@
http.parseHTTP(responses, null, this);
/* Log the response to the CONNECT */
- if (logger.isLoggable(Level.FINE)) {
- logger.fine(responses.toString());
+ if (HttpCapture.isLoggable("FINE")) {
+ HttpCapture.fine(responses.toString());
}
statusLine = responses.getValue(0);
@@ -1727,8 +1722,8 @@
setPreemptiveProxyAuthentication(requests);
/* Log the CONNECT request */
- if (logger.isLoggable(Level.FINE)) {
- logger.fine(requests.toString());
+ if (HttpCapture.isLoggable("FINE")) {
+ HttpCapture.fine(requests.toString());
}
http.writeRequests(requests, null);
@@ -1872,8 +1867,8 @@
}
}
}
- if (logger.isLoggable(Level.FINER)) {
- logger.finer("Proxy Authentication for " + authhdr.toString() +" returned " + ret.toString());
+ if (HttpCapture.isLoggable("FINER")) {
+ HttpCapture.finer("Proxy Authentication for " + authhdr.toString() +" returned " + (ret != null ? ret.toString() : "null"));
}
return ret;
}
@@ -2002,8 +1997,8 @@
}
}
}
- if (logger.isLoggable(Level.FINER)) {
- logger.finer("Server Authentication for " + authhdr.toString() +" returned " + ret.toString());
+ if (HttpCapture.isLoggable("FINER")) {
+ HttpCapture.finer("Server Authentication for " + authhdr.toString() +" returned " + (ret != null ? ret.toString() : "null"));
}
return ret;
}
@@ -2078,8 +2073,8 @@
if (streaming()) {
throw new HttpRetryException (RETRY_MSG3, stat, loc);
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Redirected from " + url + " to " + locUrl);
+ if (HttpCapture.isLoggable("FINE")) {
+ HttpCapture.fine("Redirected from " + url + " to " + locUrl);
}
// clear out old response headers!!!!
--- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java Thu Jul 30 12:25:39 2009 -0700
@@ -238,7 +238,7 @@
retVal = (int)(getEndTime().getTime()
- (new Date().getTime()));
- return retVal;
+ return retVal/1000;
}
/**
--- a/jdk/src/share/classes/sun/security/krb5/Config.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/security/krb5/Config.java Thu Jul 30 12:25:39 2009 -0700
@@ -123,7 +123,7 @@
java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction
("java.security.krb5.kdc"));
- defaultRealm =
+ defaultRealm =
java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction
("java.security.krb5.realm"));
@@ -134,6 +134,16 @@
"java.security.krb5.realm both must be set or " +
"neither must be set.");
}
+
+ // Read the Kerberos configuration file
+ try {
+ Vector<String> configFile;
+ configFile = loadConfigFile();
+ stanzaTable = parseStanzaTable(configFile);
+ } catch (IOException ioe) {
+ // No krb5.conf, no problem. We'll use DNS etc.
+ }
+
if (kdchost != null) {
/*
* If configuration information is only specified by
@@ -141,22 +151,19 @@
* java.security.krb5.realm, we put both in the hashtable
* under [libdefaults].
*/
- Hashtable<String,String> kdcs = new Hashtable<String,String> ();
+ if (stanzaTable == null) {
+ stanzaTable = new Hashtable<String,Object> ();
+ }
+ Hashtable<String,String> kdcs =
+ (Hashtable<String,String>)stanzaTable.get("libdefaults");
+ if (kdcs == null) {
+ kdcs = new Hashtable<String,String> ();
+ stanzaTable.put("libdefaults", kdcs);
+ }
kdcs.put("default_realm", defaultRealm);
// The user can specify a list of kdc hosts separated by ":"
kdchost = kdchost.replace(':', ' ');
kdcs.put("kdc", kdchost);
- stanzaTable = new Hashtable<String,Object> ();
- stanzaTable.put("libdefaults", kdcs);
- } else {
- // Read the Kerberos configuration file
- try {
- Vector<String> configFile;
- configFile = loadConfigFile();
- stanzaTable = parseStanzaTable(configFile);
- } catch (IOException ioe) {
- // No krb5.conf, no problem. We'll use DNS etc.
- }
}
}
@@ -294,7 +301,7 @@
* hashtable.
*/
if (name.equalsIgnoreCase("kdc") &&
- (!section.equalsIgnoreCase("libdefaults")) &&
+ (section.equalsIgnoreCase(getDefault("default_realm", "libdefaults"))) &&
(java.security.AccessController.doPrivileged(
new sun.security.action.
GetPropertyAction("java.security.krb5.kdc")) != null)) {
--- a/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
import sun.security.action.GetPropertyAction;
import sun.security.util.Debug;
+import sun.security.util.DerOutputStream;
import sun.security.x509.*;
/**
@@ -333,7 +334,15 @@
if (match == false) {
return false;
}
- indirectCRL = true;
+
+ // we accept the case that a CRL issuer provide status
+ // information for itself.
+ if (ForwardBuilder.issues(certImpl, crlImpl, provider)) {
+ // reset the public key used to verify the CRL's signature
+ prevKey = certImpl.getPublicKey();
+ } else {
+ indirectCRL = true;
+ }
} else if (crlIssuer.equals(certIssuer) == false) {
if (debug != null) {
debug.println("crl issuer does not equal cert issuer");
@@ -347,7 +356,14 @@
PKIXExtensions.AuthorityKey_Id.toString());
if (!Arrays.equals(certAKID, crlAKID)) {
- indirectCRL = true;
+ // we accept the case that a CRL issuer provide status
+ // information for itself.
+ if (ForwardBuilder.issues(certImpl, crlImpl, provider)) {
+ // reset the public key used to verify the CRL's signature
+ prevKey = certImpl.getPublicKey();
+ } else {
+ indirectCRL = true;
+ }
}
}
@@ -542,10 +558,80 @@
certSel.setSubject(crlIssuer.asX500Principal());
boolean[] crlSign = {false,false,false,false,false,false,true};
certSel.setKeyUsage(crlSign);
+
+ // Currently by default, forward builder does not enable
+ // subject/authority key identifier identifying for target
+ // certificate, instead, it only compares the CRL issuer and
+ // the target certificate subject. If the certificate of the
+ // delegated CRL issuer is a self-issued certificate, the
+ // builder is unable to find the proper CRL issuer by issuer
+ // name only, there is a potential dead loop on finding the
+ // proper issuer. It is of great help to narrow the target
+ // scope down to aware of authority key identifiers in the
+ // selector, for the purposes of breaking the dead loop.
+ AuthorityKeyIdentifierExtension akidext =
+ crlImpl.getAuthKeyIdExtension();
+ if (akidext != null) {
+ KeyIdentifier akid = (KeyIdentifier)akidext.get(akidext.KEY_ID);
+ if (akid != null) {
+ DerOutputStream derout = new DerOutputStream();
+ derout.putOctetString(akid.getIdentifier());
+ certSel.setSubjectKeyIdentifier(derout.toByteArray());
+ }
+
+ SerialNumber asn =
+ (SerialNumber)akidext.get(akidext.SERIAL_NUMBER);
+ if (asn != null) {
+ certSel.setSerialNumber(asn.getNumber());
+ }
+ // the subject criterion will be set by builder automatically.
+ }
+
+ // by far, we have validated the previous certificate, we can
+ // trust it during validating the CRL issuer.
+ // Except the performance improvement, another benefit is to break
+ // the dead loop while looking for the issuer back and forth
+ // between the delegated self-issued certificate and its issuer.
+ Set<TrustAnchor> trustAnchors = new HashSet<TrustAnchor>();
+ if (anchor != null) {
+ trustAnchors.add(anchor);
+ }
+
+ if (prevKey != null) {
+ // if the previous key is of the anchor, don't bother to
+ // duplicate the trust.
+ boolean duplicated = false;
+ PublicKey publicKey = prevKey;
+ X500Principal principal = certImpl.getIssuerX500Principal();
+
+ if (anchor != null) {
+ X509Certificate trustedCert = anchor.getTrustedCert();
+ X500Principal trustedPrincipal;
+ PublicKey trustedPublicKey;
+ if (trustedCert != null) {
+ trustedPrincipal = trustedCert.getSubjectX500Principal();
+ trustedPublicKey = trustedCert.getPublicKey();
+ } else {
+ trustedPrincipal = anchor.getCA();
+ trustedPublicKey = anchor.getCAPublicKey();
+ }
+
+ if (principal.equals(trustedPrincipal) &&
+ publicKey.equals(trustedPublicKey)) {
+ duplicated = true;
+ }
+ }
+
+ if (!duplicated) {
+ TrustAnchor temporary =
+ new TrustAnchor(principal, publicKey, null);
+ trustAnchors.add(temporary);
+ }
+ }
+
PKIXBuilderParameters params = null;
try {
- params = new PKIXBuilderParameters
- (Collections.singleton(anchor), certSel);
+ params = new PKIXBuilderParameters(trustAnchors, certSel);
} catch (InvalidAlgorithmParameterException iape) {
throw new CRLException(iape);
}
--- a/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
+import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertPathValidatorException;
import java.security.cert.PKIXReason;
@@ -43,12 +44,22 @@
import javax.security.auth.x500.X500Principal;
import sun.security.util.Debug;
+import sun.security.util.DerOutputStream;
import sun.security.x509.AccessDescription;
import sun.security.x509.AuthorityInfoAccessExtension;
import sun.security.x509.PKIXExtensions;
import sun.security.x509.PolicyMappingsExtension;
import sun.security.x509.X500Name;
import sun.security.x509.X509CertImpl;
+import sun.security.x509.X509CRLImpl;
+import sun.security.x509.AuthorityKeyIdentifierExtension;
+import sun.security.x509.KeyIdentifier;
+import sun.security.x509.SubjectKeyIdentifierExtension;
+import sun.security.x509.SerialNumber;
+import sun.security.x509.GeneralNames;
+import sun.security.x509.GeneralName;
+import sun.security.x509.GeneralNameInterface;
+import java.math.BigInteger;
/**
* This class represents a forward builder, which is able to retrieve
@@ -237,7 +248,7 @@
} else {
if (caSelector == null) {
- caSelector = new X509CertSelector();
+ caSelector = new AdaptableX509CertSelector();
/*
* Match on certificate validity date.
@@ -269,6 +280,29 @@
* at least as many CA certs that have already been traversed
*/
caSelector.setBasicConstraints(currentState.traversedCACerts);
+
+ /*
+ * Facilitate certification path construction with authority
+ * key identifier and subject key identifier.
+ */
+ AuthorityKeyIdentifierExtension akidext =
+ currentState.cert.getAuthorityKeyIdentifierExtension();
+ if (akidext != null) {
+ KeyIdentifier akid = (KeyIdentifier)akidext.get(akidext.KEY_ID);
+ if (akid != null) {
+ DerOutputStream derout = new DerOutputStream();
+ derout.putOctetString(akid.getIdentifier());
+ caSelector.setSubjectKeyIdentifier(derout.toByteArray());
+ }
+
+ SerialNumber asn =
+ (SerialNumber)akidext.get(akidext.SERIAL_NUMBER);
+ if (asn != null) {
+ caSelector.setSerialNumber(asn.getNumber());
+ }
+ // the subject criterion was set previously.
+ }
+
sel = caSelector;
}
@@ -817,13 +851,25 @@
} else {
continue;
}
- }
-
- X500Principal trustedCAName = anchor.getCA();
+ } else {
+ X500Principal principal = anchor.getCA();
+ java.security.PublicKey publicKey = anchor.getCAPublicKey();
- /* Check subject/issuer name chaining */
- if (!trustedCAName.equals(cert.getIssuerX500Principal())) {
- continue;
+ if (principal != null && publicKey != null &&
+ principal.equals(cert.getSubjectX500Principal())) {
+ if (publicKey.equals(cert.getPublicKey())) {
+ // the cert itself is a trust anchor
+ this.trustAnchor = anchor;
+ return true;
+ }
+ // else, it is a self-issued certificate of the anchor
+ }
+
+ // Check subject/issuer name chaining
+ if (principal == null ||
+ !principal.equals(cert.getIssuerX500Principal())) {
+ continue;
+ }
}
/* Check revocation if it is enabled */
@@ -890,4 +936,120 @@
void removeFinalCertFromPath(LinkedList<X509Certificate> certPathList) {
certPathList.removeFirst();
}
+
+ /** Verifies whether a CRL is issued by a certain certificate
+ *
+ * @param cert the certificate
+ * @param crl the CRL to be verified
+ * @param provider the name of the signature provider
+ */
+ static boolean issues(X509CertImpl cert, X509CRLImpl crl, String provider)
+ throws IOException {
+
+ boolean kidmatched = false;
+
+ // check certificate's key usage
+ boolean[] usages = cert.getKeyUsage();
+ if (usages != null && !usages[6]) {
+ return false;
+ }
+
+ // check certificate's SKID and CRL's AKID
+ AuthorityKeyIdentifierExtension akidext = crl.getAuthKeyIdExtension();
+ if (akidext != null) {
+ // the highest priority, matching KID
+ KeyIdentifier akid = (KeyIdentifier)akidext.get(akidext.KEY_ID);
+ if (akid != null) {
+ SubjectKeyIdentifierExtension skidext =
+ cert.getSubjectKeyIdentifierExtension();
+ if (skidext != null) {
+ KeyIdentifier skid =
+ (KeyIdentifier)skidext.get(skidext.KEY_ID);
+ if (!akid.equals(skid)) {
+ return false;
+ }
+
+ kidmatched = true;
+ }
+ // conservatively, in case of X509 V1 certificate,
+ // does return false here if no SKID extension.
+ }
+
+ // the medium priority, matching issuer name/serial number
+ SerialNumber asn = (SerialNumber)akidext.get(akidext.SERIAL_NUMBER);
+ GeneralNames anames = (GeneralNames)akidext.get(akidext.AUTH_NAME);
+ if (asn != null && anames != null) {
+ X500Name subject = (X500Name)cert.getSubjectDN();
+ BigInteger serial = cert.getSerialNumber();
+
+ if (serial != null && subject != null) {
+ if (serial.equals(asn.getNumber())) {
+ return false;
+ }
+
+ for (GeneralName name : anames.names()) {
+ GeneralNameInterface gni = name.getName();
+ if (subject.equals(gni)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ if (kidmatched) {
+ return true;
+ }
+ }
+
+ // the last priority, verify the CRL signature with the cert.
+ X500Principal crlIssuer = crl.getIssuerX500Principal();
+ X500Principal certSubject = cert.getSubjectX500Principal();
+ if (certSubject != null && certSubject.equals(crlIssuer)) {
+ try {
+ crl.verify(cert.getPublicKey(), provider);
+ return true;
+ } catch (Exception e) {
+ // ignore all exceptions.
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * An adaptable X509 certificate selector for forward certification path
+ * building.
+ */
+ private static class AdaptableX509CertSelector extends X509CertSelector {
+ public AdaptableX509CertSelector() {
+ super();
+ }
+
+ /**
+ * Decides whether a <code>Certificate</code> should be selected.
+ *
+ * For the purpose of compatibility, when a certificate is of
+ * version 1 and version 2, or the certificate does not include
+ * a subject key identifier extension, the selection criterion
+ * of subjectKeyIdentifier will be disabled.
+ *
+ * @Override
+ */
+ public boolean match(Certificate cert) {
+ if (!(cert instanceof X509Certificate)) {
+ return false;
+ }
+ X509Certificate xcert = (X509Certificate)cert;
+
+ if (xcert.getVersion() < 3 ||
+ xcert.getExtensionValue("2.5.29.14") == null) {
+ // disable the subjectKeyIdentifier criterion
+ setSubjectKeyIdentifier(null);
+ }
+
+ return super.match(cert);
+ }
+ }
}
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSPChecker.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -351,18 +351,27 @@
}
in = con.getInputStream();
+ byte[] response = null;
+ int total = 0;
int contentLength = con.getContentLength();
- if (contentLength == -1) {
+ if (contentLength != -1) {
+ response = new byte[contentLength];
+ } else {
+ response = new byte[2048];
contentLength = Integer.MAX_VALUE;
}
- byte[] response = new byte[contentLength];
- int total = 0;
- int count = 0;
- while (count != -1 && total < contentLength) {
- count = in.read(response, total, response.length - total);
+ while (total < contentLength) {
+ int count = in.read(response, total, response.length - total);
+ if (count < 0)
+ break;
+
total += count;
+ if (total >= response.length && total < contentLength) {
+ response = Arrays.copyOf(response, total * 2);
+ }
}
+ response = Arrays.copyOf(response, total);
OCSPResponse ocspResponse = new OCSPResponse(response, pkixParams,
responderCert);
--- a/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
import java.net.HttpURLConnection;
import java.util.Iterator;
import java.util.Set;
+import java.util.Arrays;
import sun.security.pkcs.*;
@@ -137,23 +138,33 @@
}
System.out.println();
}
- int contentLength = connection.getContentLength();
- if (contentLength == -1) {
- contentLength = Integer.MAX_VALUE;
- }
verifyMimeType(connection.getContentType());
- replyBuffer = new byte[contentLength];
int total = 0;
- int count = 0;
- while (count != -1 && total < contentLength) {
- count = input.read(replyBuffer, total,
+ int contentLength = connection.getContentLength();
+ if (contentLength != -1) {
+ replyBuffer = new byte[contentLength];
+ } else {
+ replyBuffer = new byte[2048];
+ contentLength = Integer.MAX_VALUE;
+ }
+
+ while (total < contentLength) {
+ int count = input.read(replyBuffer, total,
replyBuffer.length - total);
+ if (count < 0)
+ break;
+
total += count;
+ if (total >= replyBuffer.length && total < contentLength) {
+ replyBuffer = Arrays.copyOf(replyBuffer, total * 2);
+ }
}
+ replyBuffer = Arrays.copyOf(replyBuffer, total);
+
if (DEBUG) {
System.out.println("received timestamp response (length=" +
- replyBuffer.length + ")");
+ total + ")");
}
} finally {
if (input != null) {
--- a/jdk/src/share/classes/sun/tools/jar/Main.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/classes/sun/tools/jar/Main.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,16 @@
package sun.tools.jar;
import java.io.*;
+import java.nio.file.Path;
import java.util.*;
import java.util.zip.*;
import java.util.jar.*;
import java.util.jar.Manifest;
import java.text.MessageFormat;
import sun.misc.JarIndex;
+import static sun.misc.JarIndex.INDEX_NAME;
+import static java.util.jar.JarFile.MANIFEST_NAME;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
/**
* This class implements a simple utility for creating files in the JAR
@@ -58,7 +62,6 @@
// Directories specified by "-C" operation.
Set<String> paths = new HashSet<String>();
- CRC32 crc32 = new CRC32();
/*
* cflag: create
* uflag: update
@@ -71,10 +74,8 @@
*/
boolean cflag, uflag, xflag, tflag, vflag, flag0, Mflag, iflag;
- static final String MANIFEST = JarFile.MANIFEST_NAME;
static final String MANIFEST_DIR = "META-INF/";
static final String VERSION = "1.0";
- static final String INDEX = JarIndex.INDEX_NAME;
private static ResourceBundle rsrc;
@@ -126,9 +127,21 @@
this.program = program;
}
+ /**
+ * Creates a new empty temporary file in the same directory as the
+ * specified file. A variant of File.createTempFile.
+ */
+ private static File createTempFileInSameDirectoryAs(File file)
+ throws IOException {
+ File dir = file.getParentFile();
+ if (dir == null)
+ dir = new File(".");
+ return File.createTempFile("jartmp", null, dir);
+ }
+
private boolean ok;
- /*
+ /**
* Starts main program with the specified arguments.
*/
public synchronized boolean run(String args[]) {
@@ -161,7 +174,7 @@
}
addVersion(manifest);
addCreatedBy(manifest);
- if (isAmbigousMainClass(manifest)) {
+ if (isAmbiguousMainClass(manifest)) {
if (in != null) {
in.close();
}
@@ -195,9 +208,7 @@
FileOutputStream out;
if (fname != null) {
inputFile = new File(fname);
- String path = inputFile.getParent();
- tmpFile = File.createTempFile("tmp", null,
- new File((path == null) ? "." : path));
+ tmpFile = createTempFileInSameDirectoryAs(inputFile);
in = new FileInputStream(inputFile);
out = new FileOutputStream(tmpFile);
} else {
@@ -208,7 +219,8 @@
InputStream manifest = (!Mflag && (mname != null)) ?
(new FileInputStream(mname)) : null;
expand(null, files, true);
- boolean updateOk = update(in, new BufferedOutputStream(out), manifest, null);
+ boolean updateOk = update(in, new BufferedOutputStream(out),
+ manifest, null);
if (ok) {
ok = updateOk;
}
@@ -270,8 +282,8 @@
return ok;
}
- /*
- * Parse command line arguments.
+ /**
+ * Parses command line arguments.
*/
boolean parseArgs(String args[]) {
/* Preprocess and expand @file arguments */
@@ -405,7 +417,7 @@
return true;
}
- /*
+ /**
* Expands list of files to process into full list of all files that
* can be found by recursively descending directories.
*/
@@ -442,7 +454,7 @@
}
}
- /*
+ /**
* Creates a new JAR file.
*/
void create(OutputStream out, Manifest manifest)
@@ -461,7 +473,7 @@
e.setSize(0);
e.setCrc(0);
zos.putNextEntry(e);
- e = new ZipEntry(MANIFEST);
+ e = new ZipEntry(MANIFEST_NAME);
e.setTime(System.currentTimeMillis());
if (flag0) {
crc32Manifest(e, manifest);
@@ -476,8 +488,32 @@
zos.close();
}
- /*
- * update an existing jar file.
+ private char toUpperCaseASCII(char c) {
+ return (c < 'a' || c > 'z') ? c : (char) (c + 'A' - 'a');
+ }
+
+ /**
+ * Compares two strings for equality, ignoring case. The second
+ * argument must contain only upper-case ASCII characters.
+ * We don't want case comparison to be locale-dependent (else we
+ * have the notorious "turkish i bug").
+ */
+ private boolean equalsIgnoreCase(String s, String upper) {
+ assert upper.toUpperCase(java.util.Locale.ENGLISH).equals(upper);
+ int len;
+ if ((len = s.length()) != upper.length())
+ return false;
+ for (int i = 0; i < len; i++) {
+ char c1 = s.charAt(i);
+ char c2 = upper.charAt(i);
+ if (c1 != c2 && toUpperCaseASCII(c1) != c2)
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Updates an existing jar file.
*/
boolean update(InputStream in, OutputStream out,
InputStream newManifest,
@@ -487,8 +523,6 @@
ZipOutputStream zos = new JarOutputStream(out);
ZipEntry e = null;
boolean foundManifest = false;
- byte[] buf = new byte[1024];
- int n = 0;
boolean updateOk = true;
if (jarIndex != null) {
@@ -499,10 +533,9 @@
while ((e = zis.getNextEntry()) != null) {
String name = e.getName();
- boolean isManifestEntry = name.toUpperCase(
- java.util.Locale.ENGLISH).
- equals(MANIFEST);
- if ((name.toUpperCase().equals(INDEX) && jarIndex != null)
+ boolean isManifestEntry = equalsIgnoreCase(name, MANIFEST_NAME);
+
+ if ((jarIndex != null && equalsIgnoreCase(name, INDEX_NAME))
|| (Mflag && isManifestEntry)) {
continue;
} else if (isManifestEntry && ((newManifest != null) ||
@@ -513,9 +546,9 @@
// might need it below, and we can't re-read the same data
// twice.
FileInputStream fis = new FileInputStream(mname);
- boolean ambigous = isAmbigousMainClass(new Manifest(fis));
+ boolean ambiguous = isAmbiguousMainClass(new Manifest(fis));
fis.close();
- if (ambigous) {
+ if (ambiguous) {
return false;
}
}
@@ -539,9 +572,7 @@
e2.setCrc(e.getCrc());
}
zos.putNextEntry(e2);
- while ((n = zis.read(buf, 0, buf.length)) != -1) {
- zos.write(buf, 0, n);
- }
+ copy(zis, zos);
} else { // replace with the new files
File f = entryMap.get(name);
addFile(zos, f);
@@ -558,7 +589,7 @@
if (!foundManifest) {
if (newManifest != null) {
Manifest m = new Manifest(newManifest);
- updateOk = !isAmbigousMainClass(m);
+ updateOk = !isAmbiguousMainClass(m);
if (updateOk) {
updateManifest(m, zos);
}
@@ -575,23 +606,16 @@
private void addIndex(JarIndex index, ZipOutputStream zos)
throws IOException
{
- ZipEntry e = new ZipEntry(INDEX);
+ ZipEntry e = new ZipEntry(INDEX_NAME);
e.setTime(System.currentTimeMillis());
if (flag0) {
- e.setMethod(ZipEntry.STORED);
- File ifile = File.createTempFile("index", null, new File("."));
- BufferedOutputStream bos = new BufferedOutputStream
- (new FileOutputStream(ifile));
- index.write(bos);
- crc32File(e, ifile);
- bos.close();
- ifile.delete();
+ CRC32OutputStream os = new CRC32OutputStream();
+ index.write(os);
+ os.updateEntry(e);
}
zos.putNextEntry(e);
index.write(zos);
- if (vflag) {
- // output(getMsg("out.update.manifest"));
- }
+ zos.closeEntry();
}
private void updateManifest(Manifest m, ZipOutputStream zos)
@@ -602,10 +626,9 @@
if (ename != null) {
addMainClass(m, ename);
}
- ZipEntry e = new ZipEntry(MANIFEST);
+ ZipEntry e = new ZipEntry(MANIFEST_NAME);
e.setTime(System.currentTimeMillis());
if (flag0) {
- e.setMethod(ZipEntry.STORED);
crc32Manifest(e, m);
}
zos.putNextEntry(e);
@@ -620,7 +643,8 @@
name = name.replace(File.separatorChar, '/');
String matchPath = "";
for (String path : paths) {
- if (name.startsWith(path) && (path.length() > matchPath.length())) {
+ if (name.startsWith(path)
+ && (path.length() > matchPath.length())) {
matchPath = path;
}
}
@@ -658,7 +682,7 @@
global.put(Attributes.Name.MAIN_CLASS, mainApp);
}
- private boolean isAmbigousMainClass(Manifest m) {
+ private boolean isAmbiguousMainClass(Manifest m) {
if (ename != null) {
Attributes global = m.getMainAttributes();
if ((global.get(Attributes.Name.MAIN_CLASS) != null)) {
@@ -670,7 +694,7 @@
return false;
}
- /*
+ /**
* Adds a new file entry to the ZIP output stream.
*/
void addFile(ZipOutputStream zos, File file) throws IOException {
@@ -684,7 +708,7 @@
if (name.equals("") || name.equals(".") || name.equals(zname)) {
return;
- } else if ((name.equals(MANIFEST_DIR) || name.equals(MANIFEST))
+ } else if ((name.equals(MANIFEST_DIR) || name.equals(MANIFEST_NAME))
&& !Mflag) {
if (vflag) {
output(formatMsg("out.ignore.entry", name));
@@ -704,19 +728,11 @@
e.setSize(0);
e.setCrc(0);
} else if (flag0) {
- e.setSize(size);
- e.setMethod(ZipEntry.STORED);
crc32File(e, file);
}
zos.putNextEntry(e);
if (!isDir) {
- byte[] buf = new byte[8192];
- int len;
- InputStream is = new BufferedInputStream(new FileInputStream(file));
- while ((len = is.read(buf, 0, buf.length)) != -1) {
- zos.write(buf, 0, len);
- }
- is.close();
+ copy(file, zos);
}
zos.closeEntry();
/* report how much compression occurred. */
@@ -737,39 +753,83 @@
}
}
- /*
- * compute the crc32 of a file. This is necessary when the ZipOutputStream
- * is in STORED mode.
+ /**
+ * A buffer for use only by copy(InputStream, OutputStream).
+ * Not as clean as allocating a new buffer as needed by copy,
+ * but significantly more efficient.
*/
- private void crc32Manifest(ZipEntry e, Manifest m) throws IOException {
- crc32.reset();
- CRC32OutputStream os = new CRC32OutputStream(crc32);
- m.write(os);
- e.setSize((long) os.n);
- e.setCrc(crc32.getValue());
+ private byte[] copyBuf = new byte[8192];
+
+ /**
+ * Copies all bytes from the input stream to the output stream.
+ * Does not close or flush either stream.
+ *
+ * @param from the input stream to read from
+ * @param to the output stream to write to
+ * @throws IOException if an I/O error occurs
+ */
+ private void copy(InputStream from, OutputStream to) throws IOException {
+ int n;
+ while ((n = from.read(copyBuf)) != -1)
+ to.write(copyBuf, 0, n);
}
- /*
- * compute the crc32 of a file. This is necessary when the ZipOutputStream
- * is in STORED mode.
+ /**
+ * Copies all bytes from the input file to the output stream.
+ * Does not close or flush the output stream.
+ *
+ * @param from the input file to read from
+ * @param to the output stream to write to
+ * @throws IOException if an I/O error occurs
+ */
+ private void copy(File from, OutputStream to) throws IOException {
+ InputStream in = new FileInputStream(from);
+ try {
+ copy(in, to);
+ } finally {
+ in.close();
+ }
+ }
+
+ /**
+ * Copies all bytes from the input stream to the output file.
+ * Does not close the input stream.
+ *
+ * @param from the input stream to read from
+ * @param to the output file to write to
+ * @throws IOException if an I/O error occurs
+ */
+ private void copy(InputStream from, File to) throws IOException {
+ OutputStream out = new FileOutputStream(to);
+ try {
+ copy(from, out);
+ } finally {
+ out.close();
+ }
+ }
+
+ /**
+ * Computes the crc32 of a Manifest. This is necessary when the
+ * ZipOutputStream is in STORED mode.
+ */
+ private void crc32Manifest(ZipEntry e, Manifest m) throws IOException {
+ CRC32OutputStream os = new CRC32OutputStream();
+ m.write(os);
+ os.updateEntry(e);
+ }
+
+ /**
+ * Computes the crc32 of a File. This is necessary when the
+ * ZipOutputStream is in STORED mode.
*/
private void crc32File(ZipEntry e, File f) throws IOException {
- InputStream is = new BufferedInputStream(new FileInputStream(f));
- byte[] buf = new byte[8192];
- crc32.reset();
- int r = 0;
- int nread = 0;
- long len = f.length();
- while ((r = is.read(buf)) != -1) {
- nread += r;
- crc32.update(buf, 0, r);
- }
- is.close();
- if (nread != (int) len) {
+ CRC32OutputStream os = new CRC32OutputStream();
+ copy(f, os);
+ if (os.n != f.length()) {
throw new JarException(formatMsg(
"error.incorrect.length", f.getPath()));
}
- e.setCrc(crc32.getValue());
+ os.updateEntry(e);
}
void replaceFSC(String files[]) {
@@ -780,6 +840,7 @@
}
}
+ @SuppressWarnings("serial")
Set<ZipEntry> newDirSet() {
return new HashSet<ZipEntry>() {
public boolean add(ZipEntry e) {
@@ -797,7 +858,7 @@
}
}
- /*
+ /**
* Extracts specified entries from JAR file.
*/
void extract(InputStream in, String files[]) throws IOException {
@@ -827,7 +888,7 @@
updateLastModifiedTime(dirs);
}
- /*
+ /**
* Extracts specified entries from JAR file, via ZipFile.
*/
void extract(String fname, String files[]) throws IOException {
@@ -853,7 +914,7 @@
updateLastModifiedTime(dirs);
}
- /*
+ /**
* Extracts next entry from JAR file, creating directories as needed. If
* the entry is for a directory which doesn't exist prior to this
* invocation, returns that entry, otherwise returns null.
@@ -888,19 +949,13 @@
"error.create.dir", d.getPath()));
}
}
- OutputStream os = new FileOutputStream(f);
- byte[] b = new byte[8192];
- int len;
try {
- while ((len = is.read(b, 0, b.length)) != -1) {
- os.write(b, 0, len);
- }
+ copy(is, f);
} finally {
if (is instanceof ZipInputStream)
((ZipInputStream)is).closeEntry();
else
is.close();
- os.close();
}
if (vflag) {
if (e.getMethod() == ZipEntry.DEFLATED) {
@@ -919,7 +974,7 @@
return rc;
}
- /*
+ /**
* Lists contents of JAR file.
*/
void list(InputStream in, String files[]) throws IOException {
@@ -937,7 +992,7 @@
}
}
- /*
+ /**
* Lists contents of JAR file, via ZipFile.
*/
void list(String fname, String files[]) throws IOException {
@@ -950,32 +1005,38 @@
}
/**
- * Output the class index table to the INDEX.LIST file of the
+ * Outputs the class index table to the INDEX.LIST file of the
* root jar file.
*/
void dumpIndex(String rootjar, JarIndex index) throws IOException {
- File scratchFile = File.createTempFile("scratch", null, new File("."));
File jarFile = new File(rootjar);
- boolean updateOk = update(new FileInputStream(jarFile),
- new FileOutputStream(scratchFile),
- null, index);
- jarFile.delete();
- if (!scratchFile.renameTo(jarFile)) {
- scratchFile.delete();
- throw new IOException(getMsg("error.write.file"));
+ Path jarPath = jarFile.toPath();
+ Path tmpPath = createTempFileInSameDirectoryAs(jarFile).toPath();
+ try {
+ if (update(jarPath.newInputStream(),
+ tmpPath.newOutputStream(),
+ null, index)) {
+ try {
+ tmpPath.moveTo(jarPath, REPLACE_EXISTING);
+ } catch (IOException e) {
+ throw new IOException(getMsg("error.write.file"), e);
+ }
+ }
+ } finally {
+ tmpPath.deleteIfExists();
}
- scratchFile.delete();
}
- private Hashtable jarTable = new Hashtable();
- /*
- * Generate the transitive closure of the Class-Path attribute for
+ private HashSet<String> jarPaths = new HashSet<String>();
+
+ /**
+ * Generates the transitive closure of the Class-Path attribute for
* the specified jar file.
*/
- Vector getJarPath(String jar) throws IOException {
- Vector files = new Vector();
+ List<String> getJarPath(String jar) throws IOException {
+ List<String> files = new ArrayList<String>();
files.add(jar);
- jarTable.put(jar, jar);
+ jarPaths.add(jar);
// take out the current path
String path = jar.substring(0, Math.max(0, jar.lastIndexOf('/') + 1));
@@ -998,7 +1059,7 @@
if (!ajar.endsWith("/")) { // it is a jar file
ajar = path.concat(ajar);
/* check on cyclic dependency */
- if (jarTable.get(ajar) == null) {
+ if (! jarPaths.contains(ajar)) {
files.addAll(getJarPath(ajar));
}
}
@@ -1012,10 +1073,10 @@
}
/**
- * Generate class index file for the specified root jar file.
+ * Generates class index file for the specified root jar file.
*/
void genIndex(String rootjar, String[] files) throws IOException {
- Vector jars = getJarPath(rootjar);
+ List<String> jars = getJarPath(rootjar);
int njars = jars.size();
String[] jarfiles;
@@ -1027,12 +1088,12 @@
}
njars = jars.size();
}
- jarfiles = (String[])jars.toArray(new String[njars]);
+ jarfiles = jars.toArray(new String[njars]);
JarIndex index = new JarIndex(jarfiles);
dumpIndex(rootjar, index);
}
- /*
+ /**
* Prints entry information, if requested.
*/
void printEntry(ZipEntry e, String[] files) throws IOException {
@@ -1049,7 +1110,7 @@
}
}
- /*
+ /**
* Prints entry information.
*/
void printEntry(ZipEntry e) throws IOException {
@@ -1067,21 +1128,21 @@
}
}
- /*
- * Print usage message and die.
+ /**
+ * Prints usage message.
*/
void usageError() {
error(getMsg("usage"));
}
- /*
+ /**
* A fatal exception has been caught. No recovery possible
*/
void fatalError(Exception e) {
e.printStackTrace();
}
- /*
+ /**
* A fatal condition has been detected; message is "s".
* No recovery possible
*/
@@ -1103,39 +1164,43 @@
err.println(s);
}
- /*
+ /**
* Main routine to start program.
*/
public static void main(String args[]) {
Main jartool = new Main(System.out, System.err, "jar");
System.exit(jartool.run(args) ? 0 : 1);
}
-}
-/*
- * an OutputStream that doesn't send its output anywhere, (but could).
- * It's here to find the CRC32 of a manifest, necessary for STORED only
- * mode in ZIP.
- */
-final class CRC32OutputStream extends java.io.OutputStream {
- CRC32 crc;
- int n = 0;
- CRC32OutputStream(CRC32 crc) {
- this.crc = crc;
- }
+ /**
+ * An OutputStream that doesn't send its output anywhere, (but could).
+ * It's here to find the CRC32 of an input file, necessary for STORED
+ * mode in ZIP.
+ */
+ private static class CRC32OutputStream extends java.io.OutputStream {
+ final CRC32 crc = new CRC32();
+ long n = 0;
+
+ CRC32OutputStream() {}
- public void write(int r) throws IOException {
- crc.update(r);
- n++;
- }
+ public void write(int r) throws IOException {
+ crc.update(r);
+ n++;
+ }
+
+ public void write(byte[] b, int off, int len) throws IOException {
+ crc.update(b, off, len);
+ n += len;
+ }
- public void write(byte[] b) throws IOException {
- crc.update(b, 0, b.length);
- n += b.length;
- }
-
- public void write(byte[] b, int off, int len) throws IOException {
- crc.update(b, off, len);
- n += len - off;
+ /**
+ * Updates a ZipEntry which describes the data read by this
+ * output stream, in STORED mode.
+ */
+ public void updateEntry(ZipEntry e) {
+ e.setMethod(ZipEntry.STORED);
+ e.setSize(n);
+ e.setCrc(crc.getValue());
+ }
}
}
--- a/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties Thu Jul 30 12:25:39 2009 -0700
@@ -9,7 +9,7 @@
#
# Each of the strings that follow form a key to be
# used to the actual menu definition.
-menubar=\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6\u30c7\u30d0\u30c3\u30b0
+menubar=file edit debug
# file Menu definition
#
@@ -20,15 +20,15 @@
# new -> Notepad.newAction
# save -> Notepad.saveAction
# exit -> Notepad.exitAction
-file=\u65b0\u898f \u958b\u304f \u4fdd\u5b58 - \u7d42\u4e86
-fileLabel=\u30d5\u30a1\u30a4\u30eb (F)
+file=new open save - exit
+fileLabel=\u30d5\u30a1\u30a4\u30eb
openLabel=\u958b\u304f
openImage=resources/open.gif
newLabel=\u65b0\u898f
newImage=resources/new.gif
saveLabel=\u4fdd\u5b58
saveImage=resources/save.gif
-exitLabel=\u7d42\u4e86 (X)
+exitLabel=\u7d42\u4e86
#
# edit Menu definition
@@ -36,26 +36,26 @@
# cut -> JTextComponent.cutAction
# copy -> JTextComponent.copyAction
# paste -> JTextComponent.pasteAction
-edit=\u30ab\u30c3\u30c8 \u30b3\u30d4\u30fc \u30da\u30fc\u30b9\u30c8 - \u5143\u306b\u623b\u3059 \u518d\u5b9f\u884c
+edit=cut copy paste - undo redo
editLabel=\u7de8\u96c6
-cutLabel=Cut
+cutLabel=\u30ab\u30c3\u30c8
cutAction=cut-to-clipboard
cutImage=resources/cut.gif
-copyLabel=Copy
-copyAction=cut-to-clipboard
+copyLabel=\u30b3\u30d4\u30fc
+copyAction=copy-to-clipboard
copyImage=resources/copy.gif
-pasteLabel=Paste
+pasteLabel=\u30da\u30fc\u30b9\u30c8
pasteAction=paste-from-clipboard
pasteImage=resources/paste.gif
undoLabel=\u5143\u306b\u623b\u3059
-undoAction=\u5143\u306b\u623b\u3059
+undoAction=Undo
redoLabel=\u518d\u5b9f\u884c
-redoAction=\u518d\u5b9f\u884c
+redoAction=Redo
#
# debug Menu definition
#
-debug=showElementTree \u306e\u30c0\u30f3\u30d7
+debug=dump showElementTree
debugLabel=\u30c7\u30d0\u30c3\u30b0
dumpLabel=\u30e2\u30c7\u30eb\u3092 System.err \u306b\u30c0\u30f3\u30d7
dumpAction=dump-model
@@ -67,7 +67,7 @@
# used as the basis of the tool definition. Actions
# are of course sharable, and in this case are shared
# with the menu items.
-toolbar=\u65b0\u898f \u958b\u304f \u4fdd\u5b58 - \u30ab\u30c3\u30c8 \u30b3\u30d4\u30fc \u30da\u30fc\u30b9\u30c8
+toolbar=new open save - cut copy paste
newTooltip=\u30d5\u30a1\u30a4\u30eb\u3092\u65b0\u898f\u4f5c\u6210\u3059\u308b
openTooltip=\u30d5\u30a1\u30a4\u30eb\u3092\u958b\u304f
saveTooltip=\u30d5\u30a1\u30a4\u30eb\u306b\u4fdd\u5b58
--- a/jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -263,8 +263,8 @@
(void)sprintf(buf,
"CRW ASSERTION FAILURE: %s (%s:%s:%d)",
condition,
- ci->name==0?"?":ci->name,
- mi->name==0?"?":mi->name,
+ ci->name==NULL?"?":ci->name,
+ (mi==NULL||mi->name==NULL)?"?":mi->name,
byte_code_offset);
fatal_error(ci, buf, file, line);
}
--- a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1000,10 +1000,7 @@
int buttonState = 0;
final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
for (int i = 0; i<buttonsNumber; i++){
- // A bug in WM implementation: extra buttons doesn't have state!=0 as they should on Release message.
- if ((i != 4) && (i != 5)){
- buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
- }
+ buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
}
switch (xev.get_type()) {
case XConstants.ButtonPress:
--- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
*/
#include <errno.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in_systm.h>
--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
*/
#include <errno.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Thu Jul 30 12:25:39 2009 -0700
@@ -886,14 +886,12 @@
* this should be done in lazilyLoadDesktopProperty() only.
*/
protected synchronized void initializeDesktopProperties() {
- desktopProperties.put("DnD.Autoscroll.initialDelay", Integer.valueOf(50));
- desktopProperties.put("DnD.Autoscroll.interval", Integer.valueOf(50));
-
- try {
- desktopProperties.put("Shell.shellFolderManager",
- Class.forName("sun.awt.shell.Win32ShellFolderManager2"));
- } catch (ClassNotFoundException ex) {
- }
+ desktopProperties.put("DnD.Autoscroll.initialDelay",
+ Integer.valueOf(50));
+ desktopProperties.put("DnD.Autoscroll.interval",
+ Integer.valueOf(50));
+ desktopProperties.put("Shell.shellFolderManager",
+ "sun.awt.shell.Win32ShellFolderManager2");
}
/*
--- a/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java Thu Jul 30 12:25:39 2009 -0700
@@ -194,8 +194,7 @@
// default value of a boolean field is 'false', so set isOpaque to
// true here explicitly
this.isOpaque = true;
- Color bgColor = ((Window)target).getBackground();
- setOpaque((bgColor == null) || (bgColor.getAlpha() == 255));
+ setOpaque(((Window)target).isOpaque());
}
}
--- a/jdk/src/windows/native/java/lang/java_props_md.c Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/windows/native/java/lang/java_props_md.c Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -714,10 +714,10 @@
* Windows XP 64 bit 5 2
* where ((&ver.wServicePackMinor) + 2) = 1
* and si.wProcessorArchitecture = 9
- * Windows Vista family 6 0
- * Windows 2008 6 0
- * where ((&ver.wServicePackMinor) + 2) = 1
- * Windows 7 6 1
+ * Windows Vista family 6 0 (VER_NT_WORKSTATION)
+ * Windows Server 2008 6 0 (!VER_NT_WORKSTATION)
+ * Windows 7 6 1 (VER_NT_WORKSTATION)
+ * Windows Server 2008 R2 6 1 (!VER_NT_WORKSTATION)
*
* This mapping will presumably be augmented as new Windows
* versions are released.
@@ -768,14 +768,7 @@
}
} else if (ver.dwMajorVersion == 6) {
/*
- * From MSDN OSVERSIONINFOEX documentation:
- *
- * "Because the version numbers for Windows Server 2008
- * and Windows Vista are identical, you must also test
- * whether the wProductType member is VER_NT_WORKSTATION.
- * If wProductType is VER_NT_WORKSTATION, the operating
- * system is Windows Vista or 7; otherwise, it is Windows
- * Server 2008."
+ * See table in MSDN OSVERSIONINFOEX documentation.
*/
if (ver.wProductType == VER_NT_WORKSTATION) {
switch (ver.dwMinorVersion) {
@@ -784,7 +777,11 @@
default: sprops.os_name = "Windows NT (unknown)";
}
} else {
- sprops.os_name = "Windows Server 2008";
+ switch (ver.dwMinorVersion) {
+ case 0: sprops.os_name = "Windows Server 2008"; break;
+ case 1: sprops.os_name = "Windows Server 2008 R2"; break;
+ default: sprops.os_name = "Windows NT (unknown)";
+ }
}
} else {
sprops.os_name = "Windows NT (unknown)";
--- a/jdk/src/windows/native/sun/windows/ShellFolder2.cpp Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/src/windows/native/sun/windows/ShellFolder2.cpp Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -981,6 +981,15 @@
hBitmap = (HBITMAP)LoadImage(libShell32,
IS_WINVISTA ? TEXT("IDB_TB_SH_DEF_16") : MAKEINTRESOURCE(216),
IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
+
+ if (hBitmap == NULL) {
+ // version of shell32.dll doesn't match OS version.
+ // So we either are in a Vista Compatibility Mode
+ // or shell32.dll was copied from OS of another version
+ hBitmap = (HBITMAP)LoadImage(libShell32,
+ IS_WINVISTA ? MAKEINTRESOURCE(216) : TEXT("IDB_TB_SH_DEF_16"),
+ IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
+ }
}
if (hBitmap == NULL) {
libComCtl32 = LoadLibrary(TEXT("comctl32.dll"));
--- a/jdk/test/demo/jvmti/hprof/HelloWorld.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/test/demo/jvmti/hprof/HelloWorld.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/* HelloWorld:
*
- * Sample target appluication for HPROF tests
+ * Sample target application for HPROF tests
*
*/
--- a/jdk/test/demo/jvmti/hprof/StackMapTableTest.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/test/demo/jvmti/hprof/StackMapTableTest.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,11 @@
/* @test
- * @bug 6266289 6299047
+ * @bug 6266289 6299047 6855180 6855551
* @summary Test jvmti hprof and java_crw_demo with StackMapTable attributes
*
* @compile ../DemoRun.java
- * @compile -source 1.6 -g:lines HelloWorld.java
+ * @compile -source 7 -g:lines HelloWorld.java
* @build StackMapTableTest
* @run main StackMapTableTest HelloWorld
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Robot/CtorTest/CtorTest.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ @test
+ @bug 6855323
+ @summary Robot(GraphicsDevice) constructor initializes LEGAL_BUTTON_MASK variable improperly
+ @author Dmitry Cherepanov area=awt.robot
+ @run main CtorTest
+*/
+
+/**
+ * CtorRobot.java
+ *
+ * summary: creates Robot using one parameter constructor
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+
+import sun.awt.SunToolkit;
+
+public class CtorTest
+{
+ public static void main(String []s) throws Exception
+ {
+ // one parameter constructor
+ GraphicsDevice graphicsDevice = GraphicsEnvironment.
+ getLocalGraphicsEnvironment().getDefaultScreenDevice();
+ Robot robot = new Robot(graphicsDevice);
+ clickOnFrame(robot);
+ }
+
+ // generate mouse events
+ private static void clickOnFrame(Robot robot) {
+ Frame frame = new Frame();
+ frame.setBounds(100, 100, 100, 100);
+ frame.setVisible(true);
+
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ // click in the middle of the frame
+ robot.mouseMove(150, 150);
+ robot.delay(50);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.delay(50);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/TrayIcon/CtorTest/CtorTest.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ @test
+ @bug 6759726
+ @summary TrayIcon constructor throws NPE instead of documented IAE
+ @author Dmitry Cherepanov area=awt.tray
+ @run main CtorTest
+*/
+
+/**
+ * CtorTest.java
+ *
+ * summary: TrayIcon ctor throws IAE if image is null
+ */
+
+import java.awt.*;
+
+public class CtorTest
+{
+ public static void main(String []s)
+ {
+ boolean isSupported = SystemTray.isSupported();
+ if (isSupported) {
+ try {
+ TrayIcon tray = new TrayIcon(null);
+ } catch(IllegalArgumentException e) {
+ // ctor should throw IAE
+ }
+ }
+ }
+}
--- a/jdk/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@
break;
}
}
+ garbage = null;
// Third, make sure all the weak references are null
for (WeakReference<Window> ref : children)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ @test
+ @bug 6853916
+ @summary Window.setBackground() should not throw NPE
+ @author anthony.petrov@sun.com: area=awt.toplevel
+ @run main SetBackgroundNPE
+*/
+
+import java.awt.Window;
+
+public class SetBackgroundNPE {
+ public static void main(String args[]) {
+ new Window(null).setBackground(null);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ @test
+ @bug 6847958
+ @library ../../../regtesthelpers
+ @summary MouseWheel event is getting triggered for the disabled Textarea in jdk7 b60 pit build.
+ @author Dmitry Cherepanov: area=awt.event
+ @build Util
+ @run main DisabledComponent
+*/
+
+/**
+ * DisabledComponent.java
+ *
+ * summary: Tests that wheel events aren't coming on disabled component
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+
+import sun.awt.SunToolkit;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class DisabledComponent
+{
+
+ private static volatile boolean passed = true;
+
+ public static void main(String []s) throws Exception
+ {
+ Frame frame = new Frame();
+ frame.setBounds(100,100,400,400);
+ frame.setLayout(new FlowLayout());
+
+ TextArea textArea = new TextArea("TextArea", 6, 15);
+ frame.add(textArea);
+
+ List list = new List(3);
+ list.add("1");
+ list.add("2");
+ list.add("3");
+ frame.add(list);
+
+ MouseWheelListener listener = new MouseWheelListener(){
+ @Override
+ public void mouseWheelMoved(MouseWheelEvent mwe){
+ System.err.println(mwe);
+ passed = false;
+ }
+ };
+
+
+ list.addMouseWheelListener(listener);
+ textArea.addMouseWheelListener(listener);
+
+ frame.setVisible(true);
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ Robot robot = new Robot();
+
+ // point and wheel on the list
+ Util.pointOnComp(list, robot);
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ robot.mouseWheel(2);
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ // disable the text area
+ System.err.println(" disable text area ");
+ textArea.setEnabled(false);
+ passed = true;
+
+ // point and wheel on the text area
+ Util.pointOnComp(textArea, robot);
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ robot.mouseWheel(2);
+ ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+ if (!passed) {
+ throw new RuntimeException(" wrong wheel events ");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/TestBeanInfo.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6380849
+ * @summary Tests BeanInfo finder
+ * @author Sergey Malenkov
+ */
+
+import beans.FirstBean;
+import beans.FirstBeanBeanInfo;
+import beans.SecondBean;
+import beans.ThirdBean;
+
+import infos.SecondBeanBeanInfo;
+import infos.ThirdBeanBeanInfo;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.lang.reflect.Field;
+
+import sun.awt.SunToolkit;
+
+public class TestBeanInfo implements Runnable {
+
+ private static final String[] SEARCH_PATH = { "infos" }; // NON-NLS: package name
+
+ public static void main(String[] args) throws InterruptedException {
+ TestBeanInfo test = new TestBeanInfo();
+ test.run();
+ // the following tests fails on previous build
+ ThreadGroup group = new ThreadGroup("$$$"); // NON-NLS: unique thread name
+ Thread thread = new Thread(group, test);
+ thread.start();
+ thread.join();
+ }
+
+ private static void test(Class<?> type, Class<? extends BeanInfo> expected) {
+ BeanInfo actual;
+ try {
+ actual = Introspector.getBeanInfo(type);
+ type = actual.getClass();
+ Field field = type.getDeclaredField("targetBeanInfo"); // NON-NLS: field name
+ field.setAccessible(true);
+ actual = (BeanInfo) field.get(actual);
+ }
+ catch (Exception exception) {
+ throw new Error("unexpected error", exception);
+ }
+ if ((actual == null) && (expected != null)) {
+ throw new Error("expected info is not found");
+ }
+ if ((actual != null) && !actual.getClass().equals(expected)) {
+ throw new Error("found unexpected info");
+ }
+ }
+
+ private boolean passed;
+
+ public void run() {
+ if (this.passed) {
+ SunToolkit.createNewAppContext();
+ }
+ Introspector.flushCaches();
+
+ test(FirstBean.class, FirstBeanBeanInfo.class);
+ test(SecondBean.class, null);
+ test(ThirdBean.class, null);
+ test(ThirdBeanBeanInfo.class, ThirdBeanBeanInfo.class);
+
+ Introspector.setBeanInfoSearchPath(SEARCH_PATH);
+ Introspector.flushCaches();
+
+ test(FirstBean.class, FirstBeanBeanInfo.class);
+ test(SecondBean.class, SecondBeanBeanInfo.class);
+ test(ThirdBean.class, null);
+ test(ThirdBeanBeanInfo.class, ThirdBeanBeanInfo.class);
+
+ this.passed = true;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/FirstBean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,4 @@
+package beans;
+
+public class FirstBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,11 @@
+package beans;
+
+import java.beans.BeanDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class FirstBeanBeanInfo extends SimpleBeanInfo {
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+ return new BeanDescriptor(FirstBean.class);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/SecondBean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,4 @@
+package beans;
+
+public class SecondBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/beans/ThirdBean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,4 @@
+package beans;
+
+public class ThirdBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,13 @@
+package infos;
+
+import beans.SecondBean;
+
+import java.beans.BeanDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class SecondBeanBeanInfo extends SimpleBeanInfo {
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+ return new BeanDescriptor(SecondBean.class);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,11 @@
+package infos;
+
+import java.beans.BeanDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class ThirdBeanBeanInfo extends SimpleBeanInfo {
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+ return new BeanDescriptor(ThirdBeanBeanInfo.class);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/Introspector/Test6723447.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6723447
+ * @summary Tests return type for property setters
+ * @author Sergey Malenkov
+ */
+
+import java.beans.IndexedPropertyDescriptor;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+
+public class Test6723447 {
+
+ public static void main(String[] args) {
+ test(Test6723447.class);
+ test(BigDecimal.class);
+ }
+
+ private static void test(Class<?> type) {
+ for (PropertyDescriptor pd : getPropertyDescriptors(type)) {
+ test(pd.getWriteMethod());
+ if (pd instanceof IndexedPropertyDescriptor) {
+ IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+ test(ipd.getIndexedWriteMethod());
+ }
+ }
+ }
+
+ private static void test(Method method) {
+ if (method != null) {
+ Class<?> type = method.getReturnType();
+ if (!type.equals(void.class)) {
+ throw new Error("unexpected return type: " + type);
+ }
+ }
+ }
+
+ private static PropertyDescriptor[] getPropertyDescriptors(Class<?> type) {
+ try {
+ return Introspector.getBeanInfo(type).getPropertyDescriptors();
+ }
+ catch (IntrospectionException exception) {
+ throw new Error("unexpected exception", exception);
+ }
+ }
+
+ public Object getValue() {
+ return null;
+ }
+
+ public Object setValue(Object value) {
+ return value;
+ }
+
+ public Object getValues(int index) {
+ return null;
+ }
+
+ public Object setValues(int index, Object value) {
+ return value;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/FirstBean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,2 @@
+public class FirstBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,4 @@
+import java.beans.PropertyEditorSupport;
+
+public class FirstBeanEditor extends PropertyEditorSupport {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/SecondBean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,2 @@
+public class SecondBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,141 @@
+/**
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6380849
+ * @summary Tests PropertyEditor finder
+ * @author Sergey Malenkov
+ */
+
+import editors.SecondBeanEditor;
+import editors.ThirdBeanEditor;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorManager;
+
+import sun.awt.SunToolkit;
+import sun.beans.editors.BooleanEditor;
+import sun.beans.editors.ByteEditor;
+import sun.beans.editors.ColorEditor;
+import sun.beans.editors.DoubleEditor;
+import sun.beans.editors.EnumEditor;
+import sun.beans.editors.FloatEditor;
+import sun.beans.editors.FontEditor;
+import sun.beans.editors.IntegerEditor;
+import sun.beans.editors.LongEditor;
+import sun.beans.editors.ShortEditor;
+import sun.beans.editors.StringEditor;
+
+public class TestPropertyEditor implements Runnable {
+
+ private enum Enumeration {
+ FIRST, SECOND, THIRD
+ }
+
+ private static final String[] SEARCH_PATH = { "editors" }; // NON-NLS: package name
+
+ public static void main(String[] args) throws InterruptedException {
+ TestPropertyEditor test = new TestPropertyEditor();
+ test.run();
+ // the following tests fails on previous build
+ ThreadGroup group = new ThreadGroup("$$$"); // NON-NLS: unique thread name
+ Thread thread = new Thread(group, test);
+ thread.start();
+ thread.join();
+ }
+
+ private static void test(Class<?> type, Class<? extends PropertyEditor> expected) {
+ PropertyEditor actual = PropertyEditorManager.findEditor(type);
+ if ((actual == null) && (expected != null)) {
+ throw new Error("expected editor is not found");
+ }
+ if ((actual != null) && !actual.getClass().equals(expected)) {
+ throw new Error("found unexpected editor");
+ }
+ }
+
+ private boolean passed;
+
+ public void run() {
+ if (this.passed) {
+ SunToolkit.createNewAppContext();
+ }
+ PropertyEditorManager.registerEditor(ThirdBean.class, ThirdBeanEditor.class);
+
+ test(FirstBean.class, FirstBeanEditor.class);
+ test(SecondBean.class, null);
+ test(ThirdBean.class, ThirdBeanEditor.class);
+ // test editors for default primitive types
+ test(Byte.TYPE, ByteEditor.class);
+ test(Short.TYPE, ShortEditor.class);
+ test(Integer.TYPE, IntegerEditor.class);
+ test(Long.TYPE, LongEditor.class);
+ test(Boolean.TYPE, BooleanEditor.class);
+ test(Float.TYPE, FloatEditor.class);
+ test(Double.TYPE, DoubleEditor.class);
+ // test editors for default object types
+ test(Byte.class, ByteEditor.class);
+ test(Short.class, ShortEditor.class);
+ test(Integer.class, IntegerEditor.class);
+ test(Long.class, LongEditor.class);
+ test(Boolean.class, BooleanEditor.class);
+ test(Float.class, FloatEditor.class);
+ test(Double.class, DoubleEditor.class);
+ test(String.class, StringEditor.class);
+ test(Color.class, ColorEditor.class);
+ test(Font.class, FontEditor.class);
+ test(Enumeration.class, EnumEditor.class);
+
+ PropertyEditorManager.registerEditor(ThirdBean.class, null);
+ PropertyEditorManager.setEditorSearchPath(SEARCH_PATH);
+
+ test(FirstBean.class, FirstBeanEditor.class);
+ test(SecondBean.class, SecondBeanEditor.class);
+ test(ThirdBean.class, ThirdBeanEditor.class);
+ // test editors for default primitive types
+ test(Byte.TYPE, ByteEditor.class);
+ test(Short.TYPE, ShortEditor.class);
+ test(Integer.TYPE, IntegerEditor.class);
+ test(Long.TYPE, LongEditor.class);
+ test(Boolean.TYPE, BooleanEditor.class);
+ test(Float.TYPE, FloatEditor.class);
+ test(Double.TYPE, DoubleEditor.class);
+ // test editors for default object types
+ test(Byte.class, null);
+ test(Short.class, null);
+ test(Integer.class, null);
+ test(Long.class, null);
+ test(Boolean.class, null);
+ test(Float.class, null);
+ test(Double.class, null);
+ test(String.class, null);
+ test(Color.class, null);
+ test(Font.class, null);
+ test(Enumeration.class, EnumEditor.class);
+
+ this.passed = true;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/ThirdBean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,2 @@
+public class ThirdBean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,6 @@
+package editors;
+
+import java.beans.PropertyEditorSupport;
+
+public class SecondBeanEditor extends PropertyEditorSupport {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,6 @@
+package editors;
+
+import java.beans.PropertyEditorSupport;
+
+public class ThirdBeanEditor extends PropertyEditorSupport {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6329581/Test6329581.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6329581
+ * @summary Tests encoding of a class with custom ClassLoader
+ * @author Sergey Malenkov
+ */
+
+import java.beans.ExceptionListener;
+import java.beans.XMLDecoder;
+import java.beans.XMLEncoder;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+public class Test6329581 implements ExceptionListener {
+
+ public static void main(String[] args) throws Exception {
+ ExceptionListener listener = new Test6329581();
+ // write bean to byte array
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ XMLEncoder encoder = new XMLEncoder(out);
+ encoder.setExceptionListener(listener);
+ encoder.writeObject(getClassLoader("beans.jar").loadClass("test.Bean").newInstance());
+ encoder.close();
+ // read bean from byte array
+ ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+ XMLDecoder decoder = new XMLDecoder(in, null, listener, getClassLoader("beans.jar"));
+ Object object = decoder.readObject();
+ decoder.close();
+
+ if (!object.getClass().getClassLoader().getClass().equals(URLClassLoader.class)) {
+ throw new Error("bean is loaded with unexpected class loader");
+ }
+ }
+
+ private static ClassLoader getClassLoader(String name) throws Exception {
+ StringBuilder sb = new StringBuilder(256);
+ sb.append("file:");
+ sb.append(System.getProperty("test.src", "."));
+ sb.append(File.separatorChar);
+ sb.append(name);
+
+ URL[] url = { new URL(sb.toString()) };
+ return new URLClassLoader(url);
+ }
+
+ public void exceptionThrown(Exception exception) {
+ throw new Error("unexpected exception", exception);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6380849/Bean.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,2 @@
+public class Bean {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,5 @@
+import java.beans.DefaultPersistenceDelegate;
+
+public class BeanPersistenceDelegate
+ extends DefaultPersistenceDelegate {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6380849
+ * @summary Tests PersistenceDelegate finder
+ * @author Sergey Malenkov
+ */
+
+import java.beans.PersistenceDelegate;
+import java.beans.XMLEncoder;
+import java.beans.DefaultPersistenceDelegate;
+
+public class TestPersistenceDelegate {
+
+ private static final XMLEncoder ENCODER = new XMLEncoder(System.out);
+
+ public static void main(String[] args) throws InterruptedException {
+ Class<?> type = TestPersistenceDelegate.class;
+ test(type, DefaultPersistenceDelegate.class);
+ ENCODER.setPersistenceDelegate(type, new BeanPersistenceDelegate());
+ test(type, BeanPersistenceDelegate.class);
+ ENCODER.setPersistenceDelegate(type, null);
+ test(type, DefaultPersistenceDelegate.class);
+ // the following tests fails on previous build
+ test(Bean.class, BeanPersistenceDelegate.class);
+ test(BeanPersistenceDelegate.class, BeanPersistenceDelegate.class);
+ }
+
+ private static void test(Class<?> type, Class<? extends PersistenceDelegate> expected) {
+ PersistenceDelegate actual = ENCODER.getPersistenceDelegate(type);
+ if ((actual == null) && (expected != null)) {
+ throw new Error("expected delegate is not found");
+ }
+ if ((actual != null) && !actual.getClass().equals(expected)) {
+ throw new Error("found unexpected delegate");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6852744
+ * @summary PIT b61: PKI test suite fails because self signed certificates
+ * are being rejected
+ * @run main/othervm DisableRevocation subca
+ * @run main/othervm DisableRevocation subci
+ * @run main/othervm DisableRevocation alice
+ * @author Xuelei Fan
+ */
+
+import java.io.*;
+import java.net.SocketException;
+import java.util.*;
+import java.security.Security;
+import java.security.cert.*;
+import java.security.cert.CertPathValidatorException.BasicReason;
+import sun.security.util.DerInputStream;
+
+/**
+ * A test case helps to ensure that a certification path building process is
+ * able to identify a self-issued certificate from its issuer when disable
+ * revocation checking.
+ */
+public final class DisableRevocation {
+
+ // the trust anchor
+ static String selfSignedCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICPjCCAaegAwIBAgIBADANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMThaFw0zMDA2MDgxMzMyMTha\n" +
+ "MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB\n" +
+ "AQUAA4GNADCBiQKBgQDInJhXi0655bPXAVkz1n5I6fAcZejzPnOPuwq3hU3OxFw8\n" +
+ "81Uf6o9oKI1h4w4XAD8u1cUNOgiX+wPwojronlp68bIfO6FVhNf287pLtLhNJo+7\n" +
+ "m6Qxw3ymFvEKy+PVj20CHSggdKHxUa4MBZBmHMFNBuxfYmjwzn+yTMmCCXOvSwID\n" +
+ "AQABo4GJMIGGMB0GA1UdDgQWBBSQ52Dpau+gtL+Kc31dusYnKj16ZTBHBgNVHSME\n" +
+ "QDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEwHzELMAkGA1UEBhMCVVMxEDAO\n" +
+ "BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYw\n" +
+ "DQYJKoZIhvcNAQEEBQADgYEAjBt6ea65HCqbGsS2rs/HhlGusYXtThRVC5vwXSey\n" +
+ "ZFYwSgukuq1KDzckqZFu1meNImEwdZjwxdN0e2p/nVREPC42rZliSj6V1ThayKXj\n" +
+ "DWEZW1U5aR8T+3NYfDrdKcJGx4Hzfz0qKz1j4ssV1M9ptJxYYv4y2Da+592IN1S9\n" +
+ "v/E=\n" +
+ "-----END CERTIFICATE-----";
+
+ // the sub-ca
+ static String subCaCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICUDCCAbmgAwIBAgIBAzANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjRaFw0yOTAzMTUxMzMyMjRa\n" +
+ "MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz\n" +
+ "cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPFv24SK78VI0gWlyIrq/X\n" +
+ "srl1431K5hJJxMYZtaQunyPmrYg3oI9KvKFykxnR0N4XDPaIi75p9dXGppVu80BA\n" +
+ "+csvIPBwlBQoNmKDQWTziDOqfK4tE+IMuL/Y7pxnH6CDMY7VGpvatty2zcmH+m/v\n" +
+ "E/n+HPyeELJQT2rT/3T+7wIDAQABo4GJMIGGMB0GA1UdDgQWBBRidC8Dt3dBzYES\n" +
+ "KpR2tR560sZ0+zBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw\n" +
+ "HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw\n" +
+ "AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAMeMKqrMr5d3eTQsv\n" +
+ "MYOD15Dl3THQGLAa4ad5Eyq5/1eUeEOpztzCgDfi0iPD8YCubIEVasBTSqTiGXqb\n" +
+ "RpGuPHOwwfWvHrTeHSludiFBAUiKj7aEV+oQa0FBn4U4TT8HA62HQ93FhzTDI3jP\n" +
+ "iil34GktVl6gfMKGzUEW/Dh8OM4=\n" +
+ "-----END CERTIFICATE-----";
+
+ // a delegated CRL issuer, it's a self-issued certificate of trust anchor
+ static String topCrlIssuerCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICPjCCAaegAwIBAgIBAjANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjNaFw0yOTAzMTUxMzMyMjNa\n" +
+ "MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB\n" +
+ "AQUAA4GNADCBiQKBgQC99u93trf+WmpfiqunJy/P31ej1l4rESxft2JSGNjKuLFN\n" +
+ "/BO3SAugGJSkCARAwXjB0c8eeXhXWhVVWdNpbKepRJTxrjDfnFIavLgtUvmFwn/3\n" +
+ "hPXe+RQeA8+AJ99Y+o+10kY8JAZLa2j93C2FdmwOjUbo8aIz85yhbiV1tEDjLwID\n" +
+ "AQABo4GJMIGGMB0GA1UdDgQWBBSyFyA3XWLbdL6W6hksmBn7RKsQmDBHBgNVHSME\n" +
+ "QDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEwHzELMAkGA1UEBhMCVVMxEDAO\n" +
+ "BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYw\n" +
+ "DQYJKoZIhvcNAQEEBQADgYEAHTm8aRTeakgCfEBCgSWK9wvMW1c18ANGMm8OFDBk\n" +
+ "xabVy9BT0MVFHlaneh89oIxTZN0FMTpg21GZMAvIzhEt7DGdO7HLsW7JniN7/OZ0\n" +
+ "rACmpK5frmZrLS03zUm8c+rTbazNfYLoZVG3/mDZbKIi+4y8IGnFcgLVsHsYoBNP\n" +
+ "G0c=\n" +
+ "-----END CERTIFICATE-----";
+
+ // a delegated CRL issuer, it's a self-issued certificate of sub-ca
+ static String subCrlIssuerCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICUDCCAbmgAwIBAgIBBDANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjdaFw0yOTAzMTUxMzMyMjda\n" +
+ "MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz\n" +
+ "cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+8AcLJtGAVUWvv3ifcyQw\n" +
+ "OGqwzcPrBw/XCs6vTMlcdtFzcH1M+Z3/QHN9+5VT1gqeTIZ+b8g9005Og3XKy/HX\n" +
+ "obXZeLv20VZsr+jm52ySghEYOVCTJ9OyFOAp5adp6nf0cA66Feh3LsmVhpTEcDOG\n" +
+ "GnyntQm0DBYxRoOT/GBlvQIDAQABo4GJMIGGMB0GA1UdDgQWBBSRWhMuZLQoHSDN\n" +
+ "xhxr+vdDmfAY8jBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw\n" +
+ "HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw\n" +
+ "AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAMIDZLdOLFiPyS1bh\n" +
+ "Ch4eUYHT+K1WG93skbga3kVYg3GSe+gctwkKwKK13bwfi8zc7wwz6MtmQwEYhppc\n" +
+ "pKKKEwi5QirBCP54rihLCvRQaj6ZqUJ6VP+zPAqHYMDbzlBbHtVF/1lQUP30I6SV\n" +
+ "Fu987DvLmZ2GuQA9FKJsnlD9pbU=\n" +
+ "-----END CERTIFICATE-----";
+
+ // the target EE certificate
+ static String targetCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMTAeFw0wOTA2MjgxMzMy\n" +
+ "MzBaFw0yOTAzMTUxMzMyMzBaMEExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFt\n" +
+ "cGxlMRAwDgYDVQQLEwdDbGFzcy0xMQ4wDAYDVQQDEwVBbGljZTCBnzANBgkqhkiG\n" +
+ "9w0BAQEFAAOBjQAwgYkCgYEA7wnsvR4XEOfVznf40l8ClLod+7L0y2/+smVV+GM/\n" +
+ "T1/QF/stajAJxXNy08gK00WKZ6ruTHhR9vh/Z6+EQM2RZDCpU0A7LPa3kLE/XTmS\n" +
+ "1MLDu8ntkdlpURpvhdDWem+rl2HU5oZgzV8Jkcov9vXuSjqEDfr45FlPuV40T8+7\n" +
+ "cxsCAwEAAaNPME0wCwYDVR0PBAQDAgPoMB0GA1UdDgQWBBSBwsAhi6Z1kriOs3ty\n" +
+ "uSIujv9a3DAfBgNVHSMEGDAWgBRidC8Dt3dBzYESKpR2tR560sZ0+zANBgkqhkiG\n" +
+ "9w0BAQQFAAOBgQDEiBqd5AMy2SQopFaS3dYkzj8MHlwtbCSoNVYkOfDnewcatrbk\n" +
+ "yFcp6FX++PMdOQFHWvvnDdkCUAzZQp8kCkF9tGLVLBtOK7XxQ1us1LZym7kOPzsd\n" +
+ "G93Dcf0U1JRO77juc61Br5paAy8Bok18Y/MeG7uKgB2MAEJYKhGKbCrfMw==\n" +
+ "-----END CERTIFICATE-----";
+
+ private static Set<TrustAnchor> generateTrustAnchors()
+ throws CertificateException {
+ // generate certificate from cert string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ ByteArrayInputStream is =
+ new ByteArrayInputStream(selfSignedCertStr.getBytes());
+ Certificate selfSignedCert = cf.generateCertificate(is);
+
+ // generate a trust anchor
+ TrustAnchor anchor =
+ new TrustAnchor((X509Certificate)selfSignedCert, null);
+
+ return Collections.singleton(anchor);
+ }
+
+ private static CertStore generateCertificateStore() throws Exception {
+ Collection entries = new HashSet();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ ByteArrayInputStream is;
+
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ Certificate cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(topCrlIssuerCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ return CertStore.getInstance("Collection",
+ new CollectionCertStoreParameters(entries));
+ }
+
+ private static X509CertSelector generateSelector(String name)
+ throws Exception {
+ X509CertSelector selector = new X509CertSelector();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream is = null;
+ if (name.equals("subca")) {
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ } else if (name.equals("subci")) {
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ } else {
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ }
+
+ X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+ byte[] extVal = target.getExtensionValue("2.5.29.14");
+ if (extVal != null) {
+ DerInputStream in = new DerInputStream(extVal);
+ byte[] subjectKID = in.getOctetString();
+ selector.setSubjectKeyIdentifier(subjectKID);
+ } else {
+ // unlikely to happen.
+ throw new Exception("unexpected certificate: no SKID extension");
+ }
+
+ return selector;
+ }
+
+ private static boolean match(String name, Certificate cert)
+ throws Exception {
+ X509CertSelector selector = new X509CertSelector();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream is = null;
+ if (name.equals("subca")) {
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ } else if (name.equals("subci")) {
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ } else {
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ }
+ X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+
+ return target.equals(cert);
+ }
+
+
+ public static void main(String[] args) throws Exception {
+ CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
+
+ X509CertSelector selector = generateSelector(args[0]);
+
+ Set<TrustAnchor> anchors = generateTrustAnchors();
+ CertStore certs = generateCertificateStore();
+
+
+ PKIXBuilderParameters params =
+ new PKIXBuilderParameters(anchors, selector);
+ params.addCertStore(certs);
+ params.setRevocationEnabled(false);
+ params.setDate(new Date(109, 7, 1)); // 2009-07-01
+ Security.setProperty("ocsp.enable", "false");
+ System.setProperty("com.sun.security.enableCRLDP", "false");
+
+ PKIXCertPathBuilderResult result =
+ (PKIXCertPathBuilderResult)builder.build(params);
+
+ if (!match(args[0], result.getCertPath().getCertificates().get(0))) {
+ throw new Exception("unexpected certificate");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,303 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6852744
+ * @summary PIT b61: PKI test suite fails because self signed certificates
+ * are being rejected
+ * @run main/othervm KeyUsageMatters subca
+ * @run main/othervm KeyUsageMatters subci
+ * @run main/othervm KeyUsageMatters alice
+ * @author Xuelei Fan
+ */
+
+import java.io.*;
+import java.net.SocketException;
+import java.util.*;
+import java.security.Security;
+import java.security.cert.*;
+import java.security.cert.CertPathValidatorException.BasicReason;
+import sun.security.util.DerInputStream;
+
+/**
+ * KeyUsage extension plays a important rule during looking for the issuer
+ * of a certificate or CRL. A certificate issuer should have the keyCertSign
+ * bit set, and a CRL issuer should have the cRLSign bit set.
+ *
+ * Sometime, a delegated CRL issuer would also have the keyCertSign bit set,
+ * as would be troublesome to find the proper CRL issuer during certificate
+ * path build if the delegated CRL issuer is a self-issued certificate, for
+ * it is hard to identify it from its issuer by the "issuer" field only.
+ *
+ * The fix of 6852744 should addresses above issue, and allow a delegated CRL
+ * issuer to have keyCertSign bit set.
+ *
+ * In the test case, the delegated CRL issuers have cRLSign bit set only, and
+ * the CAs have the keyCertSign bit set only, it is expected to work before
+ * and after the bug fix of 6852744.
+ */
+public final class KeyUsageMatters {
+
+ // the trust anchor
+ static String selfSignedCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICPjCCAaegAwIBAgIBADANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA0MjcwMjI0MzJaFw0zMDA0MDcwMjI0MzJa\n" +
+ "MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB\n" +
+ "AQUAA4GNADCBiQKBgQC4OTag24sTxL2tXTNuvpmUEtdxrYAZoFsslFQ60T+WD9wQ\n" +
+ "Jeiw87FSPsR2vxRuv0j8DNm2a4h7LNNIFcLurfNldbz5pvgZ7VqdbbUMPE9qP85n\n" +
+ "jgDl4woyRTSUeRI4A7O0CO6NpES21dtbdhroWQrEkHxpnrDPxsxrz5gf2m3gqwID\n" +
+ "AQABo4GJMIGGMB0GA1UdDgQWBBSCJd0hpl5PdAD9IZS+Hzng4lXLGzBHBgNVHSME\n" +
+ "QDA+gBSCJd0hpl5PdAD9IZS+Hzng4lXLG6EjpCEwHzELMAkGA1UEBhMCVVMxEDAO\n" +
+ "BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAgQw\n" +
+ "DQYJKoZIhvcNAQEEBQADgYEAluy6HIjWcq009lTLmhp+Np6dxU78pInBK8RZkza0\n" +
+ "484qGaxFGD3UGyZkI5uWmsH2XuMbuox5khfIq6781gmkPBHXBIEtJN8eLusOHEye\n" +
+ "iE8h7WI+N3qa6Pj56WionMrioqC/3X+b06o147bbhx8U0vkYv/HyPaITOFfMXTdz\n" +
+ "Vjw=\n" +
+ "-----END CERTIFICATE-----";
+
+ // the sub-ca
+ static String subCaCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICUDCCAbmgAwIBAgIBAzANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA0MjcwMjI0MzRaFw0yOTAxMTIwMjI0MzRa\n" +
+ "MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz\n" +
+ "cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCiAJnAQW2ad3ZMKUhSJVZj\n" +
+ "8pBqxTcHSTwAVguQkDglsN/OIwUpvR5Jgp3lpRWUEt6idEp0FZzORpvtjt3pr5MG\n" +
+ "Eg2CDptekC5BSPS+fIAIKlncB3HwOiFFhH6b3wTydDCdEd2fvsi4QMOSVrIYMeA8\n" +
+ "P/mCz6kRhfUQPE0CMmOUewIDAQABo4GJMIGGMB0GA1UdDgQWBBT0/nNP8WpyxmYr\n" +
+ "IBp4tN8y08jw2jBHBgNVHSMEQDA+gBSCJd0hpl5PdAD9IZS+Hzng4lXLG6EjpCEw\n" +
+ "HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw\n" +
+ "AwEB/zALBgNVHQ8EBAMCAgQwDQYJKoZIhvcNAQEEBQADgYEAS9PzI6B39R/U9fRj\n" +
+ "UExzN1FXNP5awnAPtiv34kSCL6n6MryqkfG+8aaAOdZsSjmTylNFaF7cW/Xp1VBF\n" +
+ "hq0bg/SbEAbK7+UwL8GSC3crhULHLbh+1iFdVTEwxCw5YmB8ji3BaZ/WKW/PkjCZ\n" +
+ "7cXP6VDeZMG6oRQ4hbOcixoFPXo=\n" +
+ "-----END CERTIFICATE-----";
+
+ // a delegated CRL issuer, it's a self-issued certificate of trust anchor
+ static String topCrlIssuerCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICKzCCAZSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA0MjcwMjI0MzNaFw0yOTAxMTIwMjI0MzNa\n" +
+ "MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB\n" +
+ "AQUAA4GNADCBiQKBgQDMJeBMBybHykI/YpwUJ4O9euqDSLb1kpWpceBS8TVqvgBC\n" +
+ "SgUJWtFZL0i6bdvF6mMdlbuBkGzhXqHiVAi96/zRLbUC9F8SMEJ6MuD+YhQ0ZFTQ\n" +
+ "atKy8zf8O9XzztelLJ26Gqb7QPV133WY3haAqHtCXOhEKkCN16NOYNC37DTaJwID\n" +
+ "AQABo3cwdTAdBgNVHQ4EFgQULXSWzXzUOIpOJpzbSCpW42IJUugwRwYDVR0jBEAw\n" +
+ "PoAUgiXdIaZeT3QA/SGUvh854OJVyxuhI6QhMB8xCzAJBgNVBAYTAlVTMRAwDgYD\n" +
+ "VQQKEwdFeGFtcGxlggEAMAsGA1UdDwQEAwIBAjANBgkqhkiG9w0BAQQFAAOBgQAY\n" +
+ "eMnf5AHSNlyUlzXk8o2S0h4gCuvKX6C3kFfKuZcWvFAbx4yQOWLS2s15/nzR4+AP\n" +
+ "FGX3lgJjROyAh7fGedTQK+NFWwkM2ag1g3hXktnlnT1qHohi0w31nVBJxXEDO/Ck\n" +
+ "uJTpJGt8XxxbFaw5v7cHy7XuTAeU/sekvjEiNHW00Q==\n" +
+ "-----END CERTIFICATE-----";
+
+ // a delegated CRL issuer, it's a self-issued certificate of sub-ca
+ static String subCrlIssuerCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICPTCCAaagAwIBAgIBBDANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA0MjcwMjI0MzRaFw0yOTAxMTIwMjI0MzRa\n" +
+ "MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz\n" +
+ "cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWUtDQx2MB/7arDiquMJyd\n" +
+ "LWwSg6p8sg5z6wKrC1v47MT4DBhFX+0RUgTMUdQgYpgxGpczn+6y4zfV76064S0N\n" +
+ "4L/IQ+SunTW1w4yRGjB+xkyyJmWAqijG1nr+Dgkv5nxPI+9Er5lHcoVWVMEcvvRm\n" +
+ "6jIBQdldVlSgv+VgUnFm5wIDAQABo3cwdTAdBgNVHQ4EFgQUkV3Qqtk7gIot9n60\n" +
+ "jX6dloxrfMEwRwYDVR0jBEAwPoAUgiXdIaZeT3QA/SGUvh854OJVyxuhI6QhMB8x\n" +
+ "CzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlggEAMAsGA1UdDwQEAwIBAjAN\n" +
+ "BgkqhkiG9w0BAQQFAAOBgQADu4GM8EdmIKhC7FRvk5jF90zfvZ38wbXBzCjKI4jX\n" +
+ "QJrhne1bfyeNNm5c1w+VKidT+XzBzBGH7ZqYzoZmzRIfcbLKX2brEBKiukeeAyL3\n" +
+ "bctQtbp19tX+uu2dQberD188AAysKTkHcJUV+rRsTwVJ9vcYKxoRxKk8DhH7ZS3M\n" +
+ "rg==\n" +
+ "-----END CERTIFICATE-----";
+
+ // the target EE certificate
+ static String targetCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMTAeFw0wOTA0MjcwMjI0\n" +
+ "MzZaFw0yOTAxMTIwMjI0MzZaMEExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFt\n" +
+ "cGxlMRAwDgYDVQQLEwdDbGFzcy0xMQ4wDAYDVQQDEwVBbGljZTCBnzANBgkqhkiG\n" +
+ "9w0BAQEFAAOBjQAwgYkCgYEAvYSaU3oiE4Pxp/aUIXwMqOwSiWkZ+O3aTu13hRtK\n" +
+ "ZyR+Wtj63IuvaigAC4uC+zBypF93ThjwCzVR2qKDQaQzV8CLleO96gStt7Y+i3G2\n" +
+ "V3IUGgrVCqeK7N6nNYu0wW84sibcPqG/TIy0UoaQMqgB21xtRF+1DUVlFh4Z89X/\n" +
+ "pskCAwEAAaNPME0wCwYDVR0PBAQDAgPoMB0GA1UdDgQWBBSynMEdcal/e9TmvlNE\n" +
+ "4suXGA4+hjAfBgNVHSMEGDAWgBT0/nNP8WpyxmYrIBp4tN8y08jw2jANBgkqhkiG\n" +
+ "9w0BAQQFAAOBgQB/jru7E/+piSmUwByw5qbZsoQZVcgR97pd2TErNJpJMAX2oIHR\n" +
+ "wJH6w4NuYs27+fEAX7wK4whc6EUH/w1SI6o28F2rG6HqYQPPZ2E2WqwbBQL9nYE3\n" +
+ "Vfzu/G9axTUQXFbf90h80UErA+mZVxqc2xtymLuH0YEaMZImtRZ2MXHfXg==\n" +
+ "-----END CERTIFICATE-----";
+
+ // CRL issued by the delegated CRL issuer, topCrlIssuerCertStr
+ static String topCrlStr =
+ "-----BEGIN X509 CRL-----\n" +
+ "MIIBGzCBhQIBATANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQMA4GA1UE\n" +
+ "ChMHRXhhbXBsZRcNMDkwNDI3MDIzODA0WhcNMjgwNjI2MDIzODA0WjAiMCACAQUX\n" +
+ "DTA5MDQyNzAyMzgwMFowDDAKBgNVHRUEAwoBBKAOMAwwCgYDVR0UBAMCAQIwDQYJ\n" +
+ "KoZIhvcNAQEEBQADgYEAoarfzXEtw3ZDi4f9U8eSvRIipHSyxOrJC7HR/hM5VhmY\n" +
+ "CErChny6x9lBVg9s57tfD/P9PSzBLusCcHwHMAbMOEcTltVVKUWZnnbumpywlYyg\n" +
+ "oKLrE9+yCOkYUOpiRlz43/3vkEL5hjIKMcDSZnPKBZi1h16Yj2hPe9GMibNip54=\n" +
+ "-----END X509 CRL-----";
+
+ // CRL issued by the delegated CRL issuer, subCrlIssuerCertStr
+ static String subCrlStr =
+ "-----BEGIN X509 CRL-----\n" +
+ "MIIBLTCBlwIBATANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQMA4GA1UE\n" +
+ "ChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMRcNMDkwNDI3MDIzODA0WhcNMjgw\n" +
+ "NjI2MDIzODA0WjAiMCACAQQXDTA5MDQyNzAyMzgwMVowDDAKBgNVHRUEAwoBBKAO\n" +
+ "MAwwCgYDVR0UBAMCAQIwDQYJKoZIhvcNAQEEBQADgYEAeS+POqYEIHIIJcsLxuUr\n" +
+ "aJFzQ/ujH0QmnyMNEL3Uavyq4VQuAahF+w6aTPb5UBzms0uX8NAvD2vNoUJvmJOX\n" +
+ "nGKuq4Q1DFj82E7/9d25nXdWGOmFvFCRVO+St2Xe5n8CJuZNBiz388FDSIOiFSCa\n" +
+ "ARGr6Qu68MYGtLMC6ZqP3u0=\n" +
+ "-----END X509 CRL-----";
+
+ private static Set<TrustAnchor> generateTrustAnchors()
+ throws CertificateException {
+ // generate certificate from cert string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ ByteArrayInputStream is =
+ new ByteArrayInputStream(selfSignedCertStr.getBytes());
+ Certificate selfSignedCert = cf.generateCertificate(is);
+
+ // generate a trust anchor
+ TrustAnchor anchor =
+ new TrustAnchor((X509Certificate)selfSignedCert, null);
+
+ return Collections.singleton(anchor);
+ }
+
+ private static CertStore generateCertificateStore() throws Exception {
+ Collection entries = new HashSet();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ ByteArrayInputStream is;
+
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ Certificate cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(topCrlIssuerCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ // generate CRL from CRL string
+ is = new ByteArrayInputStream(topCrlStr.getBytes());
+ Collection mixes = cf.generateCRLs(is);
+ entries.addAll(mixes);
+
+ is = new ByteArrayInputStream(subCrlStr.getBytes());
+ mixes = cf.generateCRLs(is);
+ entries.addAll(mixes);
+
+ return CertStore.getInstance("Collection",
+ new CollectionCertStoreParameters(entries));
+ }
+
+ private static X509CertSelector generateSelector(String name)
+ throws Exception {
+ X509CertSelector selector = new X509CertSelector();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream is = null;
+ if (name.equals("subca")) {
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ } else if (name.equals("subci")) {
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ } else {
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ }
+
+ X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+ byte[] extVal = target.getExtensionValue("2.5.29.14");
+ if (extVal != null) {
+ DerInputStream in = new DerInputStream(extVal);
+ byte[] subjectKID = in.getOctetString();
+ selector.setSubjectKeyIdentifier(subjectKID);
+ } else {
+ // unlikely to happen.
+ throw new Exception("unexpected certificate: no SKID extension");
+ }
+
+ return selector;
+ }
+
+ private static boolean match(String name, Certificate cert)
+ throws Exception {
+ X509CertSelector selector = new X509CertSelector();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream is = null;
+ if (name.equals("subca")) {
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ } else if (name.equals("subci")) {
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ } else {
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ }
+ X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+
+ return target.equals(cert);
+ }
+
+
+ public static void main(String[] args) throws Exception {
+ CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
+
+ X509CertSelector selector = generateSelector(args[0]);
+
+ Set<TrustAnchor> anchors = generateTrustAnchors();
+ CertStore certs = generateCertificateStore();
+
+
+ PKIXBuilderParameters params =
+ new PKIXBuilderParameters(anchors, selector);
+ params.addCertStore(certs);
+ params.setRevocationEnabled(true);
+ params.setDate(new Date(109, 5, 1)); // 2009-05-01
+ Security.setProperty("ocsp.enable", "false");
+ System.setProperty("com.sun.security.enableCRLDP", "true");
+
+ PKIXCertPathBuilderResult result =
+ (PKIXCertPathBuilderResult)builder.build(params);
+
+ if (!match(args[0], result.getCertPath().getCertificates().get(0))) {
+ throw new Exception("unexpected certificate");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/README Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+ Certificates and CRLs
+
+The certificates and CRLs used by KeyUsageMatters.java are copied from
+test/java/security/cert/CertPathValidator/indirectCRL.
+
+Here lists the local generated certificates and CRLs used in the test cases.
+
+The generate.sh depends on openssl, and it should be run under ksh. The
+script will create many directories and files, please run it in a
+directory outside of JDK workspace.
+
+1. root certifiate and key
+-----BEGIN CERTIFICATE-----
+MIICPjCCAaegAwIBAgIBADANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMThaFw0zMDA2MDgxMzMyMTha
+MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDInJhXi0655bPXAVkz1n5I6fAcZejzPnOPuwq3hU3OxFw8
+81Uf6o9oKI1h4w4XAD8u1cUNOgiX+wPwojronlp68bIfO6FVhNf287pLtLhNJo+7
+m6Qxw3ymFvEKy+PVj20CHSggdKHxUa4MBZBmHMFNBuxfYmjwzn+yTMmCCXOvSwID
+AQABo4GJMIGGMB0GA1UdDgQWBBSQ52Dpau+gtL+Kc31dusYnKj16ZTBHBgNVHSME
+QDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEwHzELMAkGA1UEBhMCVVMxEDAO
+BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYw
+DQYJKoZIhvcNAQEEBQADgYEAjBt6ea65HCqbGsS2rs/HhlGusYXtThRVC5vwXSey
+ZFYwSgukuq1KDzckqZFu1meNImEwdZjwxdN0e2p/nVREPC42rZliSj6V1ThayKXj
+DWEZW1U5aR8T+3NYfDrdKcJGx4Hzfz0qKz1j4ssV1M9ptJxYYv4y2Da+592IN1S9
+v/E=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,46F13CECA9B38323
+
+AVNWPH7jiPyJVq9KfL3IlGVCwD41KVapg12yJR2t/WWlLaKr19/0oWNvimcrd040
+txFKvcFO9TFLxmaco33+actCoL0K/XbrCBICThZLybzcFTuYFMum8eqL61avQgBe
+Kt4CCjcupWLzKWkKTMV/bP6nPnPUSB9U8QeGwutjJYnLDi0TuYx8YSqZo/36vM98
+r3OvtcSA5XEN4guxxHusZJnhbclVb/Z1WtLVb4v2d5yBtPM2p3R0hK17L4Dnusjl
+n56z6Z0AIYmfAggM/Fpge2uT3D/5n//l1lZRNoSvsX5UZipKswZKLpvx7IJ+AqgA
+UO9lcmNLGnIXME3IS3smd83wPi7nxH3NCYWHbGAKLm6mkFMs5LOhofUMOBS3Rxmm
+2RjCGtuzDxBPKveo9/Y80B//6sEce2gdi7fCKgWwtR4VFuJd0hWODD6CarK3edHH
+rUG62Kt2aqiI/y/NLEbfHCHbyM37c9/OzS5Zy695dDl22r5EirVFsVgejQR1JGtP
+ANdc6kkkJW+s6GiqimShssMTp1x0L8twT/+wEa38LafiaPKk4OweleBuyz7k2FxA
+Rr2u9IOvGU3eKAeH8HSFWvaNE9S2lYFPiWWZ6O/LzVvnb847+gungQ7SPRzOkt4k
+L4PtHIoKmLWFr5tzML1Q8wiaKcTWMb5LZbRbo+2XYGoIpilxkBBuhX7cMJFwOHEf
+YJJRixBI97doPsnIQ3GkA8xY+INzQ4LWNQbnEtS7L7t26NA9tDlg4ILU/UfMoQIp
+Ol4EZY1U7gD8BeMwo2vX3x/WA+a7R2N95klBFNqn9jSkm6a5yoeCZw==
+-----END RSA PRIVATE KEY-----
+
+
+2. root crl issuer and key
+-----BEGIN CERTIFICATE-----
+MIICPjCCAaegAwIBAgIBAjANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjNaFw0yOTAzMTUxMzMyMjNa
+MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQC99u93trf+WmpfiqunJy/P31ej1l4rESxft2JSGNjKuLFN
+/BO3SAugGJSkCARAwXjB0c8eeXhXWhVVWdNpbKepRJTxrjDfnFIavLgtUvmFwn/3
+hPXe+RQeA8+AJ99Y+o+10kY8JAZLa2j93C2FdmwOjUbo8aIz85yhbiV1tEDjLwID
+AQABo4GJMIGGMB0GA1UdDgQWBBSyFyA3XWLbdL6W6hksmBn7RKsQmDBHBgNVHSME
+QDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEwHzELMAkGA1UEBhMCVVMxEDAO
+BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYw
+DQYJKoZIhvcNAQEEBQADgYEAHTm8aRTeakgCfEBCgSWK9wvMW1c18ANGMm8OFDBk
+xabVy9BT0MVFHlaneh89oIxTZN0FMTpg21GZMAvIzhEt7DGdO7HLsW7JniN7/OZ0
+rACmpK5frmZrLS03zUm8c+rTbazNfYLoZVG3/mDZbKIi+4y8IGnFcgLVsHsYoBNP
+G0c=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,3881A5676C1AD5E5
+
+KgaAtGlIQXVnsoifcd1oTi4hS1J+InHISFcZepI1h1hrU9KVAJAlwD1GIeM2qAkG
+P1ABsA0TE0yRJpd3qHih2IPtD42osfc3HmNTw17nh4Trd3ESilrs4w/rrH8e6bR5
+WlqG0OKsw8x57t44m9yX94+pP3tdPaJwnFk5M7pDCO44IZskmy10S0NHBn7wMwM/
+mqlZ15mK6YZTwOuLzpdSDJqYPLiv77KpfeiqSN++ISXoNhIcNYHRVyErAS/DcBlx
+mbrmBaGexhuagQYqVikEDIvg8kBDWD92EjOFbz94Z6eTvliauJ/+E1/Ffefe2cN5
+LaVwuUsiyW9GjarWwBJDFrXesTikklshC9V35j/ACHVdh5CuO8FGfVijIwlbZ14N
+xKWJdSlZlJgEjkwUlWfi1KmrFrob+yK20fGMWr3oY1rTKWZdYkrqnnKEYcMQV/TH
+XNY77D5idJ3FLtvJyziqIFuohdatQsu6xFP5UEOeUi6OhptJDjjS+zDhiBlL4cqA
+klThzvuycxjZT+5xno0f8GEnZkQNcC6xxPoP6vstNMKLz1rI1CVUSXZBHc5nfMaF
+m75rrLbvf6F2NLUspaNXnW8TUMHxcu8nNCnM4/u6hkqebQo/N8X1/v1HImsewwWO
+P5uJwqmqfuRz0vZyMKAk3FzQIfrjJouxDfkNV2YHM9VP/grPlDgzmgiN0+6bCbn+
+RW2K8kvkSFZehQ1Ygdst9KYH3NEcEYVYY9pH1N1xRNAylcIDJNwrFwf9vfwjt9/q
+AVsyDxUBT/KVCcqr15LNNq9HmmcP6IZZMRjdyf2BR+/cobxxDRZq1Q==
+-----END RSA PRIVATE KEY-----
+
+
+3. root CRL issued by root crl issuer.
+-----BEGIN X509 CRL-----
+MIIBGzCBhQIBATANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQMA4GA1UE
+ChMHRXhhbXBsZRcNMDkwNjI4MTMzMjM4WhcNMjgwODI3MTMzMjM4WjAiMCACAQUX
+DTA5MDYyODEzMzIzN1owDDAKBgNVHRUEAwoBBKAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQEEBQADgYEAVUIeu2x7ZwsliafoCBOg+u8Q4S/VFfTe/SQnRyTM3/V1
+v+Vn5Acc7eo8Rh4AHcnFFbLNk38n6lllov/CaVR0IPZ6hnrNHVa7VYkNlRAwV2aN
+GUUhkMMOLVLnN25UOrN9J637SHmRE6pB+TRMaEQ73V7UNlWxuSMK4KofWen0A34=
+-----END X509 CRL-----
+
+
+4. subca certificate and key
+-----BEGIN CERTIFICATE-----
+MIICUDCCAbmgAwIBAgIBAzANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjRaFw0yOTAzMTUxMzMyMjRa
+MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz
+cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPFv24SK78VI0gWlyIrq/X
+srl1431K5hJJxMYZtaQunyPmrYg3oI9KvKFykxnR0N4XDPaIi75p9dXGppVu80BA
++csvIPBwlBQoNmKDQWTziDOqfK4tE+IMuL/Y7pxnH6CDMY7VGpvatty2zcmH+m/v
+E/n+HPyeELJQT2rT/3T+7wIDAQABo4GJMIGGMB0GA1UdDgQWBBRidC8Dt3dBzYES
+KpR2tR560sZ0+zBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw
+HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAMeMKqrMr5d3eTQsv
+MYOD15Dl3THQGLAa4ad5Eyq5/1eUeEOpztzCgDfi0iPD8YCubIEVasBTSqTiGXqb
+RpGuPHOwwfWvHrTeHSludiFBAUiKj7aEV+oQa0FBn4U4TT8HA62HQ93FhzTDI3jP
+iil34GktVl6gfMKGzUEW/Dh8OM4=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,35408AD3018F0049
+
+4t6WfpFNqpOr47Wc/OAt8+KZK0+WX7d3nlJn47W+QN7AkPfBlLBpcQJkImhP4/eh
+aJyk8fPOdUhT/4rgc5ORuKk4d9boD36KK5Iz/+/oNBxzuld6TybVb+Hvw41cIZTW
+CtkvADQpR8XWbPre+3ZH2eAKoTeWX0xR7pYg1JsFk9vxee6U82iqsAYRdUOdot8D
+9zdDbbeaLWs78UbZkxFtuXREuyNVX880Q17t8qszJL2KmmtMQpUvxTlW04Ope1Ug
+uIuOxeannzpKRD+37fj+oacM3GRqVFOP47/NVaziOexDBn4b5nlW6OMro6t0qiHt
+1GLJcw1oLXoFe8ycexfzYWUiHymSz5Vh3wIflsQY+Ik6dopL+fpk2cVD0bncKJlf
+Ie9PvL04RwannRjgtPl9X05tzcgeyznp2Ix1/rsriZQQpdPTLGA6w6kUhQeK6TwT
+eX7pXn3iLTGK+VoHRfbxBQR2Fvq1nRJbvsmJFhPOcJU5CYSaDPGGdA6NorbdVgbc
+14DlkhzojhEpZ7DaUeFNUXUMlQOR5UUTZB+wL3zQoY/FzHci3JD1Gj4NlbC9mMEg
+ncWZcpZWOnP2kHSz2o/UOxQM80gerukI7NOr020iJ+ZZRb/gyAAzLPnD+mCZ7/e2
+JJ3x6yHOtVA6WzZiQH1d9/bm79rtcWaRH83X/idG1lHuKXQJFAaw5f7Z2n2/yuF1
+9pZf7el1M7UoBf74oc68klAl46f4inroy8anAtc/qjSTXUYQrNvKZsWU9AZVS7oH
+iEuYMVW4KiZh3SHsIg5TZdMbdVYtZpcTsl/Kh6XuY0o0Xsi+rTK5AA==
+-----END RSA PRIVATE KEY-----
+
+
+5. crl issuer of subca, the certificate and key
+-----BEGIN CERTIFICATE-----
+MIICUDCCAbmgAwIBAgIBBDANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjdaFw0yOTAzMTUxMzMyMjda
+MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz
+cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+8AcLJtGAVUWvv3ifcyQw
+OGqwzcPrBw/XCs6vTMlcdtFzcH1M+Z3/QHN9+5VT1gqeTIZ+b8g9005Og3XKy/HX
+obXZeLv20VZsr+jm52ySghEYOVCTJ9OyFOAp5adp6nf0cA66Feh3LsmVhpTEcDOG
+GnyntQm0DBYxRoOT/GBlvQIDAQABo4GJMIGGMB0GA1UdDgQWBBSRWhMuZLQoHSDN
+xhxr+vdDmfAY8jBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw
+HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAMIDZLdOLFiPyS1bh
+Ch4eUYHT+K1WG93skbga3kVYg3GSe+gctwkKwKK13bwfi8zc7wwz6MtmQwEYhppc
+pKKKEwi5QirBCP54rihLCvRQaj6ZqUJ6VP+zPAqHYMDbzlBbHtVF/1lQUP30I6SV
+Fu987DvLmZ2GuQA9FKJsnlD9pbU=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,4CD10EAA24AF8C25
+
+6pTRc9jsn6CJ2EMYhuGX3aWrDThhacnqdtsKIqUzX8Ga7Jz9kq6HseTRlqPkzBfb
+rCl+eVIkgugrPbf93375mP/ozY8LkEgD9TRAL1uXqha2N6TRLC2ozQJQSoIc441e
+UZ9XkB6tPGRfPNvi1xE0WTP7bjOUkvkPU9wM9QFuBW6B7mRf3tG2nqkFiTpY6nz8
+5X5+h9jafcCvMwYhfJm0JFTGWmX4WJWubs8QeYndvIriDDw2zpVNcno45sClSQCb
+YVekMLgGlKPmNGub5iRfXsozykE3jbMnXRokxrvzk20jjo0XYPVGfCRe9IhJh8Ud
+iCG/kPaJspbUkUlKXfvIOdp2pnoDFZI5hbfc75YrFYJ8x8dwRYBUl6yRtBkw5Yo/
+VQDuNq3d7YpxiGxVTwFox6HQ5+rs6jwSGzOilgOCxPSs41fYcdAlogNqLzjvhn+e
+0GU1XTVyMJbO0Ae6Sgm4PmxU7QM2bdzESuZWbYRFbH2ywwmoR8SahB3ICBhuIA/l
+lsCrBbq+jL/K2IL1VXBKuaKBN1ShKUPZD/ABWNv4uENNg2AFq1XQ6kvTU8Glfhd9
+tyK8YnJ0ViY4VLGhdf0s2eEPmbfxOv0HCW0sz/57eASoQSTJTdVApYopWHBOwaNq
+8qQUEPDMTKaPNqCjA2m/NwGrLPHhU0d5dHmp+9gTbCTmWy4sVenhBPbOy6wvFpNA
+F+35tJVaZQOOurm/KC2dLOYkKyAvqnB7D2q4zducpWkiyCweg7uYL14Mo5JQmGuq
+2DwfRiMxdqqoqHFKEOxsoAMrKSwJlYojUknfz/LEaqxtMePQtNwhjw==
+-----END RSA PRIVATE KEY-----
+
+
+6. CLR issued by subca CRL issuer
+-----BEGIN X509 CRL-----
+MIIBLTCBlwIBATANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQMA4GA1UE
+ChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMRcNMDkwNjI4MTMzMjQzWhcNMjgw
+ODI3MTMzMjQzWjAiMCACAQQXDTA5MDYyODEzMzIzOFowDDAKBgNVHRUEAwoBBKAO
+MAwwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQEEBQADgYEACQZEf6ydb3fKTMPJ8DBO
+oo630MsrT3P0x0AC4+aQOueCBaGpNqW/H379uZxXAad7yr+aXUBwaeBMYVKUbwOe
+5TrN5QWPe2eCkU+MSQvh1SHASDDMH4jhWFMRdO3aPMDKKPlO/Q3s0G72eD7Zo5dr
+N9AvUXxGxU4DruoJuFPcrCI=
+-----END X509 CRL-----
+
+
+7. dumca certificate and key
+-----BEGIN CERTIFICATE-----
+MIICUDCCAbmgAwIBAgIBBTANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjhaFw0yOTAzMTUxMzMyMjha
+MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz
+cy1EMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDeWn+ulgls9+dK3KzzfC1b
+a9RMSf+gjv/Olw5386Vw6pJOVngR11RytWJoLiKbjYPyGhP1cms2FoUKuAEO31gD
+3AoUCa+nXgaMLiDtmdC5ATqVv3Oap5aNgAqq0mxMxOylKgcUhfuH2icEnfBtHzEe
+ST11S69zQr5GGfa/XslbDQIDAQABo4GJMIGGMB0GA1UdDgQWBBRCmXIsp4G3iP7Z
+Qv4gS19W8W/cLzBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw
+HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAkRiLpJesXyNQ34ZP
+Oc4d0gvCl4pyNHx5gsV0yHtxP7oYoIa7Bw4setplQ9Y2YcH5xuXK84xvAby9csWp
+cod1QOkFzZfb9qj10PXfD8bMoLOyrZfr5nsNAl2scvOtnM1TFL/ll5/S2PVcPthx
+Z5t128UNQYMu93OmVjZANL5L6Jw=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,11485599004D2482
+
+R+TgUoQo1Ksqpnwh1B1x3u7jxd1qJsfG5st7WJaeJzSY3v+ZnmTS4O008eKgw6Z1
+eGJevsNW8Z8ButjChzlesCm+90jpKpOqA6MlvzeknAxtGdEfe8rUEytfNOorjJTy
+1Mu9T8Tlk6tmmmXNTDX1lQytYaHA4e4VVEbYGNceMNcPonT1Y0SyebJwtfd4XKkG
+Ty40kMnb+qrFr1ZxVRG+LWKDR/bS0S2K2zY6Ha45d8yoYZlgLZ7yVAlrp0T0PF4B
+UWvSyNK9VOBLrvqXSofK5gNGkR/C63x8FU2V25ISicBQBXLNo9OgIsbrryHF330T
+2TxhnOpFU1AwgTSfp4Fy/Htkvgo7/jmFRa3r4xelTdEUKvRrwaZeMjg0fT+24529
+8o8MMOF0YWNtIDNUVRFg9/DgAsD/LoXbOGc/E2ryJdq1D4N914s4m/D5Sox27iu4
+3op/dt+WMoA0g/YbjhWn2cAfWcH9P8p8/n/FUO8APmGI3aHbtOhJQ8qwxcalp6kO
+fICWsW4ygWtdpnyJWzAY0Udtsl8mglTppGTl59OYZmlDQTLhJ1hWiXLeNKj0pGPz
+bAJ5jGQN8zXAk83j019rI5WveAdWp+w1XRGvmPxLL3heojHrkutuYLQ0LOcFwNvg
+OqmPvZneRBoy6Yshp0XyYy+qioxDm+Vd/NV1/aCWgQXJA3vFqUg3AURLFHHTh+7h
+fa3DDCLtdg/wJkRtOWjFhq0hgx5sb9zVv8HCuMERbZJbWwDOfSrHJwXj4KaTHVqY
+OWfBE9vzeAxRpdpe69SZWYg3tyu7uSf6a5Rp55iMI3kjuQMCanvsNA==
+-----END RSA PRIVATE KEY-----
+
+
+8. crl issuer for dumca, the certificate and key
+-----BEGIN CERTIFICATE-----
+MIICUDCCAbmgAwIBAgIBBjANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjlaFw0yOTAzMTUxMzMyMjla
+MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz
+cy1EMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF7NjUUWji4pPmFg3qx4HB
+kjtInwe7i2lPjRUN0ZwTcWob2RaD1+fhc7seeNmnypjERTa9TXF5cs2PgSHWNISC
+QbQpbobOUcSsV/6Lr0kvrHJuVowcX13VsApGSJavVs2oJqUiFGNpnch8yR/pMHJf
+hsd/Go+nUXMOl2xN31DMFQIDAQABo4GJMIGGMB0GA1UdDgQWBBS1XVE2CYKHgO7t
+1koYVTu2w7xgNTBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw
+HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw
+AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAHYraYtdetZFOiTUR
+dhvUi556el1WT25O8pF21YAzRI7KI4yzl6deD29DtcIPiBc8H1A4U6OhwXSQsqTd
+taOHHdZxnU+m078mb231OPVvo48uZwpnX35g/qItW+Nb/dIEb08537oQKoGgL0hV
+sKZPWod70JBkJabDuUirorhlk4A=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,1E0E5983F90A10E0
+
+KdPTRmJjeKXFTgdVIgP0eu+m0evwVD2QFMkT3pPI9HELRxtkgIQzjK8F0KIHK9vi
+Ur0CMgJkX0zs2v7HIG7jvfQ2fREidRTk1g3xCjHXVbpwjWN2dbo+mR0J2zzxNILy
+mSs13PlDPdV81Vkn1WkMY0lhdrEpR6senQ4KIiMJTMsWZabG3lyFM6d7ag7CDVC+
+jnsUFg2XW5dYP/kb09p14+CdiQwruNVeVEWhWPG1pAjl7hXCEM5ssz9fNk6Gyh2X
+OXB2mMysqTkt+qB+OIqLKj3NTUs2ovVQZnaCaynsnMYTcIEFmv3lC0gJHYAZtBXf
+IkySb+VaB7wmk1CI1+texDU8+B2sq7wmqX0SLY7dMwkbxP1kydn9U5i4Gqmdxpw5
+4+jn7dB6oKfVFlXIZTZzhmN44cIdai48qVmse1BRDxUdfmlgd9C2W1mw4N60BXbt
+DeNr8ua5UtcUOXBGJk6VEJapDU/dnnANhVR4R48Y9t+g1qlhwHB4zbSrAIJ5Rsbg
+6pvdt7BQmFXtm4flZbf21Lr8awWkNFdc/k/3uXA6xemgsFNxPZXlpXO26KpIP+nz
+lt9Q82WxIkzE+BvO+qd5wMqQ/GC/ztO8GJeGdRIo6un7KkNKs2AZDoCELo2lO53B
+EBWHeABtJpB1Fw3lW3iJn0A6YbYzK1omztoNMkesBIi0QI5L/e0tq4Mp+LUjLm+Y
+ywdrofTiYTu8R7mgS1b5q3eFtwUR9MZuKJGvhsBcSfS41vH2hDezYHg8vW55UIE3
+h7EhOUnTkHY43OKZnmXHwh3pTEmHv1TfMpeaktiU/w0=
+-----END RSA PRIVATE KEY-----
+
+9. end entity certificate issued by subca, Alice
+-----BEGIN CERTIFICATE-----
+MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMTAeFw0wOTA2MjgxMzMy
+MzBaFw0yOTAzMTUxMzMyMzBaMEExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFt
+cGxlMRAwDgYDVQQLEwdDbGFzcy0xMQ4wDAYDVQQDEwVBbGljZTCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA7wnsvR4XEOfVznf40l8ClLod+7L0y2/+smVV+GM/
+T1/QF/stajAJxXNy08gK00WKZ6ruTHhR9vh/Z6+EQM2RZDCpU0A7LPa3kLE/XTmS
+1MLDu8ntkdlpURpvhdDWem+rl2HU5oZgzV8Jkcov9vXuSjqEDfr45FlPuV40T8+7
+cxsCAwEAAaNPME0wCwYDVR0PBAQDAgPoMB0GA1UdDgQWBBSBwsAhi6Z1kriOs3ty
+uSIujv9a3DAfBgNVHSMEGDAWgBRidC8Dt3dBzYESKpR2tR560sZ0+zANBgkqhkiG
+9w0BAQQFAAOBgQDEiBqd5AMy2SQopFaS3dYkzj8MHlwtbCSoNVYkOfDnewcatrbk
+yFcp6FX++PMdOQFHWvvnDdkCUAzZQp8kCkF9tGLVLBtOK7XxQ1us1LZym7kOPzsd
+G93Dcf0U1JRO77juc61Br5paAy8Bok18Y/MeG7uKgB2MAEJYKhGKbCrfMw==
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,9E29E1901B338431
+
+796Bj4/MwwHdy6+yZQcq3pS12EZPlEm7qsCCTl787y+DYEnnj+9W4WX4+1zWsUGV
+1+39oe/KOUfi5O9ytMuKiroIrklmkskWHDoW6sr4VcDprnLYL+75AhTfgpOtY+gK
+q+++N7P2o9V6YF7PiGxaBqGy/3bt0nTu0sjctfzbo4g0PniiId9sus2Y+iRHKebJ
+r9V0b0jB8USuIsZ+4IQJFZ+/zeKuqqqPM/4v5VKNUahER8oykhRd4L9UactnVH5t
+dsfowtHmOmKE6ObJX3m+HgJMvauMMf7zJVdqJquU2vy0bUk9ufCrA7t5ws7JDRzd
+SG5gt7EVQzd5x/yXsQdKbDew5mXsYPB8vz4moTgj4YJU+m6k0t1PH00pz7LUrDHl
+E8ZAmXIKLEBIih1AWkdASR/YZsfB3URIC8mLyDSZJN5iEVJxl/JWm6pbJlP3Xn3J
+fraVEXP6uerf29CNhizq520AfGdsSqga6atdx6PXBVm67V0TZ+zmBMUQJrWmJUUC
+NFGAac+M58lYX9uwsrO9x/x6GSZvhQQu1kfD1m8DHN3IV5m3uHxsEvhmuHaqFEMJ
+uH336HbqWYENXwZfDHZvOU1o2FejsLZ7QmFjB72iAxhVNQt53pCXed2gF/bERGSn
+qi0PsYtjyzfEUefqlVRSWVulbQfGwkvl8dX9s6BxmOG1q0BzlDu+cQLYXPS+XOww
+H8GgkGp6XTd04qT/qCm8gcuxAvdkYkj2zgAIKaqeJ53S3Ua9lrIKnA3L3btiEG5F
+JTYutSdRqB4liukkB1TciiDVSmOisszjrMHhRRYPfgeLfnRFdX9U9g==
+-----END RSA PRIVATE KEY-----
+
+10. end entity certificate issued by subca, Bob
+-----BEGIN CERTIFICATE-----
+MIICNTCCAZ6gAwIBAgIBAzANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMTAeFw0wOTA2MjgxMzMy
+MzVaFw0yOTAzMTUxMzMyMzVaMD8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFt
+cGxlMRAwDgYDVQQLEwdDbGFzcy0xMQwwCgYDVQQDEwNCb2IwgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBALLrxd3DpXuH7yiAoyi/Rc1F7WsyyeNE1Ra2ymHpcee/
+3sbldekcgPl6lGQF/JJ5ARBbfeDtaf6ZtAK3j6aXqxVFxDKKu86r96v74gWJB7Vv
+CHcUPvmE/EGESq3VNFI998DbmvqICLC97nFLUIrKWDH1rRFZjjkmouln40UxQXvV
+AgMBAAGjTzBNMAsGA1UdDwQEAwID6DAdBgNVHQ4EFgQUTXz1J2viNSKvRHIRVhD6
+cJE4lgYwHwYDVR0jBBgwFoAUYnQvA7d3Qc2BEiqUdrUeetLGdPswDQYJKoZIhvcN
+AQEEBQADgYEApsKyLf4FbXb26KsQrxgFn/w0d/7ck4cE8a6oXQqi5OLheNSWfD3S
+fgD1dR28mGmhBiyOkdLmrhA1+6BuEr4FsuyLgrFnEqKL0ZhVhiqvwKLGqvasWxfU
+Edaw4WXvRcfRWXfgjtwB6PSj/3nqGKSGRPif/OFIjO6UqHwEM7JEWO4=
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,4A820975D251613F
+
+GseD8MIztC0oYMxwpxeBO4/YPs9ZFFjgncXXcy+1oYZdlEsrS1xw87unjeHigL8m
+QPIn8Guv3DiOsBdvweuMAgPPaA1zlophPClbGZMk7BB3T2acEfjBQH1DZz7kd7Bf
+OmI2DrqcEg1yDi7l7YutBuTQPiy3nj3d7pbScuFd5YVMu6yH0YpS7JsPvviabFk2
+eYVlkaiejtQwV+4rUb7sH/0iyqX2uqvnpnGAwVzGp+tfSOl71SByz240nOODBRgY
+3Uvxkrw6XhCBAayJE0t7rkPMEe1KgZaGO2IU2jsJJbyHVjvNPSugdbsT28prZHN1
+5M1J1NSOssq/kAq6S3f9sC5j7OzP7oUlx8uMUUSaz09/Ttq22tUoqmTue2IqqxAt
+lDaeR8duHP5VV1wWnDsW/XaVYlBFQ4eFPJcXqmWsNAkDQVJp327GrcT6ngevP8fD
+BcIxyX6J0rETPruAE+1+PAGjqy+C+oB0ssyZvKcjzdajHcNxSlRpCuOO2ekDvNPO
+h+mVukNpHCEBsh3jYmk3z9i7VPLCM0BI+vheJ1TbM+homWP6bXyTQxtLfaKzXZJH
+jRJ+zGTMBNJoPVKkou03uXFpT6hdWr9nYwbMT6G9hmC0If3wEl8nRjDKbmyMS29B
+p3im1kPxVJA0DjhghC+7tACy42ffw6KZPALwaVDKHGeitrQBc3xTGfrjOGQOTTcm
+hZ8icYCY0cjl5KQ2kq2GpXa2zQMujNV/Oj7D4sE0xcASMRXl3tst77R/j0eowx1M
+niCTRphxx4iTPkieIbjWWeFTpVmSzUBrm4hSw3tiRapVWf6Zo3aAIg==
+-----END RSA PRIVATE KEY-----
+
+11. end entity certificate issued by subca, Susan
+-----BEGIN CERTIFICATE-----
+MIICNzCCAaCgAwIBAgIBBDANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMTAeFw0wOTA2MjgxMzMy
+MzZaFw0yOTAzMTUxMzMyMzZaMEExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFt
+cGxlMRAwDgYDVQQLEwdDbGFzcy0xMQ4wDAYDVQQDEwVTdXNhbjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAr2u6mdjqAVtfcgPze+9OUFZu3pi+HqoNBoygm2gq
+qRAe+FVNSUeNAMQesQBo/eB0F1Iv/BjnYJ/7pYMLaf90MLoYr0Q5vNKYlBdcyUee
+Jn1WmfN2Qk+UoUaiM4HAKHNJnZk13vWpZW54mcW1q09oj0oMjAZtaZsqpY6CtW6/
++J8CAwEAAaNPME0wCwYDVR0PBAQDAgPoMB0GA1UdDgQWBBQVK9naug5W9pQlBqD2
+fVaCXooa1TAfBgNVHSMEGDAWgBRidC8Dt3dBzYESKpR2tR560sZ0+zANBgkqhkiG
+9w0BAQQFAAOBgQDKYoM8EbP78ucjtsdvw4ywyo21hhSeP9PmRnNz/U3F9sQATmn+
+QBl6sBsrmbML2yrhkM1ctZTVUVp0S72fAbLgVjNk86p/CF+a2tmi0+lJh1aR7zQi
+opt+68Nec2/52kgWi64ruF7YITmGHBxS/RDooFbscZbdrPgcow/Jw+5HnQ==
+-----END CERTIFICATE-----
+
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,9025CDB2AB43B0DE
+
+q4hvYnqkhDSDCsbXfxtMjPvzT38ql5wscOsGwDM/xMANSyPk9h/aqAxvB8G+8v6E
+63x9Q5jRi2YY6z2sOpvu0utu7Xn6KA/H1YrpYFURTEjBbK2Qd41vPQ/NYcIO3nQd
+PR2Qm3kpNumBSZomyNfJk9oegGxfw+P0af2GIb6YqmTDot+LLCLwpqxrGyQQ1LYp
+zc4A9D/b19Y0eD+TU9S2KEYszvfUo7RBxRFSZ6QN1rT2SEa7IJN9wb6TvgeB2lRB
+Ds90tmLtkbuwLTZre+aqbM8mU40+RI9GHh+mPw0Qz55Kw2CUe+PnGsLQnOTm7p/I
+mLiPTNMJKvwaR18Z88IE9UwL0zE/ND7vZfrhqTn9bHRnzHU4NtBCBsS8zloI+rXZ
+EIWKMDyzMH3wpbNYq/AemSvvUz1wGOxit5TjG2QwwCNt8hPLl0Es6Q5aWdAPPrLM
+EfX/6gL7bLTHNyLPz/U32o0H4hz5J7FQ7SuYUPLI3ybiPC2qL11jbtrZMesAYEAX
+mvRnqO+6dPEpwGmKz8kUj2mC8X8FPKCCiy4kbc8NjLTMao+/vOgD+wBuIePaC3yE
+vpuZrsUSFZWRJ824sDMmmZFoi2DKsp1zqCV1kXozaPGigaOxtkdp890nBcGkPijQ
+8F+jCGwSFda6UfuJHCQ/eJB+8LQUWa8u1TeJ9zo98oD2OBfQ5maZU0Vfv1EXvwbp
+pz2R6HXFaPrQDeGO0xVzD453AbY/fZCGnhIwrEYvPAbwpIKde397MP66gYFMNFhA
+IaMimFnBv7IHL08Ka0KtqbVhLpEKWFpZ6LsOnyispeB4KF0md+lpGg==
+-----END RSA PRIVATE KEY-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6852744
+ * @summary PIT b61: PKI test suite fails because self signed certificates
+ * are being rejected
+ * @run main/othervm StatusLoopDependency subca
+ * @run main/othervm StatusLoopDependency subci
+ * @run main/othervm StatusLoopDependency alice
+ * @author Xuelei Fan
+ */
+
+import java.io.*;
+import java.net.SocketException;
+import java.util.*;
+import java.security.Security;
+import java.security.cert.*;
+import java.security.cert.CertPathValidatorException.BasicReason;
+import sun.security.util.DerInputStream;
+
+/**
+ * KeyUsage extension plays a important rule during looking for the issuer
+ * of a certificate or CRL. A certificate issuer should have the keyCertSign
+ * bit set, and a CRL issuer should have the cRLSign bit set.
+ *
+ * Sometime, a delegated CRL issuer would also have the keyCertSign bit set,
+ * as would be troublesome to find the proper CRL issuer during certificate
+ * path build if the delegated CRL issuer is a self-issued certificate, for
+ * it is hard to identify it from its issuer by the "issuer" field only.
+ *
+ * In the test case, the delegated CRL issuers have keyCertSign bit set, and
+ * the CAs have the cRLSign bit set also. If we cannot identify the delegated
+ * CRL issuer from its issuer, there is a potential loop to find the correct
+ * CRL.
+ *
+ * And when revocation enabled, needs to check the status of the delegated
+ * CRL issuers. If the delegated CRL issuer issues itself status, there is
+ * a potential loop to verify the CRL and check the status of delegated CRL
+ * issuer.
+ *
+ * The fix of 6852744 should addresses above issues.
+ */
+public final class StatusLoopDependency {
+
+ // the trust anchor
+ static String selfSignedCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICPjCCAaegAwIBAgIBADANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMThaFw0zMDA2MDgxMzMyMTha\n" +
+ "MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB\n" +
+ "AQUAA4GNADCBiQKBgQDInJhXi0655bPXAVkz1n5I6fAcZejzPnOPuwq3hU3OxFw8\n" +
+ "81Uf6o9oKI1h4w4XAD8u1cUNOgiX+wPwojronlp68bIfO6FVhNf287pLtLhNJo+7\n" +
+ "m6Qxw3ymFvEKy+PVj20CHSggdKHxUa4MBZBmHMFNBuxfYmjwzn+yTMmCCXOvSwID\n" +
+ "AQABo4GJMIGGMB0GA1UdDgQWBBSQ52Dpau+gtL+Kc31dusYnKj16ZTBHBgNVHSME\n" +
+ "QDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEwHzELMAkGA1UEBhMCVVMxEDAO\n" +
+ "BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYw\n" +
+ "DQYJKoZIhvcNAQEEBQADgYEAjBt6ea65HCqbGsS2rs/HhlGusYXtThRVC5vwXSey\n" +
+ "ZFYwSgukuq1KDzckqZFu1meNImEwdZjwxdN0e2p/nVREPC42rZliSj6V1ThayKXj\n" +
+ "DWEZW1U5aR8T+3NYfDrdKcJGx4Hzfz0qKz1j4ssV1M9ptJxYYv4y2Da+592IN1S9\n" +
+ "v/E=\n" +
+ "-----END CERTIFICATE-----";
+
+ // the sub-ca
+ static String subCaCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICUDCCAbmgAwIBAgIBAzANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjRaFw0yOTAzMTUxMzMyMjRa\n" +
+ "MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz\n" +
+ "cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPFv24SK78VI0gWlyIrq/X\n" +
+ "srl1431K5hJJxMYZtaQunyPmrYg3oI9KvKFykxnR0N4XDPaIi75p9dXGppVu80BA\n" +
+ "+csvIPBwlBQoNmKDQWTziDOqfK4tE+IMuL/Y7pxnH6CDMY7VGpvatty2zcmH+m/v\n" +
+ "E/n+HPyeELJQT2rT/3T+7wIDAQABo4GJMIGGMB0GA1UdDgQWBBRidC8Dt3dBzYES\n" +
+ "KpR2tR560sZ0+zBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw\n" +
+ "HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw\n" +
+ "AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAMeMKqrMr5d3eTQsv\n" +
+ "MYOD15Dl3THQGLAa4ad5Eyq5/1eUeEOpztzCgDfi0iPD8YCubIEVasBTSqTiGXqb\n" +
+ "RpGuPHOwwfWvHrTeHSludiFBAUiKj7aEV+oQa0FBn4U4TT8HA62HQ93FhzTDI3jP\n" +
+ "iil34GktVl6gfMKGzUEW/Dh8OM4=\n" +
+ "-----END CERTIFICATE-----";
+
+ // a delegated CRL issuer, it's a self-issued certificate of trust anchor
+ static String topCrlIssuerCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICPjCCAaegAwIBAgIBAjANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjNaFw0yOTAzMTUxMzMyMjNa\n" +
+ "MB8xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMIGfMA0GCSqGSIb3DQEB\n" +
+ "AQUAA4GNADCBiQKBgQC99u93trf+WmpfiqunJy/P31ej1l4rESxft2JSGNjKuLFN\n" +
+ "/BO3SAugGJSkCARAwXjB0c8eeXhXWhVVWdNpbKepRJTxrjDfnFIavLgtUvmFwn/3\n" +
+ "hPXe+RQeA8+AJ99Y+o+10kY8JAZLa2j93C2FdmwOjUbo8aIz85yhbiV1tEDjLwID\n" +
+ "AQABo4GJMIGGMB0GA1UdDgQWBBSyFyA3XWLbdL6W6hksmBn7RKsQmDBHBgNVHSME\n" +
+ "QDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEwHzELMAkGA1UEBhMCVVMxEDAO\n" +
+ "BgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYw\n" +
+ "DQYJKoZIhvcNAQEEBQADgYEAHTm8aRTeakgCfEBCgSWK9wvMW1c18ANGMm8OFDBk\n" +
+ "xabVy9BT0MVFHlaneh89oIxTZN0FMTpg21GZMAvIzhEt7DGdO7HLsW7JniN7/OZ0\n" +
+ "rACmpK5frmZrLS03zUm8c+rTbazNfYLoZVG3/mDZbKIi+4y8IGnFcgLVsHsYoBNP\n" +
+ "G0c=\n" +
+ "-----END CERTIFICATE-----";
+
+ // a delegated CRL issuer, it's a self-issued certificate of sub-ca
+ static String subCrlIssuerCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICUDCCAbmgAwIBAgIBBDANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTAeFw0wOTA2MjgxMzMyMjdaFw0yOTAzMTUxMzMyMjda\n" +
+ "MDExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFtcGxlMRAwDgYDVQQLEwdDbGFz\n" +
+ "cy0xMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+8AcLJtGAVUWvv3ifcyQw\n" +
+ "OGqwzcPrBw/XCs6vTMlcdtFzcH1M+Z3/QHN9+5VT1gqeTIZ+b8g9005Og3XKy/HX\n" +
+ "obXZeLv20VZsr+jm52ySghEYOVCTJ9OyFOAp5adp6nf0cA66Feh3LsmVhpTEcDOG\n" +
+ "GnyntQm0DBYxRoOT/GBlvQIDAQABo4GJMIGGMB0GA1UdDgQWBBSRWhMuZLQoHSDN\n" +
+ "xhxr+vdDmfAY8jBHBgNVHSMEQDA+gBSQ52Dpau+gtL+Kc31dusYnKj16ZaEjpCEw\n" +
+ "HzELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0V4YW1wbGWCAQAwDwYDVR0TAQH/BAUw\n" +
+ "AwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEEBQADgYEAMIDZLdOLFiPyS1bh\n" +
+ "Ch4eUYHT+K1WG93skbga3kVYg3GSe+gctwkKwKK13bwfi8zc7wwz6MtmQwEYhppc\n" +
+ "pKKKEwi5QirBCP54rihLCvRQaj6ZqUJ6VP+zPAqHYMDbzlBbHtVF/1lQUP30I6SV\n" +
+ "Fu987DvLmZ2GuQA9FKJsnlD9pbU=\n" +
+ "-----END CERTIFICATE-----";
+
+ // the target EE certificate
+ static String targetCertStr =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQ\n" +
+ "MA4GA1UEChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMTAeFw0wOTA2MjgxMzMy\n" +
+ "MzBaFw0yOTAzMTUxMzMyMzBaMEExCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFeGFt\n" +
+ "cGxlMRAwDgYDVQQLEwdDbGFzcy0xMQ4wDAYDVQQDEwVBbGljZTCBnzANBgkqhkiG\n" +
+ "9w0BAQEFAAOBjQAwgYkCgYEA7wnsvR4XEOfVznf40l8ClLod+7L0y2/+smVV+GM/\n" +
+ "T1/QF/stajAJxXNy08gK00WKZ6ruTHhR9vh/Z6+EQM2RZDCpU0A7LPa3kLE/XTmS\n" +
+ "1MLDu8ntkdlpURpvhdDWem+rl2HU5oZgzV8Jkcov9vXuSjqEDfr45FlPuV40T8+7\n" +
+ "cxsCAwEAAaNPME0wCwYDVR0PBAQDAgPoMB0GA1UdDgQWBBSBwsAhi6Z1kriOs3ty\n" +
+ "uSIujv9a3DAfBgNVHSMEGDAWgBRidC8Dt3dBzYESKpR2tR560sZ0+zANBgkqhkiG\n" +
+ "9w0BAQQFAAOBgQDEiBqd5AMy2SQopFaS3dYkzj8MHlwtbCSoNVYkOfDnewcatrbk\n" +
+ "yFcp6FX++PMdOQFHWvvnDdkCUAzZQp8kCkF9tGLVLBtOK7XxQ1us1LZym7kOPzsd\n" +
+ "G93Dcf0U1JRO77juc61Br5paAy8Bok18Y/MeG7uKgB2MAEJYKhGKbCrfMw==\n" +
+ "-----END CERTIFICATE-----";
+
+ // CRL issued by the delegated CRL issuer, topCrlIssuerCertStr
+ static String topCrlStr =
+ "-----BEGIN X509 CRL-----\n" +
+ "MIIBGzCBhQIBATANBgkqhkiG9w0BAQQFADAfMQswCQYDVQQGEwJVUzEQMA4GA1UE\n" +
+ "ChMHRXhhbXBsZRcNMDkwNjI4MTMzMjM4WhcNMjgwODI3MTMzMjM4WjAiMCACAQUX\n" +
+ "DTA5MDYyODEzMzIzN1owDDAKBgNVHRUEAwoBBKAOMAwwCgYDVR0UBAMCAQEwDQYJ\n" +
+ "KoZIhvcNAQEEBQADgYEAVUIeu2x7ZwsliafoCBOg+u8Q4S/VFfTe/SQnRyTM3/V1\n" +
+ "v+Vn5Acc7eo8Rh4AHcnFFbLNk38n6lllov/CaVR0IPZ6hnrNHVa7VYkNlRAwV2aN\n" +
+ "GUUhkMMOLVLnN25UOrN9J637SHmRE6pB+TRMaEQ73V7UNlWxuSMK4KofWen0A34=\n" +
+ "-----END X509 CRL-----";
+
+ // CRL issued by the delegated CRL issuer, subCrlIssuerCertStr
+ static String subCrlStr =
+ "-----BEGIN X509 CRL-----\n" +
+ "MIIBLTCBlwIBATANBgkqhkiG9w0BAQQFADAxMQswCQYDVQQGEwJVUzEQMA4GA1UE\n" +
+ "ChMHRXhhbXBsZTEQMA4GA1UECxMHQ2xhc3MtMRcNMDkwNjI4MTMzMjQzWhcNMjgw\n" +
+ "ODI3MTMzMjQzWjAiMCACAQQXDTA5MDYyODEzMzIzOFowDDAKBgNVHRUEAwoBBKAO\n" +
+ "MAwwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQEEBQADgYEACQZEf6ydb3fKTMPJ8DBO\n" +
+ "oo630MsrT3P0x0AC4+aQOueCBaGpNqW/H379uZxXAad7yr+aXUBwaeBMYVKUbwOe\n" +
+ "5TrN5QWPe2eCkU+MSQvh1SHASDDMH4jhWFMRdO3aPMDKKPlO/Q3s0G72eD7Zo5dr\n" +
+ "N9AvUXxGxU4DruoJuFPcrCI=\n" +
+ "-----END X509 CRL-----";
+
+ private static Set<TrustAnchor> generateTrustAnchors()
+ throws CertificateException {
+ // generate certificate from cert string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ ByteArrayInputStream is =
+ new ByteArrayInputStream(selfSignedCertStr.getBytes());
+ Certificate selfSignedCert = cf.generateCertificate(is);
+
+ // generate a trust anchor
+ TrustAnchor anchor =
+ new TrustAnchor((X509Certificate)selfSignedCert, null);
+
+ return Collections.singleton(anchor);
+ }
+
+ private static CertStore generateCertificateStore() throws Exception {
+ Collection entries = new HashSet();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ ByteArrayInputStream is;
+
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ Certificate cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(selfSignedCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(topCrlIssuerCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ cert = cf.generateCertificate(is);
+ entries.add(cert);
+
+ // generate CRL from CRL string
+ is = new ByteArrayInputStream(topCrlStr.getBytes());
+ Collection mixes = cf.generateCRLs(is);
+ entries.addAll(mixes);
+
+ is = new ByteArrayInputStream(subCrlStr.getBytes());
+ mixes = cf.generateCRLs(is);
+ entries.addAll(mixes);
+
+ return CertStore.getInstance("Collection",
+ new CollectionCertStoreParameters(entries));
+ }
+
+ private static X509CertSelector generateSelector(String name)
+ throws Exception {
+ X509CertSelector selector = new X509CertSelector();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream is = null;
+ if (name.equals("subca")) {
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ } else if (name.equals("subci")) {
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ } else {
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ }
+
+ X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+ byte[] extVal = target.getExtensionValue("2.5.29.14");
+ if (extVal != null) {
+ DerInputStream in = new DerInputStream(extVal);
+ byte[] subjectKID = in.getOctetString();
+ selector.setSubjectKeyIdentifier(subjectKID);
+ } else {
+ // unlikely to happen.
+ throw new Exception("unexpected certificate: no SKID extension");
+ }
+
+ return selector;
+ }
+
+ private static boolean match(String name, Certificate cert)
+ throws Exception {
+ X509CertSelector selector = new X509CertSelector();
+
+ // generate certificate from certificate string
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream is = null;
+ if (name.equals("subca")) {
+ is = new ByteArrayInputStream(subCaCertStr.getBytes());
+ } else if (name.equals("subci")) {
+ is = new ByteArrayInputStream(subCrlIssuerCertStr.getBytes());
+ } else {
+ is = new ByteArrayInputStream(targetCertStr.getBytes());
+ }
+ X509Certificate target = (X509Certificate)cf.generateCertificate(is);
+
+ return target.equals(cert);
+ }
+
+
+ public static void main(String[] args) throws Exception {
+ CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
+
+ X509CertSelector selector = generateSelector(args[0]);
+
+ Set<TrustAnchor> anchors = generateTrustAnchors();
+ CertStore certs = generateCertificateStore();
+
+
+ PKIXBuilderParameters params =
+ new PKIXBuilderParameters(anchors, selector);
+ params.addCertStore(certs);
+ params.setRevocationEnabled(true);
+ params.setDate(new Date(109, 7, 1)); // 2009-07-01
+ Security.setProperty("ocsp.enable", "false");
+ System.setProperty("com.sun.security.enableCRLDP", "true");
+
+ PKIXCertPathBuilderResult result =
+ (PKIXCertPathBuilderResult)builder.build(params);
+
+ if (!match(args[0], result.getCertPath().getCertificates().get(0))) {
+ throw new Exception("unexpected certificate");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/generate.sh Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,221 @@
+#
+# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#!/bin/ksh
+#
+# needs ksh to run the script.
+
+# generate a self-signed root certificate
+if [ ! -f root/root_cert.pem ]; then
+ if [ ! -d root ]; then
+ mkdir root
+ fi
+
+ openssl req -x509 -newkey rsa:1024 -keyout root/root_key.pem \
+ -out root/root_cert.pem -subj "/C=US/O=Example" \
+ -config openssl.cnf -reqexts cert_issuer -days 7650 \
+ -passin pass:passphrase -passout pass:passphrase
+fi
+
+# generate a sele-issued root crl issuer certificate
+if [ ! -f root/top_crlissuer_cert.pem ]; then
+ if [ ! -d root ]; then
+ mkdir root
+ fi
+
+ openssl req -newkey rsa:1024 -keyout root/top_crlissuer_key.pem \
+ -out root/top_crlissuer_req.pem -subj "/C=US/O=Example" -days 7650 \
+ -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in root/top_crlissuer_req.pem -extfile openssl.cnf \
+ -extensions crl_issuer -CA root/root_cert.pem \
+ -CAkey root/root_key.pem -out root/top_crlissuer_cert.pem \
+ -CAcreateserial -CAserial root/root_cert.srl -days 7200 \
+ -passin pass:passphrase
+fi
+
+# generate subca cert issuer and crl iuuser certificates
+if [ ! -f subca/subca_cert.pem ]; then
+ if [ ! -d subca ]; then
+ mkdir subca
+ fi
+
+ openssl req -newkey rsa:1024 -keyout subca/subca_key.pem \
+ -out subca/subca_req.pem -subj "/C=US/O=Example/OU=Class-1" \
+ -days 7650 -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in subca/subca_req.pem -extfile openssl.cnf \
+ -extensions cert_issuer -CA root/root_cert.pem \
+ -CAkey root/root_key.pem -out subca/subca_cert.pem -CAcreateserial \
+ -CAserial root/root_cert.srl -days 7200 -passin pass:passphrase
+
+ openssl req -newkey rsa:1024 -keyout subca/subca_crlissuer_key.pem \
+ -out subca/subca_crlissuer_req.pem -subj "/C=US/O=Example/OU=Class-1" \
+ -days 7650 -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in subca/subca_crlissuer_req.pem -extfile openssl.cnf \
+ -extensions crl_issuer -CA root/root_cert.pem \
+ -CAkey root/root_key.pem -out subca/subca_crlissuer_cert.pem \
+ -CAcreateserial -CAserial root/root_cert.srl -days 7200 \
+ -passin pass:passphrase
+fi
+
+# generate dumca cert issuer and crl iuuser certificates
+if [ ! -f dumca/dumca_cert.pem ]; then
+ if [ ! -d sumca ]; then
+ mkdir dumca
+ fi
+
+ openssl req -newkey rsa:1024 -keyout dumca/dumca_key.pem \
+ -out dumca/dumca_req.pem -subj "/C=US/O=Example/OU=Class-D" \
+ -days 7650 -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in dumca/dumca_req.pem -extfile openssl.cnf \
+ -extensions cert_issuer -CA root/root_cert.pem \
+ -CAkey root/root_key.pem -out dumca/dumca_cert.pem \
+ -CAcreateserial -CAserial root/root_cert.srl -days 7200 \
+ -passin pass:passphrase
+
+ openssl req -newkey rsa:1024 -keyout dumca/dumca_crlissuer_key.pem \
+ -out dumca/dumca_crlissuer_req.pem -subj "/C=US/O=Example/OU=Class-D" \
+ -days 7650 -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in dumca/dumca_crlissuer_req.pem \
+ -extfile openssl.cnf -extensions crl_issuer -CA root/root_cert.pem \
+ -CAkey root/root_key.pem -out dumca/dumca_crlissuer_cert.pem \
+ -CAcreateserial -CAserial root/root_cert.srl -days 7200 \
+ -passin pass:passphrase
+fi
+
+# generate certifiacte for Alice
+if [ ! -f subca/alice/alice_cert.pem ]; then
+ if [ ! -d subca/alice ]; then
+ mkdir -p subca/alice
+ fi
+
+ openssl req -newkey rsa:1024 -keyout subca/alice/alice_key.pem \
+ -out subca/alice/alice_req.pem \
+ -subj "/C=US/O=Example/OU=Class-1/CN=Alice" -days 7650 \
+ -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in subca/alice/alice_req.pem \
+ -extfile openssl.cnf -extensions ee_of_subca \
+ -CA subca/subca_cert.pem -CAkey subca/subca_key.pem \
+ -out subca/alice/alice_cert.pem -CAcreateserial \
+ -CAserial subca/subca_cert.srl -days 7200 -passin pass:passphrase
+fi
+
+# generate certifiacte for Bob
+if [ ! -f subca/bob/bob_cert.pem ]; then
+ if [ ! -d subca/bob ]; then
+ mkdir -p subca/bob
+ fi
+
+ openssl req -newkey rsa:1024 -keyout subca/bob/bob_key.pem \
+ -out subca/bob/bob_req.pem \
+ -subj "/C=US/O=Example/OU=Class-1/CN=Bob" -days 7650 \
+ -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in subca/bob/bob_req.pem \
+ -extfile openssl.cnf -extensions ee_of_subca \
+ -CA subca/subca_cert.pem -CAkey subca/subca_key.pem \
+ -out subca/bob/bob_cert.pem -CAcreateserial \
+ -CAserial subca/subca_cert.srl -days 7200 -passin pass:passphrase
+fi
+
+# generate certifiacte for Susan
+if [ ! -f subca/susan/susan_cert.pem ]; then
+ if [ ! -d subca/susan ]; then
+ mkdir -p subca/susan
+ fi
+
+ openssl req -newkey rsa:1024 -keyout subca/susan/susan_key.pem \
+ -out subca/susan/susan_req.pem \
+ -subj "/C=US/O=Example/OU=Class-1/CN=Susan" -days 7650 \
+ -passin pass:passphrase -passout pass:passphrase
+
+ openssl x509 -req -in subca/susan/susan_req.pem -extfile openssl.cnf \
+ -extensions ee_of_subca -CA subca/subca_cert.pem \
+ -CAkey subca/subca_key.pem -out subca/susan/susan_cert.pem \
+ -CAcreateserial -CAserial subca/subca_cert.srl -days 7200 \
+ -passin pass:passphrase
+fi
+
+
+# generate the top CRL
+if [ ! -f root/top_crl.pem ]; then
+ if [ ! -d root ]; then
+ mkdir root
+ fi
+
+ if [ ! -f root/index.txt ]; then
+ touch root/index.txt
+ echo 00 > root/crlnumber
+ fi
+
+ openssl ca -gencrl -config openssl.cnf -name ca_top -crldays 7000 \
+ -crl_reason superseded -keyfile root/top_crlissuer_key.pem \
+ -cert root/top_crlissuer_cert.pem -out root/top_crl.pem \
+ -passin pass:passphrase
+fi
+
+# revoke dumca
+openssl ca -revoke dumca/dumca_cert.pem -config openssl.cnf \
+ -name ca_top -crl_reason superseded \
+ -keyfile root/top_crlissuer_key.pem -cert root/top_crlissuer_cert.pem \
+ -passin pass:passphrase
+
+openssl ca -gencrl -config openssl.cnf -name ca_top -crldays 7000 \
+ -crl_reason superseded -keyfile root/top_crlissuer_key.pem \
+ -cert root/top_crlissuer_cert.pem -out root/top_crl.pem \
+ -passin pass:passphrase
+
+# revoke for subca
+if [ ! -f subca/subca_crl.pem ]; then
+ if [ ! -d subca ]; then
+ mkdir subca
+ fi
+
+ if [ ! -f subca/index.txt ]; then
+ touch subca/index.txt
+ echo 00 > subca/crlnumber
+ fi
+
+ openssl ca -gencrl -config openssl.cnf -name ca_subca -crldays 7000 \
+ -crl_reason superseded -keyfile subca/subca_crlissuer_key.pem \
+ -cert subca/subca_crlissuer_cert.pem -out subca/subca_crl.pem \
+ -passin pass:passphrase
+fi
+
+# revoke susan
+openssl ca -revoke subca/susan/susan_cert.pem -config openssl.cnf \
+ -name ca_subca -crl_reason superseded \
+ -keyfile subca/subca_crlissuer_key.pem \
+ -cert subca/subca_crlissuer_cert.pem -passin pass:passphrase
+
+openssl ca -gencrl -config openssl.cnf -name ca_subca -crldays 7000 \
+ -crl_reason superseded -keyfile subca/subca_crlissuer_key.pem \
+ -cert subca/subca_crlissuer_cert.pem -out subca/subca_crl.pem \
+ -passin pass:passphrase
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,205 @@
+#
+# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#
+# OpenSSL configuration file.
+#
+
+HOME = .
+RANDFILE = $ENV::HOME/.rnd
+
+[ ca ]
+default_ca = CA_default
+
+[ CA_default ]
+dir = ./top
+certs = $dir/certs
+crl_dir = $dir/crl
+database = $dir/index.txt
+unique_subject = no
+new_certs_dir = $dir/newcerts
+certificate = $dir/cacert.pem
+serial = $dir/serial
+crlnumber = $dir/crlnumber
+crl = $dir/crl.pem
+private_key = $dir/private/cakey.pem
+RANDFILE = $dir/private/.rand
+x509_extensions = v3_ca
+
+name_opt = ca_default
+cert_opt = ca_default
+
+default_days = 7650
+default_crl_days = 30
+default_md = sha1
+preserve = no
+
+policy = policy_anything
+
+[ ca_top ]
+dir = ./root
+certs = $dir/certs
+crl_dir = $dir/crl
+database = $dir/index.txt
+unique_subject = no
+new_certs_dir = $dir/newcerts
+certificate = $dir/cacert.pem
+serial = $dir/serial
+crlnumber = $dir/crlnumber
+crl = $dir/crl.pem
+private_key = $dir/private/cakey.pem
+RANDFILE = $dir/private/.rand
+
+x509_extensions = v3_ca
+
+name_opt = ca_default
+cert_opt = ca_default
+
+default_days = 7650
+default_crl_days = 30
+default_md = sha1
+preserve = no
+
+policy = policy_anything
+
+[ ca_subca ]
+dir = ./subca
+certs = $dir/certs
+crl_dir = $dir/crl
+database = $dir/index.txt
+unique_subject = no
+new_certs_dir = $dir/newcerts
+
+certificate = $dir/cacert.pem
+serial = $dir/serial
+crlnumber = $dir/crlnumber
+crl = $dir/crl.pem
+private_key = $dir/private/cakey.pem
+RANDFILE = $dir/private/.rand
+
+x509_extensions = usr_cert
+
+name_opt = ca_default
+cert_opt = ca_default
+
+default_days = 7650
+default_crl_days = 30
+default_md = sha1
+preserve = no
+
+policy = policy_anything
+
+[ policy_match ]
+countryName = match
+stateOrProvinceName = match
+organizationName = match
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
+
+[ policy_anything ]
+countryName = optional
+stateOrProvinceName = optional
+localityName = optional
+organizationName = optional
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
+
+[ req ]
+default_bits = 1024
+default_keyfile = privkey.pem
+distinguished_name = req_distinguished_name
+attributes = req_attributes
+x509_extensions = v3_ca
+
+string_mask = nombstr
+
+[ req_distinguished_name ]
+countryName = Country Name (2 letter code)
+countryName_default = NO
+countryName_min = 2
+countryName_max = 2
+
+stateOrProvinceName = State or Province Name (full name)
+stateOrProvinceName_default = A-State
+
+localityName = Locality Name (eg, city)
+
+0.organizationName = Organization Name (eg, company)
+0.organizationName_default = Internet Widgits Pty Ltd
+
+organizationalUnitName = Organizational Unit Name (eg, section)
+
+commonName = Common Name (eg, YOUR name)
+commonName_max = 64
+
+emailAddress = Email Address
+emailAddress_max = 64
+
+[ req_attributes ]
+challengePassword = A challenge password
+challengePassword_min = 4
+challengePassword_max = 20
+unstructuredName = An optional company name
+
+[ usr_cert ]
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+
+[ v3_req ]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+subjectAltName = email:example@openjdk.net, RID:1.2.3.4:true
+
+[ v3_ca ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+basicConstraints = critical,CA:true
+keyUsage = keyCertSign, cRLSign
+
+[ cert_issuer ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+basicConstraints = critical,CA:true
+keyUsage = keyCertSign, cRLSign
+
+[ crl_issuer ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+basicConstraints = critical,CA:true
+keyUsage = keyCertSign, cRLSign
+
+
+[ crl_ext ]
+authorityKeyIdentifier = keyid:always,issuer:always
+
+[ ee_of_subca ]
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment, keyAgreement
+
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/ConfPlusProp.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * @test
+ * @bug 6857795
+ * @summary krb5.conf ignored if system properties on realm and kdc are provided
+ */
+
+import sun.security.krb5.Config;
+import sun.security.krb5.KrbException;
+
+public class ConfPlusProp {
+ public static void main(String[] args) throws Exception {
+ System.setProperty("java.security.krb5.realm", "R2");
+ System.setProperty("java.security.krb5.kdc", "k2");
+
+ // Point to a file with existing default_realm
+ System.setProperty("java.security.krb5.conf",
+ System.getProperty("test.src", ".") +"/confplusprop.conf");
+ Config config = Config.getInstance();
+
+ if (!config.getDefaultRealm().equals("R2")) {
+ throw new Exception("Default realm error");
+ }
+ if (!config.getKDCList("R1").equals("k1")) {
+ throw new Exception("R1 kdc error");
+ }
+ if (!config.getKDCList("R2").equals("k2")) {
+ throw new Exception("R2 kdc error");
+ }
+ if (!config.getDefault("forwardable", "libdefaults").equals("well")) {
+ throw new Exception("Extra config error");
+ }
+
+ // Point to a file with no libdefaults
+ System.setProperty("java.security.krb5.conf",
+ System.getProperty("test.src", ".") +"/confplusprop2.conf");
+ Config.refresh();
+
+ config = Config.getInstance();
+
+ if (!config.getDefaultRealm().equals("R2")) {
+ throw new Exception("Default realm error again");
+ }
+ if (!config.getKDCList("R1").equals("k12")) {
+ throw new Exception("R1 kdc error");
+ }
+ if (!config.getKDCList("R2").equals("k2")) {
+ throw new Exception("R2 kdc error");
+ }
+
+ // Point to a non-existing file
+ System.setProperty("java.security.krb5.conf", "i-am-not-a file");
+ Config.refresh();
+
+ config = Config.getInstance();
+
+ if (!config.getDefaultRealm().equals("R2")) {
+ throw new Exception("Default realm error");
+ }
+ try {
+ config.getKDCList("R1");
+ throw new Exception("R1 is nowhere");
+ } catch (KrbException ke) {
+ // OK
+ }
+ if (!config.getKDCList("R2").equals("k2")) {
+ throw new Exception("R2 kdc error");
+ }
+ if (config.getDefault("forwardable", "libdefaults") != null) {
+ throw new Exception("Extra config error");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6857802
+ * @summary GSS getRemainingInitLifetime method returns milliseconds not seconds
+ */
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSManager;
+
+public class LifeTimeInSeconds {
+ public static void main(String[] args) throws Exception {
+ new OneKDC(null).writeJAASConf();
+ System.setProperty("javax.security.auth.useSubjectCredsOnly", "false");
+
+ GSSManager gm = GSSManager.getInstance();
+ GSSCredential cred = gm.createCredential(GSSCredential.INITIATE_AND_ACCEPT);
+ int time = cred.getRemainingLifetime();
+ int time2 = cred.getRemainingInitLifetime(null);
+ // The test KDC issues a TGT with a default lifetime of 11 hours
+ int elevenhrs = 11*3600;
+ if (time > elevenhrs+60 || time < elevenhrs-60) {
+ throw new Exception("getRemainingLifetime returns wrong value.");
+ }
+ if (time2 > elevenhrs+60 || time2 < elevenhrs-60) {
+ throw new Exception("getRemainingInitLifetime returns wrong value.");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/confplusprop.conf Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,11 @@
+[libdefaults]
+default_realm = R1
+forwardable = well
+
+[realms]
+R1 = {
+ kdc = k1
+}
+R2 = {
+ kdc = old
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/confplusprop2.conf Thu Jul 30 12:25:39 2009 -0700
@@ -0,0 +1,7 @@
+[realms]
+R1 = {
+ kdc = k12
+}
+R2 = {
+ kdc = old
+}
--- a/jdk/test/tools/jar/index/MetaInf.java Wed Jul 22 15:52:41 2009 +0200
+++ b/jdk/test/tools/jar/index/MetaInf.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,13 +23,15 @@
/*
* @test
- * @bug 4408526
+ * @bug 4408526 6854795
* @summary Index the non-meta files in META-INF, such as META-INF/services.
*/
import java.io.*;
+import java.util.Arrays;
import java.util.jar.*;
import sun.tools.jar.Main;
+import java.util.zip.ZipFile;
public class MetaInf {
@@ -39,29 +41,51 @@
static String contents =
System.getProperty("test.src") + File.separatorChar + "jarcontents";
- // Options passed to "jar" command.
- static String[] jarArgs1 = new String[] {
- "cf", jarName, "-C", contents, SERVICES
- };
- static String[] jarArgs2 = new String[] {
- "i", jarName
- };
+ static void run(String ... args) {
+ if (! new Main(System.out, System.err, "jar").run(args))
+ throw new Error("jar failed: args=" + Arrays.toString(args));
+ }
- public static void main(String[] args) throws IOException {
+ static void copy(File from, File to) throws IOException {
+ FileInputStream in = new FileInputStream(from);
+ FileOutputStream out = new FileOutputStream(to);
+ try {
+ byte[] buf = new byte[8192];
+ int n;
+ while ((n = in.read(buf)) != -1)
+ out.write(buf, 0, n);
+ } finally {
+ in.close();
+ out.close();
+ }
+ }
+
+ static boolean contains(File jarFile, String entryName)
+ throws IOException {
+ return new ZipFile(jarFile).getEntry(entryName) != null;
+ }
+
+ static void checkContains(File jarFile, String entryName)
+ throws IOException {
+ if (! contains(jarFile, entryName))
+ throw new Error(String.format("expected jar %s to contain %s",
+ jarFile, entryName));
+ }
+
+ static void testIndex(String jarName) throws IOException {
+ System.err.printf("jarName=%s%n", jarName);
+
+ File jar = new File(jarName);
// Create a jar to be indexed.
- Main jarTool = new Main(System.out, System.err, "jar");
- if (!jarTool.run(jarArgs1)) {
- throw new Error("Could not create jar file.");
+ run("cf", jarName, "-C", contents, SERVICES);
+
+ for (int i = 0; i < 2; i++) {
+ run("i", jarName);
+ checkContains(jar, INDEX);
+ checkContains(jar, SERVICES);
}
- // Index the jar.
- jarTool = new Main(System.out, System.err, "jar");
- if (!jarTool.run(jarArgs2)) {
- throw new Error("Could not index jar file.");
- }
-
- // Read the index. Verify that META-INF/services is indexed.
JarFile f = new JarFile(jarName);
BufferedReader index =
new BufferedReader(
@@ -75,4 +99,17 @@
}
throw new Error(SERVICES + " not indexed.");
}
+
+ public static void main(String[] args) throws IOException {
+ testIndex("a.jar"); // a path with parent == null
+ testIndex("./a.zip"); // a path with parent != null
+
+ // Try indexing a jar in the default temp directory.
+ File tmpFile = File.createTempFile("MetaInf", null, null);
+ try {
+ testIndex(tmpFile.getPath());
+ } finally {
+ tmpFile.delete();
+ }
+ }
}
--- a/langtools/.hgtags Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/.hgtags Thu Jul 30 12:25:39 2009 -0700
@@ -38,3 +38,6 @@
522520757dd34321b27a7145ecbd24ac4fb64f34 jdk7-b61
6855e5aa3348f185fe5b443ee43a1b00ec5d390e jdk7-b62
5c2c8112055565b4980b6756e001e45eb7b88d6e jdk7-b63
+d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64
+7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65
+634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/legacy.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/langtools/test/tools/javac/typeAnnotations/failures/OldArray.java Wed Jul 22 15:52:41 2009 +0200
+++ b/langtools/test/tools/javac/typeAnnotations/failures/OldArray.java Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
--- a/make/deploy-rules.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/make/deploy-rules.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/make/jprt.properties Wed Jul 22 15:52:41 2009 +0200
+++ b/make/jprt.properties Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
--- a/make/sanity-rules.gmk Wed Jul 22 15:52:41 2009 +0200
+++ b/make/sanity-rules.gmk Thu Jul 30 12:25:39 2009 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it