# HG changeset patch
# User coleenp
# Date 1231529947 18000
# Node ID fc7ab6287598874e544d40e03c3acb3869f796f8
# Parent  a0401dc51d0b4fe9a92e76810936a41d2387ef9e# Parent  1a767c61ad016baf553fac7082613f3b2b7d881f
Merge

diff -r a0401dc51d0b -r fc7ab6287598 .hgtags
--- a/.hgtags	Thu Jan 08 16:27:28 2009 -0500
+++ b/.hgtags	Fri Jan 09 14:39:07 2009 -0500
@@ -16,3 +16,4 @@
 49ca90d77f34571b0757ebfcb8a7848ef2696b88 jdk7-b39
 81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40
 f9d938ede1960d18cb7cf23c645b026519c1a678 jdk7-b41
+ad8c8ca4ab0f4c86e74c061958f44a8f4a930f2c jdk7-b42
diff -r a0401dc51d0b -r fc7ab6287598 make/hotspot_version
--- a/make/hotspot_version	Thu Jan 08 16:27:28 2009 -0500
+++ b/make/hotspot_version	Fri Jan 09 14:39:07 2009 -0500
@@ -33,9 +33,9 @@
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_COPYRIGHT=Copyright 2008
 
-HS_MAJOR_VER=14
+HS_MAJOR_VER=15
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=09
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff -r a0401dc51d0b -r fc7ab6287598 src/cpu/x86/vm/vm_version_x86_32.hpp
--- a/src/cpu/x86/vm/vm_version_x86_32.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/cpu/x86/vm/vm_version_x86_32.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/cpu/x86/vm/vm_version_x86_64.hpp
--- a/src/cpu/x86/vm/vm_version_x86_64.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/cpu/x86/vm/vm_version_x86_64.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/linux/launcher/java.c
--- a/src/os/linux/launcher/java.c	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/linux/launcher/java.c	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/linux/launcher/java.h
--- a/src/os/linux/launcher/java.h	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/linux/launcher/java.h	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/linux/launcher/java_md.c
--- a/src/os/linux/launcher/java_md.c	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/linux/launcher/java_md.c	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/linux/vm/globals_linux.hpp
--- a/src/os/linux/vm/globals_linux.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/linux/vm/globals_linux.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/linux/vm/os_linux.cpp
--- a/src/os/linux/vm/os_linux.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/linux/vm/os_linux.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -279,7 +279,11 @@
  *        ...
  *        7: The default directories, normally /lib and /usr/lib.
  */
+#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
+#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
+#else
 #define DEFAULT_LIBPATH "/lib:/usr/lib"
+#endif
 
 #define EXTENSIONS_DIR  "/lib/ext"
 #define ENDORSED_DIR    "/lib/endorsed"
diff -r a0401dc51d0b -r fc7ab6287598 src/os/solaris/launcher/java.c
--- a/src/os/solaris/launcher/java.c	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/solaris/launcher/java.c	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/solaris/launcher/java.h
--- a/src/os/solaris/launcher/java.h	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/solaris/launcher/java.h	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/solaris/launcher/java_md.c
--- a/src/os/solaris/launcher/java_md.c	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/solaris/launcher/java_md.c	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/solaris/vm/globals_solaris.hpp
--- a/src/os/solaris/vm/globals_solaris.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/solaris/vm/globals_solaris.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/windows/vm/globals_windows.hpp
--- a/src/os/windows/vm/globals_windows.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/windows/vm/globals_windows.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os/windows/vm/os_windows.hpp
--- a/src/os/windows/vm/os_windows.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os/windows/vm/os_windows.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/os_cpu/linux_x86/vm/linux_x86_32.ad
--- a/src/os_cpu/linux_x86/vm/linux_x86_32.ad	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/os_cpu/linux_x86/vm/linux_x86_32.ad	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 //
-// Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
 // 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 a0401dc51d0b -r fc7ab6287598 src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java
--- a/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java
--- a/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java
--- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java
--- a/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java
--- a/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/adlc/adlparse.cpp
--- a/src/share/vm/adlc/adlparse.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/adlc/adlparse.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/adlc/adlparse.hpp
--- a/src/share/vm/adlc/adlparse.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/adlc/adlparse.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/adlc/filebuff.cpp
--- a/src/share/vm/adlc/filebuff.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/adlc/filebuff.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/adlc/filebuff.hpp
--- a/src/share/vm/adlc/filebuff.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/adlc/filebuff.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/adlc/formssel.hpp
--- a/src/share/vm/adlc/formssel.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/adlc/formssel.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/c1/c1_GraphBuilder.cpp
--- a/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/c1/c1_GraphBuilder.hpp
--- a/src/share/vm/c1/c1_GraphBuilder.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/c1/c1_GraphBuilder.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/c1/c1_IR.cpp
--- a/src/share/vm/c1/c1_IR.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/c1/c1_IR.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/c1/c1_ValueMap.hpp
--- a/src/share/vm/c1/c1_ValueMap.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/c1/c1_ValueMap.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/ci/ciEnv.cpp
--- a/src/share/vm/ci/ciEnv.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/ci/ciEnv.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/ci/ciTypeFlow.cpp
--- a/src/share/vm/ci/ciTypeFlow.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/ci/ciTypeFlow.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/classfile/classFileParser.hpp
--- a/src/share/vm/classfile/classFileParser.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/classfile/classFileParser.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
--- a/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
--- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
--- a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/heapRegion.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegion.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/heapRegion.hpp
--- a/src/share/vm/gc_implementation/g1/heapRegion.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/heapRegionSeq.cpp
--- a/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/heapRegionSeq.hpp
--- a/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/ptrQueue.cpp
--- a/src/share/vm/gc_implementation/g1/ptrQueue.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/ptrQueue.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/g1/ptrQueue.hpp
--- a/src/share/vm/gc_implementation/g1/ptrQueue.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/g1/ptrQueue.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/includeDB_gc_g1
--- a/src/share/vm/gc_implementation/includeDB_gc_g1	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/includeDB_gc_g1	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 //
-// Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
+// Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
 // 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
--- a/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/interpreter/bytecodeStream.cpp
--- a/src/share/vm/interpreter/bytecodeStream.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/interpreter/bytecodeStream.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/interpreter/bytecodes.cpp
--- a/src/share/vm/interpreter/bytecodes.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/interpreter/bytecodes.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/interpreter/bytecodes.hpp
--- a/src/share/vm/interpreter/bytecodes.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/interpreter/bytecodes.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/memory/referencePolicy.cpp
--- a/src/share/vm/memory/referencePolicy.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/memory/referencePolicy.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/memory/referencePolicy.hpp
--- a/src/share/vm/memory/referencePolicy.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/memory/referencePolicy.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/memory/tenuredGeneration.hpp
--- a/src/share/vm/memory/tenuredGeneration.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/memory/tenuredGeneration.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/oops/constantPoolOop.cpp
--- a/src/share/vm/oops/constantPoolOop.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/oops/constantPoolOop.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/opto/block.hpp
--- a/src/share/vm/opto/block.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/opto/block.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/opto/phase.cpp
--- a/src/share/vm/opto/phase.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/opto/phase.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/opto/phase.hpp
--- a/src/share/vm/opto/phase.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/opto/phase.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/prims/jniCheck.cpp
--- a/src/share/vm/prims/jniCheck.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/prims/jniCheck.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/prims/jniCheck.hpp
--- a/src/share/vm/prims/jniCheck.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/prims/jniCheck.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/prims/jvmtiEnvBase.cpp
--- a/src/share/vm/prims/jvmtiEnvBase.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/prims/jvmtiEnvBase.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/prims/jvmtiTrace.cpp
--- a/src/share/vm/prims/jvmtiTrace.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/prims/jvmtiTrace.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/runtime/javaCalls.cpp
--- a/src/share/vm/runtime/javaCalls.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/runtime/javaCalls.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/runtime/javaCalls.hpp
--- a/src/share/vm/runtime/javaCalls.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/runtime/javaCalls.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/runtime/perfMemory.cpp
--- a/src/share/vm/runtime/perfMemory.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/runtime/perfMemory.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/runtime/perfMemory.hpp
--- a/src/share/vm/runtime/perfMemory.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/runtime/perfMemory.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -192,64 +192,46 @@
 
 
 JRT_LEAF(jint, SharedRuntime::f2i(jfloat  x))
-  if (g_isnan(x)) {return 0;}
-  jlong lltmp = (jlong)x;
-  jint ltmp   = (jint)lltmp;
-  if (ltmp == lltmp) {
-    return ltmp;
-  } else {
-    if (x < 0) {
-      return min_jint;
-    } else {
-      return max_jint;
-    }
-  }
+  if (g_isnan(x))
+    return 0;
+  if (x >= (jfloat) max_jint)
+    return max_jint;
+  if (x <= (jfloat) min_jint)
+    return min_jint;
+  return (jint) x;
 JRT_END
 
 
 JRT_LEAF(jlong, SharedRuntime::f2l(jfloat  x))
-  if (g_isnan(x)) {return 0;}
-  jlong lltmp = (jlong)x;
-  if (lltmp != min_jlong) {
-    return lltmp;
-  } else {
-    if (x < 0) {
-      return min_jlong;
-    } else {
-      return max_jlong;
-    }
-  }
+  if (g_isnan(x))
+    return 0;
+  if (x >= (jfloat) max_jlong)
+    return max_jlong;
+  if (x <= (jfloat) min_jlong)
+    return min_jlong;
+  return (jlong) x;
 JRT_END
 
 
 JRT_LEAF(jint, SharedRuntime::d2i(jdouble x))
-  if (g_isnan(x)) {return 0;}
-  jlong lltmp = (jlong)x;
-  jint ltmp   = (jint)lltmp;
-  if (ltmp == lltmp) {
-    return ltmp;
-  } else {
-    if (x < 0) {
-      return min_jint;
-    } else {
-      return max_jint;
-    }
-  }
+  if (g_isnan(x))
+    return 0;
+  if (x >= (jdouble) max_jint)
+    return max_jint;
+  if (x <= (jdouble) min_jint)
+    return min_jint;
+  return (jint) x;
 JRT_END
 
 
 JRT_LEAF(jlong, SharedRuntime::d2l(jdouble x))
-  if (g_isnan(x)) {return 0;}
-  jlong lltmp = (jlong)x;
-  if (lltmp != min_jlong) {
-    return lltmp;
-  } else {
-    if (x < 0) {
-      return min_jlong;
-    } else {
-      return max_jlong;
-    }
-  }
+  if (g_isnan(x))
+    return 0;
+  if (x >= (jdouble) max_jlong)
+    return max_jlong;
+  if (x <= (jdouble) min_jlong)
+    return min_jlong;
+  return (jlong) x;
 JRT_END
 
 
diff -r a0401dc51d0b -r fc7ab6287598 src/share/vm/runtime/thread.hpp
--- a/src/share/vm/runtime/thread.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/runtime/thread.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/services/threadService.hpp
--- a/src/share/vm/services/threadService.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/services/threadService.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/utilities/array.hpp
--- a/src/share/vm/utilities/array.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/utilities/array.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/utilities/constantTag.hpp
--- a/src/share/vm/utilities/constantTag.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/utilities/constantTag.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/utilities/growableArray.hpp
--- a/src/share/vm/utilities/growableArray.hpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/utilities/growableArray.hpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/utilities/hashtable.cpp
--- a/src/share/vm/utilities/hashtable.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/utilities/hashtable.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 src/share/vm/utilities/taskqueue.cpp
--- a/src/share/vm/utilities/taskqueue.cpp	Thu Jan 08 16:27:28 2009 -0500
+++ b/src/share/vm/utilities/taskqueue.cpp	Fri Jan 09 14:39:07 2009 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
  * 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 a0401dc51d0b -r fc7ab6287598 test/compiler/6778657/Test.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/compiler/6778657/Test.java	Fri Jan 09 14:39:07 2009 -0500
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * 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 6778657
+ * @summary Casts in SharedRuntime::f2i, f2l, d2i and d2l rely on undefined C++ behaviour
+ */
+
+public class Test {
+  public static void check_f2i(int expect) {
+    float check = expect;
+    check *= 2;
+    int actual = (int) check;
+    if (actual != expect)
+      throw new RuntimeException("expecting " + expect + ", got " + actual);
+  }
+
+  public static void check_f2l(long expect) {
+    float check = expect;
+    check *= 2;
+    long actual = (long) check;
+    if (actual != expect)
+      throw new RuntimeException("expecting " + expect + ", got " + actual);
+  }
+
+  public static void check_d2i(int expect) {
+    double check = expect;
+    check *= 2;
+    int actual = (int) check;
+    if (actual != expect)
+      throw new RuntimeException("expecting " + expect + ", got " + actual);
+  }
+
+  public static void check_d2l(long expect) {
+    double check = expect;
+    check *= 2;
+    long actual = (long) check;
+    if (actual != expect)
+      throw new RuntimeException("expecting " + expect + ", got " + actual);
+  }
+
+  public static void main(String[] args) {
+    check_f2i(Integer.MAX_VALUE);
+    check_f2i(Integer.MIN_VALUE);
+    check_f2l(Long.MAX_VALUE);
+    check_f2l(Long.MIN_VALUE);
+    check_d2i(Integer.MAX_VALUE);
+    check_d2i(Integer.MIN_VALUE);
+    check_d2l(Long.MAX_VALUE);
+    check_d2l(Long.MIN_VALUE);
+  }
+}
+