# HG changeset patch
# User cfang
# Date 1255734852 25200
# Node ID 71fdc5052e49b700b1b73cd62e82a83d9f0ac5d5
# Parent  e715b51789d8e19853630f12ea8880f33710e116# Parent  0a46d0c5dccbee219e2715f8d9842ff1a86bdc92
Merge

diff -r 0a46d0c5dccb -r 71fdc5052e49 .hgtags
--- a/.hgtags	Thu Oct 15 11:47:13 2009 -0700
+++ b/.hgtags	Fri Oct 16 16:14:12 2009 -0700
@@ -45,3 +45,6 @@
 d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
 54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69
 0632c3e615a315ff11e2ab1d64f4d82ff9853461 jdk7-b70
+50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71
+a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72
+faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
diff -r 0a46d0c5dccb -r 71fdc5052e49 agent/make/saenv.sh
--- a/agent/make/saenv.sh	Thu Oct 15 11:47:13 2009 -0700
+++ b/agent/make/saenv.sh	Fri Oct 16 16:14:12 2009 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 agent/make/saenv64.sh
--- a/agent/make/saenv64.sh	Thu Oct 15 11:47:13 2009 -0700
+++ b/agent/make/saenv64.sh	Fri Oct 16 16:14:12 2009 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 agent/src/os/solaris/proc/Makefile
--- a/agent/src/os/solaris/proc/Makefile	Thu Oct 15 11:47:13 2009 -0700
+++ b/agent/src/os/solaris/proc/Makefile	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 agent/src/os/solaris/proc/mapfile
--- a/agent/src/os/solaris/proc/mapfile	Thu Oct 15 11:47:13 2009 -0700
+++ b/agent/src/os/solaris/proc/mapfile	Fri Oct 16 16:14:12 2009 -0700
@@ -1,7 +1,7 @@
 #
 
 #
-# 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Thu Oct 15 11:47:13 2009 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java	Thu Oct 15 11:47:13 2009 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 make/hotspot_version
--- a/make/hotspot_version	Thu Oct 15 11:47:13 2009 -0700
+++ b/make/hotspot_version	Fri Oct 16 16:14:12 2009 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=03
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Fri Oct 16 16:14:12 2009 -0700
@@ -668,7 +668,7 @@
   __ add(obj.result(), offset.result(), addr);
 
   if (type == objectType) {  // Write-barrier needed for Object fields.
-    pre_barrier(obj.result(), false, NULL);
+    pre_barrier(addr, false, NULL);
   }
 
   if (type == objectType)
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
--- a/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
--- a/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
--- a/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/c1/c1_IR.cpp
--- a/src/share/vm/c1/c1_IR.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/c1/c1_IR.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/c1/c1_IR.hpp
--- a/src/share/vm/c1/c1_IR.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/c1/c1_IR.hpp	Fri Oct 16 16:14:12 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/c1/c1_LIRAssembler.cpp
--- a/src/share/vm/c1/c1_LIRAssembler.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/c1/c1_LIRAssembler.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/ci/ciObjectFactory.cpp
--- a/src/share/vm/ci/ciObjectFactory.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/ci/ciObjectFactory.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/classfile/classLoader.hpp
--- a/src/share/vm/classfile/classLoader.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/classfile/classLoader.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/code/debugInfoRec.hpp
--- a/src/share/vm/code/debugInfoRec.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/code/debugInfoRec.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/code/nmethod.hpp
--- a/src/share/vm/code/nmethod.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/code/nmethod.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/compiler/oopMap.cpp
--- a/src/share/vm/compiler/oopMap.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/compiler/oopMap.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/compiler/oopMap.hpp
--- a/src/share/vm/compiler/oopMap.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/compiler/oopMap.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
--- a/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/shared/markSweep.cpp
--- a/src/share/vm/gc_implementation/shared/markSweep.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/shared/markSweep.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/gc_implementation/shared/markSweep.hpp
--- a/src/share/vm/gc_implementation/shared/markSweep.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/gc_implementation/shared/markSweep.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/memory/genMarkSweep.cpp
--- a/src/share/vm/memory/genMarkSweep.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/memory/genMarkSweep.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/memory/iterator.cpp
--- a/src/share/vm/memory/iterator.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/memory/iterator.cpp	Fri Oct 16 16:14:12 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2001 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/memory/iterator.hpp
--- a/src/share/vm/memory/iterator.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/memory/iterator.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/memory/serialize.cpp
--- a/src/share/vm/memory/serialize.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/memory/serialize.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/oops/arrayKlass.cpp
--- a/src/share/vm/oops/arrayKlass.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/oops/arrayKlass.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/oops/instanceKlassKlass.hpp
--- a/src/share/vm/oops/instanceKlassKlass.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/oops/instanceKlassKlass.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/oops/instanceRefKlass.cpp
--- a/src/share/vm/oops/instanceRefKlass.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/oops/instanceRefKlass.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/oops/methodDataOop.hpp
--- a/src/share/vm/oops/methodDataOop.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/oops/methodDataOop.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/oops/objArrayOop.hpp
--- a/src/share/vm/oops/objArrayOop.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/oops/objArrayOop.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/compile.hpp
--- a/src/share/vm/opto/compile.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/compile.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/idealKit.cpp
--- a/src/share/vm/opto/idealKit.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/idealKit.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/idealKit.hpp
--- a/src/share/vm/opto/idealKit.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/idealKit.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/ifnode.cpp
--- a/src/share/vm/opto/ifnode.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/ifnode.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/phaseX.cpp
--- a/src/share/vm/opto/phaseX.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/phaseX.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/phaseX.hpp
--- a/src/share/vm/opto/phaseX.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/phaseX.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/opto/postaloc.cpp
--- a/src/share/vm/opto/postaloc.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/opto/postaloc.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/prims/jvm.h
--- a/src/share/vm/prims/jvm.h	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/prims/jvm.h	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/runtime/atomic.hpp
--- a/src/share/vm/runtime/atomic.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/runtime/atomic.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/runtime/perfData.hpp
--- a/src/share/vm/runtime/perfData.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/runtime/perfData.hpp	Fri Oct 16 16:14:12 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/runtime/safepoint.cpp
--- a/src/share/vm/runtime/safepoint.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/runtime/safepoint.cpp	Fri Oct 16 16:14:12 2009 -0700
@@ -81,6 +81,14 @@
   jlong safepoint_limit_time;
   timeout_error_printed = false;
 
+  // PrintSafepointStatisticsTimeout can be specified separately. When
+  // specified, PrintSafepointStatistics will be set to true in
+  // deferred_initialize_stat method. The initialization has to be done
+  // early enough to avoid any races. See bug 6880029 for details.
+  if (PrintSafepointStatistics || PrintSafepointStatisticsTimeout > 0) {
+    deferred_initialize_stat();
+  }
+
   // Begin the process of bringing the system to a safepoint.
   // Java threads can be in several different states and are
   // stopped by different mechanisms:
@@ -169,8 +177,7 @@
       }
     }
 
-    if ( (PrintSafepointStatistics || (PrintSafepointStatisticsTimeout > 0))
-         && iterations == 0) {
+    if (PrintSafepointStatistics && iterations == 0) {
       begin_statistics(nof_threads, still_running);
     }
 
@@ -1026,8 +1033,7 @@
 }
 
 void SafepointSynchronize::begin_statistics(int nof_threads, int nof_running) {
-  deferred_initialize_stat();
-
+  assert(init_done, "safepoint statistics array hasn't been initialized");
   SafepointStats *spstat = &_safepoint_stats[_cur_stat_index];
 
   VM_Operation *op = VMThread::vm_operation();
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/runtime/sweeper.cpp
--- a/src/share/vm/runtime/sweeper.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/runtime/sweeper.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/runtime/vframeArray.hpp
--- a/src/share/vm/runtime/vframeArray.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/runtime/vframeArray.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/runtime/vframe_hp.hpp
--- a/src/share/vm/runtime/vframe_hp.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/runtime/vframe_hp.hpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/services/threadService.cpp
--- a/src/share/vm/services/threadService.cpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/services/threadService.cpp	Fri Oct 16 16:14:12 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
diff -r 0a46d0c5dccb -r 71fdc5052e49 src/share/vm/services/threadService.hpp
--- a/src/share/vm/services/threadService.hpp	Thu Oct 15 11:47:13 2009 -0700
+++ b/src/share/vm/services/threadService.hpp	Fri Oct 16 16:14:12 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