--- a/.hgtags	Wed Sep 14 13:57:32 2011 -0700
+++ b/.hgtags	Thu Sep 15 12:44:09 2011 -0700
@@ -177,7 +177,9 @@
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
+0fa3ace511fe98fe948e751531f3e2b7c60c8376 jdk8-b04
 0cc8a70952c368e06de2adab1f2649a408f5e577 hs22-b01
 7c29742c41b44fb0cd5a13c7ac8834f3f2ca649e hs22-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 hs22-b03
 ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04
+513a84dd0f8b56dc0836b4e0bdd5dd0a778fc634 hs22-b05

--- a/make/hotspot_version	Wed Sep 14 13:57:32 2011 -0700
+++ b/make/hotspot_version	Thu Sep 15 12:44:09 2011 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=22
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8

--- a/make/solaris/makefiles/sparcWorks.make	Wed Sep 14 13:57:32 2011 -0700
+++ b/make/solaris/makefiles/sparcWorks.make	Thu Sep 15 12:44:09 2011 -0700
@@ -148,6 +148,9 @@
 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
 CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
 
+# Compiler warnings are treated as errors
+CFLAGS_WARN = -xwe
+
 ################################################
 # Begin current (>=5.9) Forte compiler options #
 #################################################

--- a/src/os/windows/vm/os_windows.cpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/os/windows/vm/os_windows.cpp	Thu Sep 15 12:44:09 2011 -0700
@@ -2644,7 +2644,7 @@
     ULONG highest_node_number;
     if (!os::Kernel32Dll::GetNumaHighestNodeNumber(&highest_node_number)) return false;
     free_node_list();
-    _numa_used_node_list = NEW_C_HEAP_ARRAY(int, highest_node_number);
+    _numa_used_node_list = NEW_C_HEAP_ARRAY(int, highest_node_number + 1);
     for (unsigned int i = 0; i <= highest_node_number; i++) {
       ULONGLONG proc_mask_numa_node;
       if (!os::Kernel32Dll::GetNumaNodeProcessorMask(i, &proc_mask_numa_node)) return false;

--- a/src/share/vm/classfile/javaClasses.cpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/share/vm/classfile/javaClasses.cpp	Thu Sep 15 12:44:09 2011 -0700
@@ -2694,7 +2694,7 @@
     instanceKlass* ik = instanceKlass::cast(k);
     methodOop m_normal   = ik->lookup_method(vmSymbols::setTargetNormal_name(),   vmSymbols::setTarget_signature());
     methodOop m_volatile = ik->lookup_method(vmSymbols::setTargetVolatile_name(), vmSymbols::setTarget_signature());
-    guarantee(m_normal && m_volatile, "must exist");
+    guarantee(m_normal != NULL && m_volatile != NULL, "must exist");
     m_normal->set_not_compilable_quietly();
     m_volatile->set_not_compilable_quietly();
   }

--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Thu Sep 15 12:44:09 2011 -0700
@@ -3042,10 +3042,10 @@
             should_continue = false;
           }
         } else {
-          if (_collection_set_size < _young_list_fixed_length) {
+          if (_collection_set_size >= _young_list_fixed_length) {
             ergo_verbose2(ErgoCSetConstruction,
                           "stop adding old regions to CSet",
-                          ergo_format_reason("CSet length lower than target")
+                          ergo_format_reason("CSet length reached target")
                           ergo_format_region("CSet")
                           ergo_format_region("young target"),
                           _collection_set_size, _young_list_fixed_length);

--- a/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp	Thu Sep 15 12:44:09 2011 -0700
@@ -58,7 +58,7 @@
   // ErgoLow is 0 so that we don't have to explicitly or a heuristic
   // id with ErgoLow to keep its use simpler.
   ErgoLow = 0,
-  ErgoHigh = 1 << ErgoLevelShift,
+  ErgoHigh = 1 << ErgoLevelShift
 } ErgoLevel;
 
 // The available heuristics.

--- a/src/share/vm/oops/instanceRefKlass.cpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/share/vm/oops/instanceRefKlass.cpp	Thu Sep 15 12:44:09 2011 -0700
@@ -45,7 +45,7 @@
 #endif
 
 template <class T>
-static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
+void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
   T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
   T heap_oop = oopDesc::load_heap_oop(referent_addr);
   debug_only(
@@ -99,7 +99,7 @@
     oop discovered = java_lang_ref_Reference::discovered(obj);
     assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
            err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
-                   obj));
+                   (oopDesc*)obj));
 #endif
   }
   // treat next as normal oop.  next is a link in the reference queue.
@@ -179,7 +179,7 @@
     oop discovered = java_lang_ref_Reference::discovered(obj);
     assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
            err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
-                   obj));
+                   (oopDesc*)obj));
 #endif
   }
   PSParallelCompact::mark_and_push(cm, next_addr);
@@ -285,7 +285,7 @@
       T disc_oop = oopDesc::load_heap_oop(disc_addr);                           \
       assert(oopDesc::is_null(next_oop) || oopDesc::is_null(disc_oop),          \
            err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL" \
-                   "discovered field", obj));                                   \
+                   "discovered field", (oopDesc*)obj));                                   \
     )                                                                           \
   }                                                                             \
   /* treat next as normal oop */                                                \
@@ -403,7 +403,7 @@
     oop discovered = java_lang_ref_Reference::discovered(obj);
     assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
            err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
-                   obj));
+                   (oopDesc*)obj));
 #endif
   }
 

--- a/src/share/vm/oops/methodOop.cpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/share/vm/oops/methodOop.cpp	Thu Sep 15 12:44:09 2011 -0700
@@ -1268,12 +1268,19 @@
 
 // Comparer for sorting an object array containing
 // methodOops.
-template <class T>
-static int method_comparator(T a, T b) {
+// Used non-template method_comparator methods since
+// Visual Studio 2003 compiler generates incorrect
+// optimized code for it.
+static int method_comparator_narrowOop(narrowOop a, narrowOop b) {
   methodOop m = (methodOop)oopDesc::decode_heap_oop_not_null(a);
   methodOop n = (methodOop)oopDesc::decode_heap_oop_not_null(b);
   return m->name()->fast_compare(n->name());
 }
+static int method_comparator_oop(oop a, oop b) {
+  methodOop m = (methodOop)a;
+  methodOop n = (methodOop)b;
+  return m->name()->fast_compare(n->name());
+}
 
 // This is only done during class loading, so it is OK to assume method_idnum matches the methods() array
 void methodOopDesc::sort_methods(objArrayOop methods,
@@ -1299,9 +1306,9 @@
     {
       No_Safepoint_Verifier nsv;
       if (UseCompressedOops) {
-        QuickSort::sort<narrowOop>((narrowOop*)(methods->base()), length, method_comparator<narrowOop>, idempotent);
+        QuickSort::sort<narrowOop>((narrowOop*)(methods->base()), length, method_comparator_narrowOop, idempotent);
       } else {
-        QuickSort::sort<oop>((oop*)(methods->base()), length, method_comparator<oop>, idempotent);
+        QuickSort::sort<oop>((oop*)(methods->base()), length, method_comparator_oop, idempotent);
       }
       if (UseConcMarkSweepGC) {
         // For CMS we need to dirty the cards for the array

--- a/src/share/vm/opto/block.cpp	Wed Sep 14 13:57:32 2011 -0700
+++ b/src/share/vm/opto/block.cpp	Thu Sep 15 12:44:09 2011 -0700
@@ -1107,7 +1107,7 @@
 
 //------------------------------trace_frequency_order--------------------------
 // Comparison function for edges
-static int trace_frequency_order(const void *p0, const void *p1) {
+extern "C" int trace_frequency_order(const void *p0, const void *p1) {
   Trace *tr0 = *(Trace **) p0;
   Trace *tr1 = *(Trace **) p1;
   Block *b0 = tr0->first_block();