From gbenson at redhat.com  Fri May  1 02:39:10 2009
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 1 May 2009 10:39:10 +0100
Subject: Shark frame cache
Message-ID: <20090501093910.GA3244@redhat.com>

Hi all,

When Shark drops into HotSpot code it needs to dump all live object
pointers to the stack, and when it returns it needs to load them all
back.  This is probably THE number one performance handicap in Shark.
This patch allows Shark to omit a bunch of the writes, which makes
most SPECjvm98 benchmarks faster (mtrt by 12%!) (times not produced
in compliance with the SPECjvm98 run rules and so not comparable with
SPECjvm98 metrics).

It's quite a fiddly patch, but what it does is pretty straightforward:

 * Firstly, it creates a new cacher, SharkFunctionEntryCacher, to do
   the initial load of the function's arguments into registers.  This
   funnels all access to the stack frame through the Cache-Decache
   code, and is a nice simplification as all the tricky frame-offset
   calculation is now in one place.

 * Secondly, it funnels all loads and stores in the Cache-Decache
   code through read_value_from_frame and write_value_to_frame.

 * read_value_from_frame stores the values it reads in the frame
   cache.  This is propagated around the method being compiled by
   the same code that does local variables, stack slots, etc.
   When write_value_to_frame comes to write things, it compares
   the value it's writing with the frame cache entry for the slot
   it's writing to.  If they're the same the write is unnecessary.
   LLVM is SSA, so this is a simple pointer comparison.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r afe7df786dd4 ChangeLog
--- a/ChangeLog	Thu Apr 30 16:31:55 2009 -0400
+++ b/ChangeLog	Fri May 01 05:17:00 2009 -0400
@@ -1,3 +1,68 @@
+2009-05-01  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp: New file.
+	* ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp: Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp
+	(SharkFunction::_oopmap_frame_size): Removed field.
+	(SharkFunction::_extended_frame_size): New field.
+	(SharkFunction::extended_frame_size): New method.
+	(SharkFunction::oopmap_frame_size): Updated for the above.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::CreateBuildFrame): Likewise.
+
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp
+	(SharkState::SharkState): Remove optional method argument.
+	(SharkState::_frame_cache): New field.
+	(SharkState::frame_cache): New method.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp
+	(SharkState::SharkState): Remove optional method argument.
+	(SharkState::initialize): Initialize frame cache.
+	(SharkState::equal_to): Compare frame cache.
+	(SharkState::merge): Merge frame cache.
+	(SharkState::decache_for_Java_call): Pass frame cache.
+	(SharkState::cache_after_Java_call): Likewise.
+	(SharkState::decache_for_VM_call): Likewise.
+	(SharkState::cache_after_VM_call): Likewise.
+	(SharkState::decache_for_trap): Likewise.
+	(SharkEntryState::SharkEntryState): Don't load initial local
+	variables directly, populate the state with dummy values and
+	use a SharkFunctionEntryCacher to perform the loads.
+
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
+	(SharkCacherDecacher::SharkCacherDecacher): Remove bci argument,
+	and add frame cache argument.
+	(SharkCacherDecacher::_frame_cache): New field.
+	(SharkCacherDecacher::frame_cache): New method.
+	(SharkCacherDecacher::_bci): Removed field.
+	(SharkCacherDecacher::bci): Removed method.
+	(SharkDecacher::SharkDecacher): Add frame cache argument.
+	(SharkDecacher::_bci): New field.
+	(SharkDecacher::bci): New method.
+	(SharkDecacher::write_value_to_frame): New method.
+	(SharkJavaCallDecacher::SharkJavaCallDecacher): Add frame cache.
+	(SharkVMCallDecacher::SharkVMCallDecacher): Likewise.
+	(SharkTrapDecacher::SharkTrapDecacher): Likewise.
+	(SharkCacher::SharkCacher): Likewise.
+	(SharkDecacher::process_method_slot): Made virtual.
+	(SharkDecacher::local_slot_needs_read): Likewise.
+	(SharkDecacher::read_value_from_frame): New method.
+	(SharkJavaCallCacher::SharkJavaCallDecacher): Add frame cache.
+	(SharkVMCallCacher::SharkVMCallDecacher): Likewise.
+	(SharkFunctionEntryCacher): New class.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
+	(SharkDecacher::process_stack_slot): Use write_value_to_frame.
+	(SharkDecacher::process_method_slot): Likewise.
+	(SharkDecacher::process_local_slot): Likewise.
+	(SharkCacher::process_stack_slot): Use read_value_from_frame.
+	(SharkCacher::process_method_slot): Likewise.
+	(SharkCacher::process_local_slot): Likewise.
+	(SharkFunctionEntryCacher::process_method_slot): New method.
+	(SharkDecacher::write_value_to_frame): Likewise.
+	(SharkDecacher::read_value_from_frame): Likewise.
+
+	* ports/hotspot/src/share/vm/includeDB_shark: Updated.
+
 2009-04-30 Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Forgo
diff -r afe7df786dd4 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Fri May 01 05:17:00 2009 -0400
@@ -117,12 +117,14 @@
 sharkCacheDecache.cpp                   llvmValue.hpp
 sharkCacheDecache.cpp                   sharkBuilder.hpp
 sharkCacheDecache.cpp                   sharkCacheDecache.hpp
+sharkCacheDecache.cpp                   sharkFrameCache.hpp
 sharkCacheDecache.cpp                   sharkFunction.hpp
 sharkCacheDecache.cpp                   sharkState.inline.hpp
 
 sharkCacheDecache.hpp                   ciMethod.hpp
 sharkCacheDecache.hpp                   debugInfoRec.hpp
 sharkCacheDecache.hpp                   sharkBuilder.hpp
+sharkCacheDecache.hpp                   sharkFrameCache.hpp
 sharkCacheDecache.hpp                   sharkFunction.hpp
 sharkCacheDecache.hpp                   sharkStateScanner.hpp
 
@@ -172,6 +174,15 @@
 sharkEntry.cpp                          sharkEntry.hpp
 
 sharkEntry.hpp                          llvmHeaders.hpp
+
+sharkFrameCache.cpp                     allocation.hpp
+sharkFrameCache.cpp                     llvmHeaders.hpp
+sharkFrameCache.cpp                     sharkFrameCache.hpp
+sharkFrameCache.cpp                     sharkFunction.hpp
+
+sharkFrameCache.hpp                     allocation.hpp
+sharkFrameCache.hpp                     llvmHeaders.hpp
+sharkFrameCache.hpp                     sharkFunction.hpp
 
 sharkFunction.cpp                       allocation.hpp
 sharkFunction.cpp                       ciTypeFlow.hpp
@@ -263,6 +274,7 @@
 sharkState.cpp                          ciTypeFlow.hpp
 sharkState.cpp                          sharkBuilder.hpp
 sharkState.cpp                          sharkCacheDecache.hpp
+sharkState.cpp                          sharkFrameCache.hpp
 sharkState.cpp                          sharkState.inline.hpp
 sharkState.cpp                          sharkTopLevelBlock.hpp
 sharkState.cpp                          sharkType.hpp
@@ -272,6 +284,7 @@
 sharkState.hpp                          ciMethod.hpp
 sharkState.hpp                          llvmHeaders.hpp
 sharkState.hpp                          sharkBuilder.hpp
+sharkState.hpp                          sharkFrameCache.hpp
 sharkState.hpp                          sharkValue.hpp
 
 sharkState.inline.hpp                   sharkBlock.hpp
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Fri May 01 05:17:00 2009 -0400
@@ -59,11 +59,10 @@
 
   // Write the value to the frame if necessary
   if (stack_slot_needs_write(index, value)) {
-    builder()->CreateStore(
+    write_value_to_frame(
+      SharkType::to_stackType(value->basic_type()),
       value->generic_value(),
-      function()->CreateAddressOfFrameEntry(
-        adjusted_offset(value, offset),
-        SharkType::to_stackType(value->basic_type())));
+      adjusted_offset(value, offset));
   }
 
   // Record the value in the oopmap if necessary
@@ -104,11 +103,11 @@
 void SharkDecacher::process_method_slot(llvm::Value** value, int offset)
 {
   // Decache the method pointer
-  builder()->CreateStore(
+  write_value_to_frame(
+    SharkType::methodOop_type(),
     *value,
-    function()->CreateAddressOfFrameEntry(
-      offset,
-      SharkType::methodOop_type()));
+    offset);
+
   oopmap()->set_oop(slot2reg(offset));  
 }
 
@@ -134,11 +133,10 @@
 
   // Write the value to the frame if necessary
   if (local_slot_needs_write(index, value)) {
-    builder()->CreateStore(
+    write_value_to_frame(
+      SharkType::to_stackType(value->basic_type()),
       value->generic_value(),
-      function()->CreateAddressOfFrameEntry(
-        adjusted_offset(value, offset),
-        SharkType::to_stackType(value->basic_type())));
+      adjusted_offset(value, offset));
   }
 
   // Record the value in the oopmap if necessary
@@ -177,10 +175,9 @@
   if (stack_slot_needs_read(index, value)) {
     *addr = SharkValue::create_generic(
       value->type(),
-      builder()->CreateLoad(
-        function()->CreateAddressOfFrameEntry(
-          adjusted_offset(value, offset),
-          SharkType::to_stackType(value->basic_type()))),
+      read_value_from_frame(
+        SharkType::to_stackType(value->basic_type()),
+        adjusted_offset(value, offset)),
       value->zero_checked());
   }
 }
@@ -188,10 +185,14 @@
 void SharkCacher::process_method_slot(llvm::Value** value, int offset)
 {
   // Cache the method pointer
-  *value = builder()->CreateLoad(
-    function()->CreateAddressOfFrameEntry(
-      offset,
-      SharkType::methodOop_type()));
+  *value = read_value_from_frame(SharkType::methodOop_type(), offset);
+}
+
+void SharkFunctionEntryCacher::process_method_slot(llvm::Value** value,
+                                                   int           offset)
+{
+  // "Cache" the method pointer
+  *value = method();
 }
 
 void SharkCacher::process_local_slot(int          index,
@@ -204,10 +205,28 @@
   if (local_slot_needs_read(index, value)) {
     *addr = SharkValue::create_generic(
       value->type(),
-      builder()->CreateLoad(
-        function()->CreateAddressOfFrameEntry(
-          adjusted_offset(value, offset),
-          SharkType::to_stackType(value->basic_type()))),
+      read_value_from_frame(
+        SharkType::to_stackType(value->basic_type()),
+        adjusted_offset(value, offset)),
       value->zero_checked());
   }
 }
+
+void SharkDecacher::write_value_to_frame(const llvm::Type* type,
+                                         llvm::Value*      value,
+                                         int               offset)
+{
+  if (frame_cache()->value(offset) != value) {
+    builder()->CreateStore(
+      value,
+      function()->CreateAddressOfFrameEntry(offset, type));
+  }
+}
+
+Value* SharkCacher::read_value_from_frame(const llvm::Type* type, int offset)
+{
+  Value *result = builder()->CreateLoad(
+    function()->CreateAddressOfFrameEntry(offset, type));
+  frame_cache()->set_value(offset, result);
+  return result;
+}
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Fri May 01 05:17:00 2009 -0400
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,26 +33,27 @@
 //     - SharkCacher
 //       - SharkJavaCallCacher
 //       - SharkVMCallCacher
+//       - SharkFunctionEntryCacher
 
 class SharkCacherDecacher : public SharkStateScanner {
  protected:
-  SharkCacherDecacher(SharkFunction* function, int bci)
-    : SharkStateScanner(function), _bci(bci) {}
+  SharkCacherDecacher(SharkFunction* function, SharkFrameCache* frame_cache)
+    : SharkStateScanner(function), _frame_cache(frame_cache) {}
+
+ private:
+  SharkFrameCache* _frame_cache;
+
+ protected:
+  SharkFrameCache* frame_cache() const
+  {
+    return _frame_cache;
+  }
 
  protected:
   SharkBuilder* builder() const
   {
     return function()->builder();
   }  
-
- private:
-  int _bci;
-  
- protected:
-  int bci() const
-  {
-    return _bci;
-  }
 
   // Helper
  protected:
@@ -66,8 +67,17 @@
 
 class SharkDecacher : public SharkCacherDecacher {
  protected:
-  SharkDecacher(SharkFunction* function, int bci)
-    : SharkCacherDecacher(function, bci) {}
+  SharkDecacher(SharkFunction* function, SharkFrameCache* frame_cache, int bci)
+    : SharkCacherDecacher(function, frame_cache), _bci(bci) {}
+
+ private:
+  int _bci;
+  
+ protected:
+  int bci() const
+  {
+    return _bci;
+  }
 
  private:
   DebugInformationRecorder* debug_info() const
@@ -171,12 +181,21 @@
       return Location::normal;
     return Location::invalid;
   }
+
+  // Writer helper
+ protected:
+  void write_value_to_frame(const llvm::Type* type,
+                            llvm::Value*      value,
+                            int               offset);
 };
 
 class SharkJavaCallDecacher : public SharkDecacher {
  public:
-  SharkJavaCallDecacher(SharkFunction* function, int bci, ciMethod* callee)
-    : SharkDecacher(function, bci), _callee(callee) {}
+  SharkJavaCallDecacher(SharkFunction*   function,
+                        SharkFrameCache* frame_cache,
+                        int              bci,
+                        ciMethod*        callee)
+    : SharkDecacher(function, frame_cache, bci), _callee(callee) {}
 
  private:
   ciMethod* _callee;
@@ -220,8 +239,10 @@
 
 class SharkVMCallDecacher : public SharkDecacher {
  public:
-  SharkVMCallDecacher(SharkFunction* function, int bci)
-    : SharkDecacher(function, bci) {}
+  SharkVMCallDecacher(SharkFunction*   function,
+                      SharkFrameCache* frame_cache,
+                      int              bci)
+    : SharkDecacher(function, frame_cache, bci) {}
 
   // Stack slot helpers
  protected:
@@ -256,8 +277,10 @@
 
 class SharkTrapDecacher : public SharkDecacher {
  public:
-  SharkTrapDecacher(SharkFunction* function, int bci)
-    : SharkDecacher(function, bci) {}
+  SharkTrapDecacher(SharkFunction*   function,
+                    SharkFrameCache* frame_cache,
+                    int              bci)
+    : SharkDecacher(function, frame_cache, bci) {}
 
   // Stack slot helpers
  protected:
@@ -292,14 +315,14 @@
 
 class SharkCacher : public SharkCacherDecacher {
  protected:
-  SharkCacher(SharkFunction* function, int bci)
-    : SharkCacherDecacher(function, bci) {}
+  SharkCacher(SharkFunction* function, SharkFrameCache* frame_cache)
+    : SharkCacherDecacher(function, frame_cache) {}
 
   // Callbacks
  protected:
   void process_stack_slot(int index, SharkValue** value, int offset);
 
-  void process_method_slot(llvm::Value** value, int offset);
+  virtual void process_method_slot(llvm::Value** value, int offset);
 
   void process_local_slot(int index, SharkValue** value, int offset);
 
@@ -309,16 +332,22 @@
 
   // Local slot helper
  protected:
-  bool local_slot_needs_read(int index, SharkValue* value)
+  virtual bool local_slot_needs_read(int index, SharkValue* value)
   {
     return value && value->is_jobject();
   }
+
+  // Writer helper
+ protected:
+  llvm::Value* read_value_from_frame(const llvm::Type* type, int offset);
 };
 
 class SharkJavaCallCacher : public SharkCacher {
  public:
-  SharkJavaCallCacher(SharkFunction* function, int bci, ciMethod* callee)
-    : SharkCacher(function, bci), _callee(callee) {}
+  SharkJavaCallCacher(SharkFunction*   function,
+                      SharkFrameCache* frame_cache,
+                      ciMethod*        callee)
+    : SharkCacher(function, frame_cache), _callee(callee) {}
 
  private:
   ciMethod* _callee;
@@ -340,8 +369,8 @@
 
 class SharkVMCallCacher : public SharkCacher {
  public:
-  SharkVMCallCacher(SharkFunction* function, int bci)
-    : SharkCacher(function, bci) {}
+  SharkVMCallCacher(SharkFunction* function, SharkFrameCache* frame_cache)
+    : SharkCacher(function, frame_cache) {}
 
   // Stack slot helper
  protected:
@@ -350,3 +379,38 @@
     return value && value->is_jobject();
   }
 };
+
+class SharkFunctionEntryCacher : public SharkCacher {
+ public:
+  SharkFunctionEntryCacher(SharkFunction*   function,
+                           SharkFrameCache* frame_cache,
+                           llvm::Value*     method)
+    : SharkCacher(function, frame_cache), _method(method) {}
+
+ private:
+  llvm::Value* _method;
+
+ private:
+  llvm::Value* method() const
+  {
+    return _method;
+  }
+
+  // Method slot callback
+ protected:
+  void process_method_slot(llvm::Value** value, int offset);
+
+  // Stack slot helper
+ protected:
+  bool stack_slot_needs_read(int index, SharkValue* value)
+  {
+    ShouldNotReachHere(); // entry block shouldn't have stack
+  }
+
+  // Local slot helper
+ protected:
+  virtual bool local_slot_needs_read(int index, SharkValue* value)
+  {
+    return value != NULL;
+  }
+};
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkFrameCache.cpp	Fri May 01 05:17:00 2009 -0400
@@ -0,0 +1,66 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
+ * 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.
+ *
+ */
+
+#include "incls/_precompiled.incl"
+#include "incls/_sharkFrameCache.cpp.incl"
+
+using namespace llvm;
+
+SharkFrameCache::SharkFrameCache(SharkFunction *function)
+  : _frame_size(function->extended_frame_size())
+{
+  _values = NEW_RESOURCE_ARRAY(Value*, frame_size());
+  memset(_values, 0, frame_size() * sizeof(Value *));
+}
+
+SharkFrameCache::SharkFrameCache(const SharkFrameCache* cache)
+  : _frame_size(cache->frame_size())
+{
+  _values = NEW_RESOURCE_ARRAY(Value*, frame_size());
+  memcpy(_values, cache->_values, frame_size() * sizeof(Value *));
+}
+
+bool SharkFrameCache::equal_to(SharkFrameCache* other)
+{
+  if (frame_size() != other->frame_size())
+    return false;
+
+  for (int i = 0; i < frame_size(); i++) {
+    if (value(i) != other->value(i))
+      return false;
+  }
+
+  return true;
+}
+
+void SharkFrameCache::merge(SharkFrameCache* other)
+{
+  assert(frame_size() == other->frame_size(), "should be");
+
+  for (int i = 0; i < frame_size(); i++) {
+    if (value(i) != other->value(i))
+      set_value(i, NULL);
+  }
+}
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkFrameCache.hpp	Fri May 01 05:17:00 2009 -0400
@@ -0,0 +1,66 @@
+/*
+ * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Red Hat, Inc.
+ * 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.
+ *
+ */
+
+class SharkFrameCache : public ResourceObj {
+ public:
+  SharkFrameCache(SharkFunction* function);
+
+ protected:
+  SharkFrameCache(const SharkFrameCache* cache);
+
+ private:
+  int           _frame_size;
+  llvm::Value** _values;
+
+ private:
+  int frame_size() const
+  {
+    return _frame_size;
+  }
+
+ public:
+  llvm::Value* value(int slot)
+  {
+    assert(slot >= 0 && slot < frame_size(), "bad index");
+    return _values[slot];
+  }
+  void set_value(int slot, llvm::Value* value)
+  {
+    assert(slot >= 0 && slot < frame_size(), "bad index");
+    _values[slot] = value;
+  }
+
+  // Comparison
+ public:
+  bool equal_to(SharkFrameCache* other);
+
+  // Copy and merge
+ public:
+  SharkFrameCache *copy() const
+  {
+    return new SharkFrameCache(this);
+  }
+  void merge(SharkFrameCache* other);
+};
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri May 01 05:17:00 2009 -0400
@@ -220,7 +220,7 @@
   int stack_words   = max_stack();
   int frame_words   = header_words + monitor_words + stack_words;
 
-  _oopmap_frame_size = frame_words + extra_locals;
+  _extended_frame_size = frame_words + locals_words;
 
   // Update the stack pointer
   Value *zero_stack_pointer = builder()->CreateSub(
@@ -233,7 +233,7 @@
   _frame = builder()->CreateIntToPtr(
     zero_stack_pointer,
     PointerType::getUnqual(
-      ArrayType::get(SharkType::intptr_type(), frame_words + locals_words)),
+      ArrayType::get(SharkType::intptr_type(), extended_frame_size())),
     "frame");
   int offset = 0;
 
@@ -277,7 +277,7 @@
   _locals_slots_offset = offset;  
   offset += locals_words;
 
-  assert(offset == frame_words + locals_words, "should do");
+  assert(offset == extended_frame_size(), "should do");
   return fp;
 }
 
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkFunction.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.hpp	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.hpp	Fri May 01 05:17:00 2009 -0400
@@ -253,7 +253,7 @@
   }
 
  private:
-  int _oopmap_frame_size;
+  int _extended_frame_size;
   int _stack_slots_offset;
   int _monitors_slots_offset;
   int _exception_slot_offset;
@@ -262,9 +262,13 @@
   int _locals_slots_offset;
 
  public:
+  int extended_frame_size() const
+  {
+    return _extended_frame_size;
+  }
   int oopmap_frame_size() const
   {
-    return _oopmap_frame_size;
+    return extended_frame_size() - arg_size();
   }
   int stack_slots_offset() const
   {
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkState.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkState.cpp	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkState.cpp	Fri May 01 05:17:00 2009 -0400
@@ -28,12 +28,11 @@
 
 using namespace llvm;
 
-SharkState::SharkState(SharkBlock*    block,
-                       SharkFunction* function,
-                       llvm::Value*   method)
+SharkState::SharkState(SharkBlock* block, SharkFunction* function)
   : _block(block),
     _function(function),
-    _method(method)
+    _method(NULL),
+    _frame_cache(NULL)
 {
   initialize(NULL);
 }
@@ -41,7 +40,8 @@
 SharkState::SharkState(SharkBlock* block, const SharkState* state)
   : _block(block),
     _function(state->function()),
-    _method(state->method())
+    _method(state->method()),
+    _frame_cache(NULL)
 {
   initialize(state);
 }
@@ -69,7 +69,13 @@
         value = value->clone();
       push(value);
     }
+
+    if (state->frame_cache())
+      _frame_cache = state->frame_cache()->copy();
   } 
+  else if (function()) {
+    _frame_cache = new SharkFrameCache(function());
+  }
 }
 
 bool SharkState::equal_to(SharkState *other)
@@ -89,6 +95,7 @@
   if (stack_depth() != other->stack_depth())
     return false;
 
+  // Local variables
   for (int i = 0; i < max_locals(); i++) {
     SharkValue *value = local(i);
     SharkValue *other_value = other->local(i);
@@ -106,6 +113,7 @@
     }
   }
 
+  // Expression stack
   for (int i = 0; i < stack_depth(); i++) {
     SharkValue *value = stack(i);
     SharkValue *other_value = other->stack(i);
@@ -121,6 +129,19 @@
       if (!value->equal_to(other_value))
         return false;
     }
+  }
+
+  // Frame cache
+  if (frame_cache() == NULL) {
+    if (other->frame_cache() != NULL)
+      return false;
+  }
+  else {
+    if (other->frame_cache() == NULL)
+      return false;
+
+    if (!frame_cache()->equal_to(other->frame_cache()))
+      return false;
   }
 
   return true;
@@ -167,12 +188,16 @@
         builder(), other_value, other_block, this_block, name));
     }
   }
+
+  // Frame cache
+  frame_cache()->merge(other->frame_cache());
 }
 
 void SharkState::decache_for_Java_call(ciMethod* callee)
 {
   assert(function() && method(), "you cannot decache here");
-  SharkJavaCallDecacher(function(), block()->bci(), callee).scan(this);
+  SharkJavaCallDecacher(
+    function(), frame_cache(), block()->bci(), callee).scan(this);
   pop(callee->arg_size());
 }
 
@@ -197,31 +222,31 @@
     if (type->is_two_word())
       push(NULL);
   }
-  SharkJavaCallCacher(function(), block()->bci(), callee).scan(this);
+  SharkJavaCallCacher(function(), frame_cache(), callee).scan(this);
 }
 
 void SharkState::decache_for_VM_call()
 {
   assert(function() && method(), "you cannot decache here");
-  SharkVMCallDecacher(function(), block()->bci()).scan(this);
+  SharkVMCallDecacher(function(), frame_cache(), block()->bci()).scan(this);
 }
 
 void SharkState::cache_after_VM_call()
 {
   assert(function() && method(), "you cannot cache here");
-  SharkVMCallCacher(function(), block()->bci()).scan(this);
+  SharkVMCallCacher(function(), frame_cache()).scan(this);
 }
 
 void SharkState::decache_for_trap()
 {
   assert(function() && method(), "you cannot decache here");
-  SharkTrapDecacher(function(), block()->bci()).scan(this);
+  SharkTrapDecacher(function(), frame_cache(), block()->bci()).scan(this);
 }
 
 SharkEntryState::SharkEntryState(SharkTopLevelBlock* block, Value* method)
-  : SharkState(block, block->function(), method)
+  : SharkState(block, block->function())
 {
-  char name[18];
+  assert(!block->stack_depth_at_entry(), "entry block shouldn't have stack");
 
   // Local variables
   for (int i = 0; i < max_locals(); i++) {
@@ -235,21 +260,11 @@
     case T_DOUBLE:
     case T_OBJECT:
     case T_ARRAY:
-      if (i < function()->arg_size()) {
-        snprintf(name, sizeof(name), "local_%d_", i);
-        value = SharkValue::create_generic(
-          type,
-          builder()->CreateLoad(
-            function()->CreateAddressOfFrameEntry(
-              function()->locals_slots_offset()
-              + max_locals() - type->size() - i,
-              SharkType::to_stackType(type)),
-            name),
-          i == 0 && !function()->target()->is_static());
+      if (i >= function()->arg_size()) {
+        ShouldNotReachHere();
       }
-      else {
-        Unimplemented();
-      }
+      value = SharkValue::create_generic(
+        type, NULL, i == 0 && !function()->target()->is_static());
       break;
     
     case ciTypeFlow::StateVector::T_BOTTOM:
@@ -264,9 +279,7 @@
     }
     set_local(i, value);
   }
-
-  // Expression stack
-  assert(!block->stack_depth_at_entry(), "entry block shouldn't have stack");
+  SharkFunctionEntryCacher(function(), frame_cache(), method).scan(this);  
 }
 
 SharkPHIState::SharkPHIState(SharkTopLevelBlock* block)
diff -r afe7df786dd4 ports/hotspot/src/share/vm/shark/sharkState.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkState.hpp	Thu Apr 30 16:31:55 2009 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkState.hpp	Fri May 01 05:17:00 2009 -0400
@@ -29,21 +29,20 @@
 
 class SharkState : public ResourceObj {
  public:
-  SharkState(SharkBlock*    block,
-             SharkFunction* function = NULL,
-             llvm::Value*   method = NULL);
+  SharkState(SharkBlock* block, SharkFunction* function = NULL);
   SharkState(SharkBlock* block, const SharkState* state);
 
  private:
   void initialize(const SharkState* state);
 
  private:
-  SharkBlock*    _block;
-  SharkFunction* _function;
-  llvm::Value*   _method;
-  SharkValue**   _locals;
-  SharkValue**   _stack;
-  SharkValue**   _sp;
+  SharkBlock*      _block;
+  SharkFunction*   _function;
+  llvm::Value*     _method;
+  SharkFrameCache* _frame_cache;
+  SharkValue**     _locals;
+  SharkValue**     _stack;
+  SharkValue**     _sp;
 
  public:
   SharkBlock *block() const
@@ -53,6 +52,10 @@
   SharkFunction *function() const
   {
     return _function;
+  }
+  SharkFrameCache *frame_cache() const
+  {
+    return _frame_cache;
   }
   
  public:

From xerxes at zafena.se  Tue May  5 03:20:51 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Tue, 05 May 2009 12:20:51 +0200
Subject: [patch] shark llvm 2.6 JIT improved optimization level
Message-ID: <4A001303.9090800@zafena.se>

The LLVM 2.6 JIT api have changed in order to give developers more 
fine-grained control of the optimization level of the JIT.
http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html

The attached patch enables Shark to compile against the current llvm 2.6 
svn trunk.
... and makes the shark a bit more aggressive.

Suggestions are welcome.

Cheers
Xerxes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: shark_llvm2.6_opt.patch
Type: text/x-patch
Size: 1268 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/zero-dev/attachments/20090505/fbac26a1/attachment.bin 

From aph at redhat.com  Tue May  5 03:24:00 2009
From: aph at redhat.com (Andrew Haley)
Date: Tue, 05 May 2009 11:24:00 +0100
Subject: [patch] shark llvm 2.6 JIT improved optimization level
In-Reply-To: <4A001303.9090800@zafena.se>
References: <4A001303.9090800@zafena.se>
Message-ID: <4A0013C0.700@redhat.com>

Xerxes R?nby wrote:
> The LLVM 2.6 JIT api have changed in order to give developers more
> fine-grained control of the optimization level of the JIT.
> http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html
> 
> The attached patch enables Shark to compile against the current llvm 2.6
> svn trunk.
> ... and makes the shark a bit more aggressive.
> 
> Suggestions are welcome.

OK, I'll bite.  :-)

This option should be accessible from the command line.

Andrew.


From xerxes at zafena.se  Tue May  5 04:42:17 2009
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Tue, 05 May 2009 13:42:17 +0200
Subject: [patch] shark llvm 2.6 JIT improved optimization level
In-Reply-To: <4A0013C0.700@redhat.com>
References: <4A001303.9090800@zafena.se> <4A0013C0.700@redhat.com>
Message-ID: <4A002619.6090107@zafena.se>

Andrew Haley skrev:
> Xerxes R?nby wrote:
>   
>> The LLVM 2.6 JIT api have changed in order to give developers more
>> fine-grained control of the optimization level of the JIT.
>> http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html
>>
>> The attached patch enables Shark to compile against the current llvm 2.6
>> svn trunk.
>> ... and makes the shark a bit more aggressive.
>>
>> Suggestions are welcome.
>>     
>
> OK, I'll bite.  :-)
>
> This option should be accessible from the command line.
>
> Andrew.
>   
I have committed the patch with a change to make it use the same 
optimization level as before since shark currently only have one 
optimization level.

If we want to be able to use the command line to set the optimization 
level then it could be implemented in a number of ways:

We could add a new -XX option like -XX:SharkOptimization=Aggressive

We could as well make shark hotspot respond to the "standard" -client 
and -server options in order to set the optimization suitable for 
responsive user interaction or  bulk server throughput.

Cheers
Xerxes


From aph at redhat.com  Tue May  5 04:49:59 2009
From: aph at redhat.com (Andrew Haley)
Date: Tue, 05 May 2009 12:49:59 +0100
Subject: [patch] shark llvm 2.6 JIT improved optimization level
In-Reply-To: <4A002619.6090107@zafena.se>
References: <4A001303.9090800@zafena.se> <4A0013C0.700@redhat.com>
	<4A002619.6090107@zafena.se>
Message-ID: <4A0027E7.5020101@redhat.com>

Xerxes R?nby wrote:
> Andrew Haley skrev:
>> Xerxes R?nby wrote:
>>  
>>> The LLVM 2.6 JIT api have changed in order to give developers more
>>> fine-grained control of the optimization level of the JIT.
>>> http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html
>>>
>>> The attached patch enables Shark to compile against the current llvm 2.6
>>> svn trunk.
>>> ... and makes the shark a bit more aggressive.
>>>
>>> Suggestions are welcome.
>>>     
>>
>> OK, I'll bite.  :-)
>>
>> This option should be accessible from the command line.

> I have committed the patch with a change to make it use the same
> optimization level as before since shark currently only have one
> optimization level.
> 
> If we want to be able to use the command line to set the optimization
> level then it could be implemented in a number of ways:
> 
> We could add a new -XX option like -XX:SharkOptimization=Aggressive
> 
> We could as well make shark hotspot respond to the "standard" -client
> and -server options in order to set the optimization suitable for
> responsive user interaction or  bulk server throughput.

I don't think that -client and -server really give us what we need.  In
order to find out what optimization levels we should use we need to be
able to benchmark with varying levels.  If there is a Java parameter that
corresponds with the LLVM levels, than we can use that, but I don't think
there is.

It might be, for example, that Aggressive optimization is pointless.  I
don't know.

Andrew.


From gbenson at redhat.com  Tue May  5 05:29:19 2009
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 5 May 2009 13:29:19 +0100
Subject: [patch] shark llvm 2.6 JIT improved optimization level
In-Reply-To: <4A0027E7.5020101@redhat.com>
References: <4A001303.9090800@zafena.se> <4A0013C0.700@redhat.com>
	<4A002619.6090107@zafena.se> <4A0027E7.5020101@redhat.com>
Message-ID: <20090505122919.GA3488@redhat.com>

Andrew Haley wrote:
> Xerxes R?nby wrote:
> > Andrew Haley skrev:
> > > Xerxes R?nby wrote:
> > > > The LLVM 2.6 JIT api have changed in order to give developers
> > > > more fine-grained control of the optimization level of the JIT.
> > > > http://lists.cs.uiuc.edu/pipermail/llvmdev/2009-April/021990.html
> > >
> > > OK, I'll bite.  :-)
> > >
> > > This option should be accessible from the command line.
> > 
> > I have committed the patch with a change to make it use the same
> > optimization level as before since shark currently only have one
> > optimization level.
> > 
> > If we want to be able to use the command line to set the
> > optimization level then it could be implemented in a number
> > of ways:
> > 
> > We could add a new -XX option like -XX:SharkOptimization=Aggressive
> > 
> > We could as well make shark hotspot respond to the "standard"
> > -client and -server options in order to set the optimization
> > suitable for responsive user interaction or bulk server
> > throughput.
> 
> I don't think that -client and -server really give us what we need.
> In order to find out what optimization levels we should use we need
> to be able to benchmark with varying levels.  If there is a Java
> parameter that corresponds with the LLVM levels, than we can use
> that, but I don't think there is.
> 
> It might be, for example, that Aggressive optimization is pointless.
> I don't know.

My preference would be for -XX:SharkOptimization=Aggressive.  The
problem with -client and -server is that they already have a meaning,
and they're handled in a completely different way to all other command
line options, so getting them through to Shark would involve some
pretty invasive modifications.

Cheers,
Gary

-- 
http://gbenson.net/


From gbenson at redhat.com  Tue May  5 06:23:25 2009
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 5 May 2009 14:23:25 +0100
Subject: Zero and Shark patch refactoring
Message-ID: <20090505132324.GB3488@redhat.com>

Hi all,

As a prelude to upstreaming Zero and Shark I want to alter the
makefiles to apply Zero and Shark patches for all builds.  This
shouldn't cause any problems (everything is conditional) and
since this is how they'll be when they're upstream it'd be good
to get some initial testing.  Does anybody have any problems
with this?

Also, to make this easier I'd like to get rid of the stuff for
building Zero using the bundled HotSpot.  Is anybody still using
Zero like that?

Cheers,
Gary

--
http://gbenson.net/


From aph at redhat.com  Tue May  5 07:30:41 2009
From: aph at redhat.com (Andrew Haley)
Date: Tue, 05 May 2009 15:30:41 +0100
Subject: Zero and Shark patch refactoring
In-Reply-To: <20090505132324.GB3488@redhat.com>
References: <20090505132324.GB3488@redhat.com>
Message-ID: <4A004D91.9090905@redhat.com>

Gary Benson wrote:

> As a prelude to upstreaming Zero and Shark I want to alter the
> makefiles to apply Zero and Shark patches for all builds.  This
> shouldn't cause any problems (everything is conditional) and
> since this is how they'll be when they're upstream it'd be good
> to get some initial testing.  Does anybody have any problems
> with this?

This sounds like a good idea, and it's certainly a prerequisite
for pushing Zero upstream.

Andrew.


From gnu_andrew at member.fsf.org  Tue May  5 07:34:53 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 5 May 2009 15:34:53 +0100
Subject: Zero and Shark patch refactoring
In-Reply-To: <20090505132324.GB3488@redhat.com>
References: <20090505132324.GB3488@redhat.com>
Message-ID: <17c6771e0905050734q2f6c7370s455dc9d803b47700@mail.gmail.com>

2009/5/5 Gary Benson <gbenson at redhat.com>:
> Hi all,
>
> As a prelude to upstreaming Zero and Shark I want to alter the
> makefiles to apply Zero and Shark patches for all builds. ?This
> shouldn't cause any problems (everything is conditional) and
> since this is how they'll be when they're upstream it'd be good
> to get some initial testing. ?Does anybody have any problems
> with this?
>

No, in fact this would be great.  I'd like to get Zero/Shark in the
IcedTea forest for 7 rather than having to maintain them as patches
and this will make it more feasible.

> Also, to make this easier I'd like to get rid of the stuff for
> building Zero using the bundled HotSpot. ?Is anybody still using
> Zero like that?
>

I thought we'd already dropped some of it and we did say we would
after 1.4.  Make sure to update the patch list
(http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches) for those you
removed (I already highlighted a few).

> Cheers,
> Gary
>
> --
> http://gbenson.net/
>


-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gbenson at redhat.com  Wed May  6 02:21:39 2009
From: gbenson at redhat.com (Gary Benson)
Date: Wed, 6 May 2009 10:21:39 +0100
Subject: Zero and Shark patch refactoring
In-Reply-To: <20090505132324.GB3488@redhat.com>
References: <20090505132324.GB3488@redhat.com>
Message-ID: <20090506092139.GA3247@redhat.com>

Gary Benson wrote:
> Also, to make this easier I'd like to get rid of the stuff for
> building Zero using the bundled HotSpot.  Is anybody still using
> Zero like that?

Apparently nobody is, as it doesn't build ;)

Cheers,
Gary

-- 
http://gbenson.net/


From gnu_andrew at member.fsf.org  Wed May  6 08:01:34 2009
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 6 May 2009 16:01:34 +0100
Subject: Zero and Shark patch refactoring
In-Reply-To: <20090506092139.GA3247@redhat.com>
References: <20090505132324.GB3488@redhat.com>
	<20090506092139.GA3247@redhat.com>
Message-ID: <17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com>

2009/5/6 Gary Benson <gbenson at redhat.com>:
> Gary Benson wrote:
>> Also, to make this easier I'd like to get rid of the stuff for
>> building Zero using the bundled HotSpot. ?Is anybody still using
>> Zero like that?
>
> Apparently nobody is, as it doesn't build ;)
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>

Doesn't surprise me ;)
I thought we'd removed support for original builds anyway...
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gbenson at redhat.com  Thu May  7 05:34:16 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 7 May 2009 13:34:16 +0100
Subject: Zero and Shark patch refactoring
In-Reply-To: <17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com>
References: <20090505132324.GB3488@redhat.com>
	<20090506092139.GA3247@redhat.com>
	<17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com>
Message-ID: <20090507123415.GA3181@redhat.com>

Andrew John Hughes wrote:
> 2009/5/6 Gary Benson <gbenson at redhat.com>:
> > Gary Benson wrote:
> > > Also, to make this easier I'd like to get rid of the stuff for
> > > building Zero using the bundled HotSpot. ?Is anybody still using
> > > Zero like that?
> >
> > Apparently nobody is, as it doesn't build ;)
> 
> Doesn't surprise me ;)
> I thought we'd removed support for original builds anyway...

I thought we did too, but the code is still there in the makefiles,
along with a bunch of patches required for it.

Cheers,
Gary

-- 
http://gbenson.net/


From doko at ubuntu.com  Thu May  7 06:10:50 2009
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 07 May 2009 15:10:50 +0200
Subject: Zero and Shark patch refactoring
In-Reply-To: <20090507123415.GA3181@redhat.com>
References: <20090505132324.GB3488@redhat.com>	<20090506092139.GA3247@redhat.com>	<17c6771e0905060801n662106adh71768a53bf086b38@mail.gmail.com>
	<20090507123415.GA3181@redhat.com>
Message-ID: <4A02DDDA.5000804@ubuntu.com>

Gary Benson schrieb:
> Andrew John Hughes wrote:
>> 2009/5/6 Gary Benson <gbenson at redhat.com>:
>>> Gary Benson wrote:
>>>> Also, to make this easier I'd like to get rid of the stuff for
>>>> building Zero using the bundled HotSpot.  Is anybody still using
>>>> Zero like that?
>>> Apparently nobody is, as it doesn't build ;)
>> Doesn't surprise me ;)
>> I thought we'd removed support for original builds anyway...
> 
> I thought we did too, but the code is still there in the makefiles,
> along with a bunch of patches required for it.

it does/should work with the 1.4 release. I didn't check after the release, and
I don't use it anymore.

  Matthias


From gbenson at redhat.com  Thu May  7 05:41:48 2009
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 7 May 2009 13:41:48 +0100
Subject: [PATCH] Remove support for building Zero with bundled HotSpot
Message-ID: <20090507124147.GB3181@redhat.com>

Hi all,

Once upon a time, IcedTea used the HotSpot supplied in the
OpenJDK 6 tarball.  This didn't contain the C++ interpreter,
so for Zero and Shark a patch was created to upgrade the
HotSpot to a (somewhat arbitrary) newer version that did.

Nowadays, IcedTea uses an upgraded HotSpot by default, one that
contains the C++ interpreter.  This patch removes support for
building Zero and Shark with the original HotSpot, an option
that has not worked for some months.

Ok to commit?

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r c5c31d555ae3 HACKING
--- a/HACKING	Wed May 06 16:10:04 2009 -0400
+++ b/HACKING	Thu May 07 13:32:50 2009 +0100
@@ -125,18 +125,9 @@
 The following patches are only applied for IcedTea builds using the zero-assembler:
 
 * icedtea-bytecodeInterpreter.patch: Replace fast opcodes with opc_default.
-* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485).
 * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
-* icedtea-hotspot-6b12-7b24.patch: Upgrade to HotSpot from OpenJDK b24 (OpenJDK6 only).
-   - Never edit this patch.  It should be regenerated by unzipping the
-     openjdk6 build you're using into openjdk6, and the openjdk7 build
-     you want to use into openjdk, then running:
-       diff -ruNb openjdk{6,}/hotspot/src/share > icedtea-hotspot-6bXX-7bYY.patch
-       diff -ruNb openjdk{6,}/hotspot/src/os/linux >> icedtea-hotspot-6bXX-7bYY.patch
-* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef.
 * icedtea-ia64-bugfix.patch: Remove workaround for IA64 GCC bug.
 * icedtea-signature-iterator.patch: Add zero-specific signature handling.
-* icedtea-signed-types.patch: Make use of unsigned/signed types explicit.
 * icedtea-test-atomic-operations.patch: Add check to see if GCC's sync_lock_test works.
 * icedtea-zero.patch: Generalise architecture support, add ARM and #ifdef out non-zero applicable parts.
 
@@ -175,3 +166,9 @@
 * icedtea-xslfix.patch: Fix malformed bytecodeInterpreterWithChecks XSL file (S6707485): Included upstream in OpenJDK7 b29/hs13.
 * openjdk-color.patch: Include Free java.awt.color and java.awt.image (S6662775): Included upstream in OpenJDK6 b06 and OpenJDK7 b28.
 * icedtea-cc-interp-no-fer.patch: Replaced with icedtea-cc-interp-jvmti.patch, of which it is a subset.
+* icedtea-hotspot-6b14-7b24.patch: Upgrade HotSpot to a version with the C++ interpreter; not required with HS14.
+* icedtea-hotspot7-build-fixes.patch: Remove KERNEL #ifdef; not required with HS14.
+* icedtea-signed-types.patch: Make use of unsigned/signed types explicit; not required with HS14.
+* icedtea-hotspot-citypeflow.patch: Not required with HS14.
+* icedtea-core-zero-build.patch: Not required with HS14.
+* icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14.
diff -r c5c31d555ae3 Makefile.am
--- a/Makefile.am	Wed May 06 16:10:04 2009 -0400
+++ b/Makefile.am	Thu May 07 13:32:50 2009 +0100
@@ -459,16 +459,8 @@
 	patches/hotspot/$(HSBUILD)/icedtea-gcc-4.3.patch
 endif
 
-# If ZERO_BUILD is set then we are building zero and need
-# to patch up to OpenJDK 7 HotSpot for the C++ interpreter.
-if WITH_ALT_HSBUILD
-ZERO_PATCHES =
-else
+# Zero patches
 ZERO_PATCHES = \
-	patches/icedtea-hotspot-6b14-7b24.patch \
-	patches/icedtea-hotspot7-build-fixes.patch
-endif
-ZERO_PATCHES += \
 	patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
 	patches/icedtea-signature-iterator.patch \
 	patches/icedtea-test-atomic-operations.patch \
@@ -476,27 +468,23 @@
 	patches/icedtea-ia64-bugfix.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch
 
-if !WITH_ALT_HSBUILD
-ZERO_PATCHES += \
-	patches/icedtea-signed-types.patch \
-	patches/icedtea-hotspot-citypeflow.patch
+if ZERO_BUILD
+  ZERO_PATCHES_COND = $(ZERO_PATCHES)
+else
+  ZERO_PATCHES_COND = 
 endif
 
-# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
+# Patches needed when not using the newer OpenJDK 7 HotSpot
+OLD_HOTSPOT_PATCHES = \
 	patches/icedtea-signed-types-hot6.patch \
 	patches/icedtea-lucene-crash.patch \
 	patches/icedtea-6700047-loopopts.patch \
 	patches/icedtea-6712835-ifnode.patch
 
-if ZERO_BUILD
-  ZERO_PATCHES_COND = $(ZERO_PATCHES)
+if WITH_ALT_HSBUILD
+  OLD_HOTSPOT_PATCHES_COND =
 else
-if WITH_ALT_HSBUILD
-  ZERO_PATCHES_COND = 
-else
-  ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
-endif
+  OLD_HOTSPOT_PATCHES_COND = $(OLD_HOTSPOT_PATCHES)
 endif
 
 # If Shark is required, apply shark patch
@@ -510,6 +498,7 @@
 
 ICEDTEA_PATCHES = \
 	$(ZERO_PATCHES_COND) \
+	$(OLD_HOTSPOT_PATCHES_COND) \
 	patches/icedtea-version.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-version.patch \
 	patches/icedtea-copy-plugs.patch \
@@ -539,22 +528,8 @@
 	patches/icedtea-javafiles.patch \
 	patches/icedtea-core-build.patch \
 	patches/icedtea-jvmtiEnv.patch \
-	patches/icedtea-lcms.patch
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
-	patches/hotspot/$(HSBUILD)/icedtea-core-build.patch
-else
-if ZERO_BUILD
-ICEDTEA_PATCHES += \
-	patches/hotspot/$(HSBUILD)/icedtea-core-zero-build.patch
-else
-ICEDTEA_PATCHES += \
-	patches/hotspot/$(HSBUILD)/icedtea-core-build.patch
-endif
-endif
-
-ICEDTEA_PATCHES += \
+	patches/icedtea-lcms.patch \
+	patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \
 	patches/icedtea-linker-options.patch \
 	patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
 	patches/icedtea-timerqueue.patch \
@@ -615,7 +590,6 @@
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
-	patches/icedtea-bytecodeInterpreterWithChecks.patch \
 	patches/icedtea-sparc.patch
 endif
 
diff -r c5c31d555ae3 patches/hotspot/original/icedtea-core-zero-build.patch
--- a/patches/hotspot/original/icedtea-core-zero-build.patch	Wed May 06 16:10:04 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
---- openjdk/hotspot/make/Makefile.orig	2008-11-25 09:11:57.000000000 +0000
-+++ openjdk/hotspot/make/Makefile	2008-12-05 16:54:54.000000000 +0000
-@@ -91,6 +91,15 @@
- all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
- 
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore:           all_productcore all_fastdebugcore
-+all_productcore:   productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore:     jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world:         all create_jdk
- 
-@@ -113,6 +122,10 @@
- 	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
- 
-+$(CORE_VM_TARGETS):
-+	$(CD) $(GAMMADIR)/make; \
-+	$(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- 	$(CD) $(GAMMADIR)/make; \
- 	$(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- 		      $(MAKE_ARGS) $(VM_TARGET)
- endif
- 
-+generic_buildcore:
-+	$(MKDIR) -p $(OUTPUTDIR)
-+	$(CD) $(OUTPUTDIR); \
-+		$(MAKE) -f $(ABS_OS_MAKEFILE) \
-+			$(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- 	$(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
-+C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_core
-+else
- C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
-+endif
- KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
- C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
- C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
- KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
- 
- # Misc files and generated files need to come from C1 or C2 area
-+ifdef ICEDTEA_CORE_BUILD
-+  MISC_DIR=$(C2_DIR)
-+  GEN_DIR=$(C2_BASE_DIR)/generated
-+else
- ifeq ($(ARCH_DATA_MODEL), 32)
-   MISC_DIR=$(C1_DIR)
-   GEN_DIR=$(C1_BASE_DIR)/generated
-@@ -219,6 +246,7 @@
-   MISC_DIR=$(C2_DIR)
-   GEN_DIR=$(C2_BASE_DIR)/generated
- endif
-+endif
- 
- # Bin files (windows)
- ifeq ($(OSNAME),windows)
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig	2008-12-05 16:54:13.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-12-05 16:54:54.000000000 +0000
-@@ -89,8 +89,12 @@
- #ifdef TIERED
-   #define VMTYPE "Server"
- #else
--  #define VMTYPE COMPILER1_PRESENT("Client")   \
--                 COMPILER2_PRESENT("Server")   
-+#if defined(COMPILER1) || defined(COMPILER2)
-+   #define VMTYPE COMPILER1_PRESENT("Client")   \
-+                  COMPILER2_PRESENT("Server")
-+#else
-+  #define VMTYPE "Core"
-+#endif // COMPILER1 || COMPILER2
- #endif // TIERED
- 
- #ifndef HOTSPOT_VM_DISTRO
---- openjdk/hotspot/build/linux/makefiles/defs.make.orig	2008-11-25 09:11:51.000000000 +0000
-+++ openjdk/hotspot/build/linux/makefiles/defs.make	2008-12-05 16:54:54.000000000 +0000
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
-   EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
-       EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
-     endif
- endif
-+endif
diff -r c5c31d555ae3 patches/icedtea-bytecodeInterpreterWithChecks.patch
--- a/patches/icedtea-bytecodeInterpreterWithChecks.patch	Wed May 06 16:10:04 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl      2007-10-12 03:46:08.000000000 -0400
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl      2007-10-29 11:57:33.000000000 -0400
-@@ -6,6 +6,7 @@
-
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-+<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- <xsl:template match="processcode">
- <xsl:text>
- #define VM_JVMTI
-@@ -15,7 +16,6 @@
-
- </xsl:text>
-
--<xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
- </xsl:template>
-
- </xsl:stylesheet>
diff -r c5c31d555ae3 patches/icedtea-hotspot-6b14-7b24.patch
--- a/patches/icedtea-hotspot-6b14-7b24.patch	Wed May 06 16:10:04 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13966 +0,0 @@
-diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/BuildConfig.java	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/tools/MakeDeps/BuildConfig.java	2008-12-05 16:41:21.727631421 +0100
-@@ -704,6 +704,3 @@
- 	receiver.add(attr); receiver.add(value); 
-     }
- }
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java openjdk/hotspot/src/share/tools/MakeDeps/Macro.java
---- openjdk6/hotspot/src/share/tools/MakeDeps/Macro.java	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/tools/MakeDeps/Macro.java	2008-12-05 16:41:21.727631421 +0100
-@@ -26,4 +26,3 @@
-     public String name;
-     public String contents;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlc.hpp openjdk/hotspot/src/share/vm/adlc/adlc.hpp
---- openjdk6/hotspot/src/share/vm/adlc/adlc.hpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp	2008-12-05 16:41:21.737631572 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adlc.hpp	1.28 07/05/05 17:04:59 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp openjdk/hotspot/src/share/vm/adlc/adlparse.cpp
---- openjdk6/hotspot/src/share/vm/adlc/adlparse.cpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp	2008-12-05 16:41:21.737631572 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)adlparse.cpp	1.205 07/05/05 17:05:00 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp openjdk/hotspot/src/share/vm/adlc/adlparse.hpp
---- openjdk6/hotspot/src/share/vm/adlc/adlparse.hpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/adlparse.hpp	2008-12-05 16:41:21.737631572 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adlparse.hpp	1.79 07/05/05 17:05:00 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -273,5 +270,3 @@
-   static bool is_int_token(const char* token, int& intval);
-   static void trim(char* &token);  // trim leading & trailing spaces
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp openjdk/hotspot/src/share/vm/adlc/archDesc.cpp
---- openjdk6/hotspot/src/share/vm/adlc/archDesc.cpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/archDesc.cpp	2008-12-05 16:41:21.737631572 +0100
-@@ -22,6 +22,7 @@
- //  
- //
- 
-+
- // archDesc.cpp - Internal format for architecture definition
- #include "adlc.hpp"
- 
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.cpp openjdk/hotspot/src/share/vm/adlc/arena.cpp
---- openjdk6/hotspot/src/share/vm/adlc/arena.cpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/arena.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)arena.cpp	1.16 07/05/05 17:05:00 JVM"
--#endif
- /*
-  * Copyright 1998-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -173,4 +170,3 @@
- void CHeapObj::operator delete(void* p){
-  free(p);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/arena.hpp openjdk/hotspot/src/share/vm/adlc/arena.hpp
---- openjdk6/hotspot/src/share/vm/adlc/arena.hpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/arena.hpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)arena.hpp	1.17 07/05/05 17:05:00 JVM"
--#endif
- /*
-  * Copyright 1998-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -158,4 +155,3 @@
-   size_t size_in_bytes() const         {  return _size_in_bytes; }
-   void   set_size_in_bytes(size_t size)  { _size_in_bytes = size;   }
- }; 
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dfa.cpp openjdk/hotspot/src/share/vm/adlc/dfa.cpp
---- openjdk6/hotspot/src/share/vm/adlc/dfa.cpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/dfa.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dfa.cpp	1.83 07/05/05 17:04:59 JVM"
--#endif
- /*
-  * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1022,4 +1019,3 @@
- void ProductionState::print() {
-   _production.print(print_key, print_production);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.cpp openjdk/hotspot/src/share/vm/adlc/dict2.cpp
---- openjdk6/hotspot/src/share/vm/adlc/dict2.cpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dict2.cpp	1.19 07/05/05 17:04:59 JVM"
--#endif
- /*
-  * Copyright 1998-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -354,5 +351,3 @@
-   }
-   _key = _value = NULL;
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/dict2.hpp openjdk/hotspot/src/share/vm/adlc/dict2.hpp
---- openjdk6/hotspot/src/share/vm/adlc/dict2.hpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/dict2.hpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)dict2.hpp	1.16 07/05/05 17:05:01 JVM"
--#endif
- /*
-  * Copyright 1998-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -121,5 +118,3 @@
- };
- 
- #endif // _DICT_
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp openjdk/hotspot/src/share/vm/adlc/filebuff.cpp
---- openjdk6/hotspot/src/share/vm/adlc/filebuff.cpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)filebuff.cpp	1.30 07/05/05 17:05:01 JVM"
--#endif
- /*
-  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -297,4 +294,3 @@
-   va_end(args);
-   _AD._no_output = 1;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp openjdk/hotspot/src/share/vm/adlc/filebuff.hpp
---- openjdk6/hotspot/src/share/vm/adlc/filebuff.hpp	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)filebuff.hpp	1.27 07/05/05 17:05:01 JVM"
--#endif
- /*
-  * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.cpp openjdk/hotspot/src/share/vm/adlc/forms.cpp
---- openjdk6/hotspot/src/share/vm/adlc/forms.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/forms.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)forms.cpp	1.161 07/05/05 17:04:59 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -386,4 +383,3 @@
- void SourceForm::output(FILE *fp) {
-   fprintf(fp,"\n//%s\n%s\n",classname(),(_code?_code:"")); 
- } 
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/forms.hpp openjdk/hotspot/src/share/vm/adlc/forms.hpp
---- openjdk6/hotspot/src/share/vm/adlc/forms.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/forms.hpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)forms.hpp	1.150 07/05/05 17:05:00 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -587,6 +584,3 @@
-   void print_asserts(FILE *fp);
-   void dump();
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp openjdk/hotspot/src/share/vm/adlc/formsopt.cpp
---- openjdk6/hotspot/src/share/vm/adlc/formsopt.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/formsopt.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)formsopt.cpp	1.53 07/05/05 17:05:01 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -725,4 +722,3 @@
- void PeepReplace::output(FILE *fp) {      // Write info to output files
-   fprintf(fp,"PeepReplace:\n");
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formsopt.hpp openjdk/hotspot/src/share/vm/adlc/formsopt.hpp
---- openjdk6/hotspot/src/share/vm/adlc/formsopt.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/formsopt.hpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)formsopt.hpp	1.54 07/05/05 17:05:01 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -549,4 +546,3 @@
-   void dump();
-   void output(FILE *fp);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formssel.cpp openjdk/hotspot/src/share/vm/adlc/formssel.cpp
---- openjdk6/hotspot/src/share/vm/adlc/formssel.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/formssel.cpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)formssel.cpp	1.185 07/09/28 10:23:26 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -4000,4 +3997,3 @@
-   fprintf(fp,"\nFormat Rule: \n%s", (_temp?_temp:""));
-   fprintf(fp,"\n");
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/formssel.hpp openjdk/hotspot/src/share/vm/adlc/formssel.hpp
---- openjdk6/hotspot/src/share/vm/adlc/formssel.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/formssel.hpp	2008-12-05 16:41:21.747631722 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)formssel.hpp	1.77 07/07/19 19:08:28 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/output_c.cpp openjdk/hotspot/src/share/vm/adlc/output_c.cpp
---- openjdk6/hotspot/src/share/vm/adlc/output_c.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/output_c.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)output_c.cpp	1.185 07/07/02 16:50:40 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/adlc/output_h.cpp openjdk/hotspot/src/share/vm/adlc/output_h.cpp
---- openjdk6/hotspot/src/share/vm/adlc/output_h.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/adlc/output_h.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)output_h.cpp	1.180 07/09/28 10:23:25 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/assembler.cpp openjdk/hotspot/src/share/vm/asm/assembler.cpp
---- openjdk6/hotspot/src/share/vm/asm/assembler.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/assembler.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)assembler.cpp	1.41 07/05/05 17:05:03 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/assembler.hpp openjdk/hotspot/src/share/vm/asm/assembler.hpp
---- openjdk6/hotspot/src/share/vm/asm/assembler.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/assembler.hpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)assembler.hpp	1.52 07/05/05 17:05:03 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/assembler.inline.hpp openjdk/hotspot/src/share/vm/asm/assembler.inline.hpp
---- openjdk6/hotspot/src/share/vm/asm/assembler.inline.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/assembler.inline.hpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)assembler.inline.hpp	1.27 07/05/05 17:05:03 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/codeBuffer.cpp openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
---- openjdk6/hotspot/src/share/vm/asm/codeBuffer.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)codeBuffer.cpp	1.100 07/05/05 17:05:03 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/codeBuffer.hpp openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp
---- openjdk6/hotspot/src/share/vm/asm/codeBuffer.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)codeBuffer.hpp	1.63 07/05/17 15:49:26 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -543,4 +540,3 @@
-   if (remaining() < amount) { _outer->expand(this, amount); return true; }
-   return false;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/register.cpp openjdk/hotspot/src/share/vm/asm/register.cpp
---- openjdk6/hotspot/src/share/vm/asm/register.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/register.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)register.cpp	1.11 07/05/05 17:05:04 JVM"
--#endif
- /*
-  * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/asm/register.hpp openjdk/hotspot/src/share/vm/asm/register.hpp
---- openjdk6/hotspot/src/share/vm/asm/register.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/asm/register.hpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)register.hpp	1.13 07/05/05 17:05:03 JVM"
--#endif
- /*
-  * Copyright 2000-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_CFGPrinter.cpp	1.8 07/05/05 17:05:04 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_CFGPrinter.hpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_CFGPrinter.hpp	1.7 07/05/05 17:05:05 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -47,4 +44,3 @@
- };
- 
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Canonicalizer.cpp	1.57 07/05/05 17:05:05 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp	2008-12-05 16:41:21.757631873 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Canonicalizer.hpp	1.29 07/05/05 17:05:05 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -97,4 +94,3 @@
-   virtual void do_ProfileCall    (ProfileCall*     x);
-   virtual void do_ProfileCounter (ProfileCounter*  x);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_CodeStubs.hpp openjdk/hotspot/src/share/vm/c1/c1_CodeStubs.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_CodeStubs.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_CodeStubs.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_CodeStubs.hpp	1.86 07/05/05 17:05:06 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -485,4 +482,3 @@
-   virtual void print_name(outputStream* out) const { out->print("ArrayCopyStub"); }
- #endif // PRODUCT
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compilation.cpp openjdk/hotspot/src/share/vm/c1/c1_Compilation.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Compilation.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Compilation.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Compilation.cpp	1.160 07/06/18 14:25:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compilation.hpp openjdk/hotspot/src/share/vm/c1/c1_Compilation.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Compilation.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Compilation.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Compilation.hpp	1.88 07/05/17 15:49:31 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compiler.cpp openjdk/hotspot/src/share/vm/c1/c1_Compiler.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Compiler.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Compiler.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Compiler.cpp	1.105 07/05/05 17:05:06 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -89,5 +86,3 @@
- void Compiler::print_timers() {
-   Compilation::print_timers();
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Compiler.hpp openjdk/hotspot/src/share/vm/c1/c1_Compiler.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Compiler.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Compiler.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Compiler.hpp	1.49 07/05/05 17:05:06 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -68,4 +65,3 @@
-   // Print compilation timers and statistics
-   virtual void print_timers();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Defs.cpp openjdk/hotspot/src/share/vm/c1/c1_Defs.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Defs.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Defs.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Defs.cpp	1.10 07/05/05 17:05:06 JVM"
--#endif
- /*
-  * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -27,4 +24,3 @@
- 
- #include "incls/_precompiled.incl"
- #include "incls/_c1_Defs.cpp.incl"
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Defs.hpp openjdk/hotspot/src/share/vm/c1/c1_Defs.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Defs.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Defs.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Defs.hpp	1.22 07/05/05 17:05:05 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp openjdk/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_FpuStackSim.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_FpuStackSim.hpp	1.7 07/05/05 17:05:06 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -30,4 +27,3 @@
- class FpuStackSim;
- 
- # include "incls/_c1_FpuStackSim_pd.hpp.incl"  // platform dependent declarations
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.cpp openjdk/hotspot/src/share/vm/c1/c1_FrameMap.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_FrameMap.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_FrameMap.cpp	1.38 07/06/18 14:25:23 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.hpp openjdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_FrameMap.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_FrameMap.hpp	1.59 07/05/05 17:05:07 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_GraphBuilder.cpp	1.256 07/06/18 14:25:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_GraphBuilder.hpp	1.75 07/05/17 15:49:37 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -391,4 +388,3 @@
- 
-   BlockBegin* start() const                      { return _start; }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_IR.cpp openjdk/hotspot/src/share/vm/c1/c1_IR.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_IR.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_IR.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_IR.cpp	1.161 08/11/07 15:47:10 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -577,23 +574,12 @@
-     TRACE_LINEAR_SCAN(3, tty->print_cr("backward branch"));
-     assert(is_visited(cur), "block must be visisted when block is active");
-     assert(parent != NULL, "must have parent");
-+    assert(parent->number_of_sux() == 1, "loop end blocks must have one successor (critical edges are split)");
- 
-     cur->set(BlockBegin::linear_scan_loop_header_flag);
-     cur->set(BlockBegin::backward_branch_target_flag);
- 
-     parent->set(BlockBegin::linear_scan_loop_end_flag);
--
--    // When a loop header is also the start of an exception handler, then the backward branch is
--    // an exception edge. Because such edges are usually critical edges which cannot be split, the
--    // loop must be excluded here from processing.
--    if (cur->is_set(BlockBegin::exception_entry_flag)) {
--      // Make sure that dominators are correct in this weird situation
--      _iterative_dominators = true;
--      return;
--    }
--    assert(parent->number_of_sux() == 1 && parent->sux_at(0) == cur,
--           "loop end blocks must have one successor (critical edges are split)");
--
-     _loop_end_blocks.append(parent);
-     return;
-   }
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_IR.hpp openjdk/hotspot/src/share/vm/c1/c1_IR.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_IR.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_IR.hpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_IR.hpp	1.100 07/05/05 17:05:04 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Instruction.cpp openjdk/hotspot/src/share/vm/c1/c1_Instruction.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Instruction.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Instruction.cpp	2008-12-05 16:41:21.767632024 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Instruction.cpp	1.90 07/05/05 17:05:05 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Instruction.hpp openjdk/hotspot/src/share/vm/c1/c1_Instruction.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Instruction.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Instruction.hpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Instruction.hpp	1.196 07/06/18 14:25:24 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_InstructionPrinter.cpp	1.126 07/06/18 14:25:24 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -851,4 +848,3 @@
- 
- 
- #endif // PRODUCT
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_InstructionPrinter.hpp	1.65 07/05/05 17:05:07 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIR.cpp openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LIR.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.cpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_LIR.cpp	1.119 07/06/18 14:25:24 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIR.hpp openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LIR.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIR.hpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_LIR.hpp	1.134 07/06/18 14:25:24 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -2035,4 +2032,3 @@
- 
- 
- inline LIR_Opr LIR_OprDesc::illegalOpr()   { return LIR_OprFact::illegalOpr; };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_LIRAssembler.cpp	1.135 07/07/02 16:50:41 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -795,6 +792,3 @@
-   }
- #endif
- }
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_LIRAssembler.hpp	1.116 07/05/05 17:05:08 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_LIRGenerator.cpp	1.24 08/11/07 15:47:10 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1222,8 +1219,8 @@
-         break;
-       case T_LONG:
-       case T_DOUBLE:
--        if (c->as_jint_hi_bits() != other->as_jint_hi_bits()) continue;
--        if (c->as_jint_lo_bits() != other->as_jint_lo_bits()) continue;
-+        if (c->as_jint_hi_bits() != other->as_jint_lo_bits()) continue;
-+        if (c->as_jint_lo_bits() != other->as_jint_hi_bits()) continue;
-         break;
-       case T_OBJECT:
-         if (c->as_jobject() != other->as_jobject()) continue;
-@@ -2535,5 +2532,3 @@
-   }
- #endif
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp	2008-12-05 16:41:21.777632175 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_LIRGenerator.hpp	1.14 07/06/18 14:25:25 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.cpp openjdk/hotspot/src/share/vm/c1/c1_LinearScan.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LinearScan.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_LinearScan.cpp	1.14 07/08/14 16:07:30 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.hpp openjdk/hotspot/src/share/vm/c1/c1_LinearScan.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_LinearScan.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_LinearScan.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_LinearScan.hpp	1.13 07/08/14 16:07:30 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp openjdk/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_MacroAssembler.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_MacroAssembler.hpp	1.23 07/05/05 17:05:08 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -83,5 +80,3 @@
-   int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2);
-   int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2, Register arg3);
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.cpp openjdk/hotspot/src/share/vm/c1/c1_Optimizer.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Optimizer.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Optimizer.cpp	1.72 08/11/07 15:47:10 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -330,6 +327,8 @@
-                 BlockBegin* fsux = if_->fsux();
-                 if (swapped) {
-                   cond = Instruction::mirror(cond);
-+                  tsux = if_->fsux();
-+                  fsux = if_->tsux();
-                 }
- 
-                 BlockBegin* tblock = tval->compare(cond, con, tsux, fsux);
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.hpp openjdk/hotspot/src/share/vm/c1/c1_Optimizer.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Optimizer.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Optimizer.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Optimizer.hpp	1.16 07/05/05 17:05:09 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -38,4 +35,3 @@
-   void eliminate_blocks();
-   void eliminate_null_checks();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.cpp openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_Runtime1.cpp	1.245 08/11/07 15:47:09 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -858,13 +855,6 @@
-     if (TracePatching) {
-       tty->print_cr("Deoptimizing for patching volatile field reference");
-     }
--    // It's possible the nmethod was invalidated in the last
--    // safepoint, but if it's still alive then make it not_entrant.
--    nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
--    if (nm != NULL) {
--      nm->make_not_entrant();
--    }
--
-     VM_DeoptimizeFrame deopt(thread, caller_frame.id());
-     VMThread::execute(&deopt);
- 
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.hpp openjdk/hotspot/src/share/vm/c1/c1_Runtime1.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_Runtime1.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_Runtime1.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_Runtime1.hpp	1.140 07/05/17 15:49:48 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueMap.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueMap.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_ValueMap.cpp	1.29 07/05/05 17:05:08 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueMap.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueMap.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueMap.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_ValueMap.hpp	1.22 07/05/05 17:05:07 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueSet.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueSet.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_ValueSet.cpp	1.12 07/05/05 17:05:09 JVM"
--#endif
- /*
-  * Copyright 2001-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueSet.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueSet.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueSet.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_ValueSet.hpp	1.15 07/05/05 17:05:09 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueStack.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueStack.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_ValueStack.cpp	1.65 07/05/05 17:05:09 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -286,4 +283,3 @@
-   Unimplemented();
- }
- #endif // PRODUCT
--
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueStack.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueStack.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueStack.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_ValueStack.hpp	1.51 07/05/05 17:05:10 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueType.cpp openjdk/hotspot/src/share/vm/c1/c1_ValueType.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueType.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueType.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_ValueType.cpp	1.22 07/05/05 17:05:10 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_ValueType.hpp openjdk/hotspot/src/share/vm/c1/c1_ValueType.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_ValueType.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_ValueType.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_ValueType.hpp	1.35 07/05/05 17:05:10 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_globals.cpp openjdk/hotspot/src/share/vm/c1/c1_globals.cpp
---- openjdk6/hotspot/src/share/vm/c1/c1_globals.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_globals.cpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c1_globals.cpp	1.11 07/05/05 17:05:09 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/c1/c1_globals.hpp openjdk/hotspot/src/share/vm/c1/c1_globals.hpp
---- openjdk6/hotspot/src/share/vm/c1/c1_globals.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/c1/c1_globals.hpp	2008-12-05 16:41:21.787632326 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c1_globals.hpp	1.104 07/05/05 17:05:10 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -333,4 +330,3 @@
- // #include "incls/_c1_globals_pd.hpp.incl"
- 
- C1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_NOTPRODUCT_FLAG)
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
---- openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bcEscapeAnalyzer.cpp	1.7 07/05/17 15:49:50 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1322,4 +1319,3 @@
-     deps->assert_unique_concrete_method(k, m);
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp
---- openjdk6/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/bcEscapeAnalyzer.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bcEscapeAnalyzer.hpp	1.6 07/05/05 17:05:11 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArray.cpp openjdk/hotspot/src/share/vm/ci/ciArray.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciArray.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciArray.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciArray.cpp	1.13 07/09/28 10:23:25 JVM"
--#endif
- /*
-  * Copyright 1999-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArray.hpp openjdk/hotspot/src/share/vm/ci/ciArray.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciArray.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciArray.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciArray.hpp	1.13 07/09/28 10:23:25 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.cpp openjdk/hotspot/src/share/vm/ci/ciArrayKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciArrayKlass.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciArrayKlass.cpp	1.14 07/05/05 17:05:12 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.hpp openjdk/hotspot/src/share/vm/ci/ciArrayKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciArrayKlass.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciArrayKlass.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciArrayKlass.hpp	1.15 07/05/05 17:05:12 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciArrayKlassKlass.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciArrayKlassKlass.hpp	1.12 07/05/05 17:05:12 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciCallProfile.hpp openjdk/hotspot/src/share/vm/ci/ciCallProfile.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciCallProfile.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciCallProfile.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciCallProfile.hpp	1.17 07/05/05 17:05:12 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciClassList.hpp openjdk/hotspot/src/share/vm/ci/ciClassList.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciClassList.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciClassList.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciClassList.hpp	1.21 07/05/05 17:05:11 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstant.cpp openjdk/hotspot/src/share/vm/ci/ciConstant.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciConstant.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciConstant.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciConstant.cpp	1.13 07/05/05 17:05:12 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstant.hpp openjdk/hotspot/src/share/vm/ci/ciConstant.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciConstant.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciConstant.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciConstant.hpp	1.18 07/09/28 10:23:25 JVM"
--#endif
- /*
-  * Copyright 1999-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -113,4 +110,3 @@
-   // Debugging output
-   void print();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciConstantPoolCache.cpp	1.12 07/05/05 17:05:12 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciConstantPoolCache.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciConstantPoolCache.hpp	1.11 07/05/05 17:05:11 JVM"
--#endif
- /*
-  * Copyright 1999-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -48,4 +45,3 @@
- 
-   void print();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciEnv.cpp openjdk/hotspot/src/share/vm/ci/ciEnv.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciEnv.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciEnv.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciEnv.cpp	1.128 07/05/17 15:49:53 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciEnv.hpp openjdk/hotspot/src/share/vm/ci/ciEnv.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciEnv.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciEnv.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciEnv.hpp	1.70 07/05/05 17:05:11 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -360,5 +357,3 @@
-   void record_method_not_compilable(const char* reason, bool all_tiers = true);
-   void record_out_of_memory_failure();
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.cpp openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciExceptionHandler.cpp	1.12 07/05/05 17:05:13 JVM"
--#endif
- /*
-  * Copyright 1999-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.hpp openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciExceptionHandler.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciExceptionHandler.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciExceptionHandler.hpp	1.12 07/05/05 17:05:13 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -76,4 +73,3 @@
- 
-   void      print();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciField.cpp openjdk/hotspot/src/share/vm/ci/ciField.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciField.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciField.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciField.cpp	1.34 07/08/27 14:10:22 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciField.hpp openjdk/hotspot/src/share/vm/ci/ciField.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciField.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciField.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciField.hpp	1.23 07/09/28 10:23:24 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciFlags.cpp openjdk/hotspot/src/share/vm/ci/ciFlags.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciFlags.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciFlags.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciFlags.cpp	1.12 07/09/28 10:23:24 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciFlags.hpp openjdk/hotspot/src/share/vm/ci/ciFlags.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciFlags.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciFlags.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciFlags.hpp	1.15 07/09/28 10:23:24 JVM"
--#endif
- /*
-  * Copyright 1999-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstance.cpp openjdk/hotspot/src/share/vm/ci/ciInstance.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciInstance.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstance.cpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciInstance.cpp	1.17 07/09/28 10:23:24 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstance.hpp openjdk/hotspot/src/share/vm/ci/ciInstance.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciInstance.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstance.hpp	2008-12-05 16:41:21.797632477 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciInstance.hpp	1.15 07/09/28 10:23:24 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -62,4 +59,3 @@
-   // Constant value of a field at the specified offset.
-   ciConstant field_value_by_offset(int field_offset);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.cpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciInstanceKlass.cpp	1.45 07/09/28 10:23:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.hpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlass.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlass.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciInstanceKlass.hpp	1.36 07/09/28 10:23:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -190,4 +187,3 @@
-   bool is_instance_klass() { return true; }
-   bool is_java_klass()     { return true; }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciInstanceKlassKlass.cpp	1.10 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciInstanceKlassKlass.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciInstanceKlassKlass.hpp	1.12 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlass.cpp openjdk/hotspot/src/share/vm/ci/ciKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciKlass.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciKlass.cpp	1.31 07/09/28 10:23:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -236,4 +233,3 @@
- void ciKlass::print_name_on(outputStream* st) {
-   name()->print_symbol_on(st);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlass.hpp openjdk/hotspot/src/share/vm/ci/ciKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciKlass.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciKlass.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciKlass.hpp	1.27 07/09/28 10:23:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -120,4 +117,3 @@
- 
-   void print_name_on(outputStream* st);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciKlassKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciKlassKlass.cpp	1.10 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciKlassKlass.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciKlassKlass.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciKlassKlass.hpp	1.13 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -52,4 +49,3 @@
-   // Return the distinguished ciKlassKlass instance.
-   static ciKlassKlass* make();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethod.cpp openjdk/hotspot/src/share/vm/ci/ciMethod.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethod.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciMethod.cpp	1.109 07/09/28 10:23:23 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1043,5 +1040,3 @@
-     st->print(" loaded=false");
-   }
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethod.hpp openjdk/hotspot/src/share/vm/ci/ciMethod.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethod.hpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethod.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciMethod.hpp	1.64 07/09/28 10:23:22 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -247,4 +244,3 @@
-   void print_name(outputStream* st = tty);
-   void print_short_name(outputStream* st = tty);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.cpp openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.cpp	2008-11-25 10:12:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciMethodBlocks.cpp	1.6 07/09/28 10:23:22 JVM"
--#endif
- /*
-  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.hpp openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethodBlocks.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethodBlocks.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciMethodBlocks.hpp	1.5 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodData.cpp openjdk/hotspot/src/share/vm/ci/ciMethodData.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethodData.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethodData.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciMethodData.cpp	1.29 07/09/28 10:23:22 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodData.hpp openjdk/hotspot/src/share/vm/ci/ciMethodData.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethodData.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethodData.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciMethodData.hpp	1.28 07/09/28 10:23:22 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.cpp openjdk/hotspot/src/share/vm/ci/ciMethodKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethodKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciMethodKlass.cpp	1.10 07/05/05 17:05:15 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.hpp openjdk/hotspot/src/share/vm/ci/ciMethodKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciMethodKlass.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciMethodKlass.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciMethodKlass.hpp	1.13 07/05/05 17:05:15 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -49,4 +46,3 @@
-   // Return the distinguished ciMethodKlass instance.
-   static ciMethodKlass* make();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciNullObject.cpp openjdk/hotspot/src/share/vm/ci/ciNullObject.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciNullObject.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciNullObject.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciNullObject.cpp	1.12 07/09/28 10:23:22 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -49,4 +46,3 @@
- ciNullObject* ciNullObject::make() {
-   return CURRENT_ENV->_null_object_instance->as_null_object();
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciNullObject.hpp openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciNullObject.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciNullObject.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciNullObject.hpp	1.13 07/09/28 10:23:21 JVM"
--#endif
- /*
-  * Copyright 1999-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -50,5 +47,3 @@
-   // Get the distinguished instance of this klass.
-   static ciNullObject* make();
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArray.cpp openjdk/hotspot/src/share/vm/ci/ciObjArray.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjArray.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjArray.cpp	1970-01-01 01:00:00.000000000 +0100
-@@ -1,46 +0,0 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciObjArray.cpp	1.1 07/10/23 13:12:37 JVM"
--#endif
--/*
-- * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-- * 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.
-- *  
-- */
--
--#include "incls/_precompiled.incl"
--#include "incls/_ciObjArray.cpp.incl"
--
--// ciObjArray
--//
--// This class represents an objArrayOop in the HotSpot virtual
--// machine.
--
--ciObject* ciObjArray::obj_at(int index) {
--  VM_ENTRY_MARK;
--  objArrayOop array = get_objArrayOop();
--  if (index < 0 || index >= array->length()) return NULL;
--  oop o = array->obj_at(index);
--  if (o == NULL) {
--    return ciNullObject::make();
--  } else {
--    return CURRENT_ENV->get_object(o);
--  }
--}
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArray.hpp openjdk/hotspot/src/share/vm/ci/ciObjArray.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjArray.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjArray.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciObjArray.hpp	1.13 07/10/23 13:12:55 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -46,6 +43,4 @@
- public:
-   // What kind of ciObject is this?
-   bool is_obj_array() { return true; }
--
--  ciObject* obj_at(int index);
- };
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciObjArrayKlass.cpp	1.23 07/05/05 17:05:15 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlass.hpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciObjArrayKlass.hpp	1.14 07/05/05 17:05:16 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -72,4 +69,3 @@
- 
-   static ciObjArrayKlass* make(ciKlass* element_klass);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.cpp	2008-12-05 16:41:21.807632628 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciObjArrayKlassKlass.cpp	1.10 07/05/05 17:05:15 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjArrayKlassKlass.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciObjArrayKlassKlass.hpp	1.12 07/05/05 17:05:16 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -51,4 +48,3 @@
-   // Return the distinguished ciObjArrayKlassKlass instance.
-   static ciObjArrayKlassKlass* make();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObject.cpp openjdk/hotspot/src/share/vm/ci/ciObject.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciObject.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObject.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciObject.cpp	1.29 07/09/28 10:23:21 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -216,4 +213,3 @@
-     GUARDED_VM_ENTRY(get_oop()->print_on(st);)
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObject.hpp openjdk/hotspot/src/share/vm/ci/ciObject.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciObject.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObject.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciObject.hpp	1.26 07/09/28 10:23:21 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -261,4 +258,3 @@
-   // Print debugging output about the oop this ciObject represents.
-   void print_oop(outputStream* st = tty);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.cpp openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciObjectFactory.cpp	1.39 07/05/17 15:50:05 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -648,4 +645,3 @@
-              _ci_objects->length(), _unloaded_methods->length(),
-              _unloaded_klasses->length());
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.hpp openjdk/hotspot/src/share/vm/ci/ciObjectFactory.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciObjectFactory.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciObjectFactory.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciObjectFactory.hpp	1.20 07/05/17 15:50:07 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -111,5 +108,3 @@
-   void print_contents();
-   void print();
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSignature.cpp openjdk/hotspot/src/share/vm/ci/ciSignature.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciSignature.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciSignature.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciSignature.cpp	1.21 07/05/05 17:05:16 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -111,4 +108,3 @@
-   _accessing_klass->print();
-   tty->print(" address=0x%x>", (address)this);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSignature.hpp openjdk/hotspot/src/share/vm/ci/ciSignature.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciSignature.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciSignature.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciSignature.hpp	1.16 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 1999-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -57,6 +54,3 @@
-   void print_signature();
-   void print();
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciStreams.cpp openjdk/hotspot/src/share/vm/ci/ciStreams.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciStreams.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciStreams.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciStreams.cpp	1.30 07/05/05 17:05:16 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -368,5 +365,3 @@
-   int name_and_type_index = cpool->name_and_type_ref_index_at(method_index);
-   return cpool->signature_ref_index_at(name_and_type_index);
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciStreams.hpp openjdk/hotspot/src/share/vm/ci/ciStreams.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciStreams.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciStreams.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciStreams.hpp	1.36 07/05/05 17:05:14 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -370,7 +367,3 @@
-     return _method->_exception_handlers[_pos];
-   }
- };
--
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbol.cpp openjdk/hotspot/src/share/vm/ci/ciSymbol.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciSymbol.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciSymbol.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciSymbol.cpp	1.23 07/09/28 10:23:21 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -109,4 +106,3 @@
- ciSymbol* ciSymbol::make(const char* s) {
-   GUARDED_VM_ENTRY(return make_impl(s);)
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbol.hpp openjdk/hotspot/src/share/vm/ci/ciSymbol.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciSymbol.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciSymbol.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciSymbol.hpp	1.16 07/09/28 10:23:21 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.cpp openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciSymbolKlass.cpp	1.10 07/05/05 17:05:16 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.hpp openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciSymbolKlass.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciSymbolKlass.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciSymbolKlass.hpp	1.13 07/05/05 17:05:17 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -53,4 +50,3 @@
-   // Return the distinguished ciSymbolKlass instance.
-   static ciSymbolKlass* make();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciType.cpp openjdk/hotspot/src/share/vm/ci/ciType.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciType.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciType.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciType.cpp	1.18 07/09/28 10:23:21 JVM"
--#endif
- /*
-  * Copyright 2000-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciType.hpp openjdk/hotspot/src/share/vm/ci/ciType.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciType.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciType.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciType.hpp	1.15 07/09/28 10:23:20 JVM"
--#endif
- /*
-  * Copyright 2000-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArray.cpp openjdk/hotspot/src/share/vm/ci/ciTypeArray.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeArray.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeArray.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciTypeArray.cpp	1.6 07/05/05 17:05:17 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArray.hpp openjdk/hotspot/src/share/vm/ci/ciTypeArray.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeArray.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeArray.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciTypeArray.hpp	1.13 07/05/05 17:05:17 JVM"
--#endif
- /*
-  * Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciTypeArrayKlass.cpp	1.14 07/05/05 17:05:17 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -56,4 +53,3 @@
- ciTypeArrayKlass* ciTypeArrayKlass::make(BasicType t) {
-   GUARDED_VM_ENTRY(return make_impl(t);)
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlass.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciTypeArrayKlass.hpp	1.13 07/05/05 17:05:17 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.cpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciTypeArrayKlassKlass.cpp	1.10 07/05/05 17:05:17 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeArrayKlassKlass.hpp	2008-12-05 16:41:21.817632778 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciTypeArrayKlassKlass.hpp	1.12 07/05/05 17:05:18 JVM"
--#endif
- /*
-  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.cpp openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciTypeFlow.cpp	1.47 07/09/28 10:23:20 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.hpp openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciTypeFlow.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciTypeFlow.hpp	1.26 08/11/24 12:20:59 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -130,7 +127,7 @@
- 
-   // Used as a combined index for locals and temps
-   enum Cell {
--    Cell_0, Cell_max = INT_MAX
-+    Cell_0
-   };
- 
-   // A StateVector summarizes the type information at some
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciUtilities.cpp openjdk/hotspot/src/share/vm/ci/ciUtilities.cpp
---- openjdk6/hotspot/src/share/vm/ci/ciUtilities.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciUtilities.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ciUtilities.cpp	1.11 07/05/05 17:05:18 JVM"
--#endif
- /*
-  * Copyright 1999-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/ciUtilities.hpp openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp
---- openjdk6/hotspot/src/share/vm/ci/ciUtilities.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/ciUtilities.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ciUtilities.hpp	1.20 07/05/05 17:05:18 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -107,4 +104,3 @@
- 
- const char* basictype_to_str(BasicType t);
- const char  basictype_to_char(BasicType t);
--
-diff -ruNb openjdk6/hotspot/src/share/vm/ci/compilerInterface.hpp openjdk/hotspot/src/share/vm/ci/compilerInterface.hpp
---- openjdk6/hotspot/src/share/vm/ci/compilerInterface.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/ci/compilerInterface.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compilerInterface.hpp	1.11 07/05/05 17:05:18 JVM"
--#endif
- /*
-  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileError.cpp openjdk/hotspot/src/share/vm/classfile/classFileError.cpp
---- openjdk6/hotspot/src/share/vm/classfile/classFileError.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classFileError.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)classFileError.cpp	1.12 07/05/05 17:06:44 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileParser.cpp openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp
---- openjdk6/hotspot/src/share/vm/classfile/classFileParser.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)classFileParser.cpp	1.280 07/07/09 11:19:49 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -4015,4 +4012,3 @@
-   }
-   return NULL;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileParser.hpp openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp
---- openjdk6/hotspot/src/share/vm/classfile/classFileParser.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classFileParser.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)classFileParser.hpp	1.85 07/07/09 11:19:50 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileStream.cpp openjdk/hotspot/src/share/vm/classfile/classFileStream.cpp
---- openjdk6/hotspot/src/share/vm/classfile/classFileStream.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classFileStream.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)classFileStream.cpp	1.41 07/05/31 14:29:24 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classFileStream.hpp openjdk/hotspot/src/share/vm/classfile/classFileStream.hpp
---- openjdk6/hotspot/src/share/vm/classfile/classFileStream.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classFileStream.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)classFileStream.hpp	1.33 07/05/31 14:29:25 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classLoader.cpp openjdk/hotspot/src/share/vm/classfile/classLoader.cpp
---- openjdk6/hotspot/src/share/vm/classfile/classLoader.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classLoader.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)classLoader.cpp	1.188 07/07/16 11:55:31 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/classLoader.hpp openjdk/hotspot/src/share/vm/classfile/classLoader.hpp
---- openjdk6/hotspot/src/share/vm/classfile/classLoader.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/classLoader.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)classLoader.hpp	1.66 07/07/16 11:55:32 JVM"
--#endif 
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/dictionary.cpp openjdk/hotspot/src/share/vm/classfile/dictionary.cpp
---- openjdk6/hotspot/src/share/vm/classfile/dictionary.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/dictionary.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dictionary.cpp	1.28 08/11/24 12:21:02 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -158,8 +155,8 @@
-         for (int i = ik->previous_versions()->length() - 1; i >= 0; i--) {
-           // check the previous versions array for GC'ed weak refs
-           PreviousVersionNode * pv_node = ik->previous_versions()->at(i);
--          jobject cp_ref = pv_node->prev_constant_pool();
--          assert(cp_ref != NULL, "cp ref was unexpectedly cleared");
-+          jweak cp_ref = pv_node->prev_constant_pool();
-+          assert(cp_ref != NULL, "weak cp ref was unexpectedly cleared");
-           if (cp_ref == NULL) {
-             delete pv_node;
-             ik->previous_versions()->remove_at(i);
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/dictionary.hpp openjdk/hotspot/src/share/vm/classfile/dictionary.hpp
---- openjdk6/hotspot/src/share/vm/classfile/dictionary.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)dictionary.hpp	1.15 07/05/05 17:05:47 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -220,4 +217,3 @@
-     tty->print_cr("pd set = #%d", count);
-   }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaAssertions.cpp openjdk/hotspot/src/share/vm/classfile/javaAssertions.cpp
---- openjdk6/hotspot/src/share/vm/classfile/javaAssertions.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/javaAssertions.cpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)javaAssertions.cpp	1.14 07/05/05 17:06:50 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaAssertions.hpp openjdk/hotspot/src/share/vm/classfile/javaAssertions.hpp
---- openjdk6/hotspot/src/share/vm/classfile/javaAssertions.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/javaAssertions.hpp	2008-12-05 16:41:21.827632929 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)javaAssertions.hpp	1.11 07/05/05 17:06:50 JVM"
--#endif
- /*
-  * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaClasses.cpp openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp
---- openjdk6/hotspot/src/share/vm/classfile/javaClasses.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)javaClasses.cpp	1.250 08/01/17 09:41:13 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -146,43 +143,13 @@
-   jstring js = NULL;
-   { JavaThread* thread = (JavaThread*)THREAD;
-     assert(thread->is_Java_thread(), "must be java thread");
--    HandleMark hm(thread);    
-     ThreadToNativeFromVM ttn(thread);
-+    HandleMark hm(thread);
-     js = (_to_java_string_fn)(thread->jni_environment(), str);
-   }
-   return Handle(THREAD, JNIHandles::resolve(js));
- }
- 
--// Converts a Java String to a native C string that can be used for
--// native OS calls.
--char* java_lang_String::as_platform_dependent_str(Handle java_string, TRAPS) {
--
--  typedef char* (*to_platform_string_fn_t)(JNIEnv*, jstring, bool*);
--  static to_platform_string_fn_t _to_platform_string_fn = NULL;
--
--  if (_to_platform_string_fn == NULL) {
--    void *lib_handle = os::native_java_library();
--    _to_platform_string_fn = CAST_TO_FN_PTR(to_platform_string_fn_t, hpi::dll_lookup(lib_handle, "GetStringPlatformChars"));
--    if (_to_platform_string_fn == NULL) {
--      fatal("GetStringPlatformChars missing");
--    }
--  }
--
--  char *native_platform_string;
--  { JavaThread* thread = (JavaThread*)THREAD;
--    assert(thread->is_Java_thread(), "must be java thread");
--    JNIEnv *env = thread->jni_environment();
--    jstring js = (jstring) JNIHandles::make_local(env, java_string());
--    bool is_copy;
--    HandleMark hm(thread);    
--    ThreadToNativeFromVM ttn(thread);
--    native_platform_string = (_to_platform_string_fn)(env, js, &is_copy);
--    assert(is_copy == JNI_TRUE, "is_copy value changed");
--    JNIHandles::destroy_local(js);
--  }
--  return native_platform_string;
--}
--
- Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jchar to_char, TRAPS) {
-   oop          obj    = java_string();
-   // Typical usage is to convert all '/' to '.' in string.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/javaClasses.hpp openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp
---- openjdk6/hotspot/src/share/vm/classfile/javaClasses.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/javaClasses.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)javaClasses.hpp	1.158 08/01/17 09:41:12 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -99,7 +96,6 @@
-   // String converters
-   static char*  as_utf8_string(oop java_string);
-   static char*  as_utf8_string(oop java_string, int start, int len);
--  static char*  as_platform_dependent_str(Handle java_string, TRAPS);
-   static jchar* as_unicode_string(oop java_string, int& length);
- 
-   static bool equals(oop java_string, jchar* chars, int len);
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.cpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp
---- openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)loaderConstraints.cpp	1.19 07/05/17 15:50:23 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.hpp openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp
---- openjdk6/hotspot/src/share/vm/classfile/loaderConstraints.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/loaderConstraints.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)loaderConstraints.hpp	1.14 07/05/05 17:05:52 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/placeholders.cpp openjdk/hotspot/src/share/vm/classfile/placeholders.cpp
---- openjdk6/hotspot/src/share/vm/classfile/placeholders.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/placeholders.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)placeholders.cpp	1.20 07/05/17 15:50:29 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -270,5 +267,3 @@
-   }
- }
- #endif
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/placeholders.hpp openjdk/hotspot/src/share/vm/classfile/placeholders.hpp
---- openjdk6/hotspot/src/share/vm/classfile/placeholders.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/placeholders.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)placeholders.hpp	1.21 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -332,5 +329,3 @@
-   void print() const  PRODUCT_RETURN;
-   void verify() const;
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.cpp openjdk/hotspot/src/share/vm/classfile/resolutionErrors.cpp
---- openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/resolutionErrors.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)resolutionErrors.cpp	1.6 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -120,5 +117,3 @@
-     }
-   }
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.hpp openjdk/hotspot/src/share/vm/classfile/resolutionErrors.hpp
---- openjdk6/hotspot/src/share/vm/classfile/resolutionErrors.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/resolutionErrors.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)resolutionErrors.hpp	1.6 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -100,4 +97,3 @@
-   // GC support
-   void oops_do(OopClosure* blk);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.cpp openjdk/hotspot/src/share/vm/classfile/stackMapFrame.cpp
---- openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/stackMapFrame.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)stackMapFrame.cpp	1.24 07/05/05 17:06:57 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -304,4 +301,3 @@
- }
- 
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.hpp openjdk/hotspot/src/share/vm/classfile/stackMapFrame.hpp
---- openjdk6/hotspot/src/share/vm/classfile/stackMapFrame.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/stackMapFrame.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)stackMapFrame.hpp	1.20 07/05/05 17:06:57 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -227,4 +224,3 @@
-   // Debugging
-   void print() const PRODUCT_RETURN;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapTable.cpp openjdk/hotspot/src/share/vm/classfile/stackMapTable.cpp
---- openjdk6/hotspot/src/share/vm/classfile/stackMapTable.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/stackMapTable.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)stackMapTable.cpp	1.28 07/05/05 17:06:53 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -428,4 +425,3 @@
-     "reserved frame type", CHECK_VERIFY_(pre_frame->verifier(), NULL));
-   return NULL;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/stackMapTable.hpp openjdk/hotspot/src/share/vm/classfile/stackMapTable.hpp
---- openjdk6/hotspot/src/share/vm/classfile/stackMapTable.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/stackMapTable.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)stackMapTable.hpp	1.21 07/05/05 17:06:57 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/symbolTable.cpp openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp
---- openjdk6/hotspot/src/share/vm/classfile/symbolTable.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)symbolTable.cpp	1.69 07/05/05 17:05:55 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/symbolTable.hpp openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp
---- openjdk6/hotspot/src/share/vm/classfile/symbolTable.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/symbolTable.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)symbolTable.hpp	1.48 07/05/05 17:05:56 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/systemDictionary.cpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp
---- openjdk6/hotspot/src/share/vm/classfile/systemDictionary.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.cpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)systemDictionary.cpp	1.367 08/01/17 09:41:11 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1245,9 +1242,7 @@
-     oop obj = (oop) result.get_jobject();
-     if (obj == NULL) { return nk; }
- 
--    Handle h_obj(THREAD, obj);
--    char* new_class_name = java_lang_String::as_platform_dependent_str(h_obj, 
--                                                                  CHECK_(nk));
-+    char* new_class_name = java_lang_String::as_utf8_string(obj);
- 
-     // lock the loader 
-     // we use this lock because JVMTI does.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/systemDictionary.hpp openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp
---- openjdk6/hotspot/src/share/vm/classfile/systemDictionary.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/systemDictionary.hpp	2008-12-05 16:41:21.837633080 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)systemDictionary.hpp	1.156 07/08/09 09:11:58 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verificationType.cpp openjdk/hotspot/src/share/vm/classfile/verificationType.cpp
---- openjdk6/hotspot/src/share/vm/classfile/verificationType.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/verificationType.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)verificationType.cpp	1.16 07/05/05 17:07:01 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verificationType.hpp openjdk/hotspot/src/share/vm/classfile/verificationType.hpp
---- openjdk6/hotspot/src/share/vm/classfile/verificationType.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/verificationType.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)verificationType.hpp	1.17 07/05/05 17:07:01 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verifier.cpp openjdk/hotspot/src/share/vm/classfile/verifier.cpp
---- openjdk6/hotspot/src/share/vm/classfile/verifier.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/verifier.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)verifier.cpp	1.113 07/05/23 10:53:19 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/verifier.hpp openjdk/hotspot/src/share/vm/classfile/verifier.hpp
---- openjdk6/hotspot/src/share/vm/classfile/verifier.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/verifier.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)verifier.hpp	1.41 07/05/05 17:07:02 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/vmSymbols.cpp openjdk/hotspot/src/share/vm/classfile/vmSymbols.cpp
---- openjdk6/hotspot/src/share/vm/classfile/vmSymbols.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vmSymbols.cpp	1.29 07/07/19 19:08:29 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/classfile/vmSymbols.hpp openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp
---- openjdk6/hotspot/src/share/vm/classfile/vmSymbols.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/classfile/vmSymbols.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vmSymbols.hpp	1.166 07/11/01 16:55:02 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -61,17 +58,12 @@
-   template(java_lang_ThreadDeath,                     "java/lang/ThreadDeath")                    \
-   template(java_lang_Boolean,                         "java/lang/Boolean")                        \
-   template(java_lang_Character,                       "java/lang/Character")                      \
--  template(java_lang_Character_CharacterCache,        "java/lang/Character$CharacterCache")       \
-   template(java_lang_Float,                           "java/lang/Float")                          \
-   template(java_lang_Double,                          "java/lang/Double")                         \
-   template(java_lang_Byte,                            "java/lang/Byte")                           \
--  template(java_lang_Byte_Cache,                      "java/lang/Byte$ByteCache")                 \
-   template(java_lang_Short,                           "java/lang/Short")                          \
--  template(java_lang_Short_ShortCache,                "java/lang/Short$ShortCache")               \
-   template(java_lang_Integer,                         "java/lang/Integer")                        \
--  template(java_lang_Integer_IntegerCache,            "java/lang/Integer$IntegerCache")           \
-   template(java_lang_Long,                            "java/lang/Long")                           \
--  template(java_lang_Long_LongCache,                  "java/lang/Long$LongCache")                 \
-   template(java_lang_Shutdown,                        "java/lang/Shutdown")                       \
-   template(java_lang_ref_Reference,                   "java/lang/ref/Reference")                  \
-   template(java_lang_ref_SoftReference,               "java/lang/ref/SoftReference")              \
-@@ -99,7 +91,6 @@
-   template(java_util_Vector,                          "java/util/Vector")                         \
-   template(java_util_AbstractList,                    "java/util/AbstractList")                   \
-   template(java_util_Hashtable,                       "java/util/Hashtable")                      \
--  template(java_util_HashMap,                         "java/util/HashMap")                        \
-   template(java_lang_Compiler,                        "java/lang/Compiler")                       \
-   template(sun_misc_Signal,                           "sun/misc/Signal")                          \
-   template(java_lang_AssertionStatusDirectives,       "java/lang/AssertionStatusDirectives")      \
-@@ -283,9 +274,7 @@
-   template(exclusive_owner_thread_name,               "exclusiveOwnerThread")                     \
-   template(park_blocker_name,                         "parkBlocker")                              \
-   template(park_event_name,                           "nativeParkEventPointer")                   \
--  template(cache_field_name,                          "cache")                                    \
-   template(value_name,                                "value")                                    \
--  template(frontCacheEnabled_name,                    "frontCacheEnabled")                        \
-                                                                                                   \
-   /* non-intrinsic name/signature pairs: */                                                       \
-   template(register_method_name,                      "register")                                 \
-diff -ruNb openjdk6/hotspot/src/share/vm/code/codeBlob.cpp openjdk/hotspot/src/share/vm/code/codeBlob.cpp
---- openjdk6/hotspot/src/share/vm/code/codeBlob.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/codeBlob.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)codeBlob.cpp	1.128 07/05/05 17:05:19 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/codeBlob.hpp openjdk/hotspot/src/share/vm/code/codeBlob.hpp
---- openjdk6/hotspot/src/share/vm/code/codeBlob.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/codeBlob.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)codeBlob.hpp	1.125 07/05/05 17:05:18 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/codeCache.cpp openjdk/hotspot/src/share/vm/code/codeCache.cpp
---- openjdk6/hotspot/src/share/vm/code/codeCache.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)codeCache.cpp	1.133 07/09/01 18:01:02 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/codeCache.hpp openjdk/hotspot/src/share/vm/code/codeCache.hpp
---- openjdk6/hotspot/src/share/vm/code/codeCache.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/codeCache.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)codeCache.hpp	1.68 07/09/01 18:01:02 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/compiledIC.cpp openjdk/hotspot/src/share/vm/code/compiledIC.cpp
---- openjdk6/hotspot/src/share/vm/code/compiledIC.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/compiledIC.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compiledIC.cpp	1.157 07/05/05 17:05:18 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/compiledIC.hpp openjdk/hotspot/src/share/vm/code/compiledIC.hpp
---- openjdk6/hotspot/src/share/vm/code/compiledIC.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/compiledIC.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compiledIC.hpp	1.52 07/05/05 17:05:19 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -242,5 +239,3 @@
- inline CompiledStaticCall* compiledStaticCall_at(Relocation* call_site) {
-   return compiledStaticCall_at(call_site->addr());
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/compressedStream.cpp openjdk/hotspot/src/share/vm/code/compressedStream.cpp
---- openjdk6/hotspot/src/share/vm/code/compressedStream.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/compressedStream.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compressedStream.cpp	1.27 07/05/05 17:05:20 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/compressedStream.hpp openjdk/hotspot/src/share/vm/code/compressedStream.hpp
---- openjdk6/hotspot/src/share/vm/code/compressedStream.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/compressedStream.hpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compressedStream.hpp	1.27 07/05/05 17:05:20 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfo.cpp openjdk/hotspot/src/share/vm/code/debugInfo.cpp
---- openjdk6/hotspot/src/share/vm/code/debugInfo.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/debugInfo.cpp	2008-12-05 16:41:21.847633231 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)debugInfo.cpp	1.35 07/07/27 16:12:09 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -253,4 +250,3 @@
-   }
- }
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfo.hpp openjdk/hotspot/src/share/vm/code/debugInfo.hpp
---- openjdk6/hotspot/src/share/vm/code/debugInfo.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/debugInfo.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)debugInfo.hpp	1.35 07/07/27 16:10:59 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -273,4 +270,3 @@
-   void write_handle(jobject h);
-   void write_bci(int bci) { write_int(bci - InvocationEntryBci); }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfoRec.cpp openjdk/hotspot/src/share/vm/code/debugInfoRec.cpp
---- openjdk6/hotspot/src/share/vm/code/debugInfoRec.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/debugInfoRec.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)debugInfoRec.cpp	1.55 07/05/24 14:38:33 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/debugInfoRec.hpp openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp
---- openjdk6/hotspot/src/share/vm/code/debugInfoRec.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/debugInfoRec.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)debugInfoRec.hpp	1.38 07/05/24 14:38:33 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -183,4 +180,3 @@
-  public:
-   enum { serialized_null = 0 };
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/dependencies.cpp openjdk/hotspot/src/share/vm/code/dependencies.cpp
---- openjdk6/hotspot/src/share/vm/code/dependencies.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/dependencies.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dependencies.cpp	1.18 08/02/29 12:46:18 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -885,14 +882,6 @@
-   // Must not move the class hierarchy during this check:
-   assert_locked_or_safepoint(Compile_lock);
- 
--  int nof_impls = instanceKlass::cast(context_type)->nof_implementors();
--  if (nof_impls > 1) {
--    // Avoid this case: *I.m > { A.m, C }; B.m > C
--    // %%% Until this is fixed more systematically, bail out.
--    // See corresponding comment in find_witness_anywhere.
--    return context_type;
--  }
--
-   assert(!is_participant(new_type), "only old classes are participants");
-   if (participants_hide_witnesses) {
-     // If the new type is a subtype of a participant, we are done.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/dependencies.hpp openjdk/hotspot/src/share/vm/code/dependencies.hpp
---- openjdk6/hotspot/src/share/vm/code/dependencies.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/dependencies.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)dependencies.hpp	1.12 07/09/01 18:01:02 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.cpp openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp
---- openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)exceptionHandlerTable.cpp	1.33 07/05/05 17:05:20 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.hpp openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
---- openjdk6/hotspot/src/share/vm/code/exceptionHandlerTable.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)exceptionHandlerTable.hpp	1.30 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/icBuffer.cpp openjdk/hotspot/src/share/vm/code/icBuffer.cpp
---- openjdk6/hotspot/src/share/vm/code/icBuffer.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/icBuffer.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)icBuffer.cpp	1.70 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -187,6 +184,3 @@
-   ICStub* stub = ICStub_from_destination_address(ic->stub_address());
-   return stub->cached_oop();  
- }
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/icBuffer.hpp openjdk/hotspot/src/share/vm/code/icBuffer.hpp
---- openjdk6/hotspot/src/share/vm/code/icBuffer.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/icBuffer.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)icBuffer.hpp	1.30 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/location.cpp openjdk/hotspot/src/share/vm/code/location.cpp
---- openjdk6/hotspot/src/share/vm/code/location.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/location.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)location.cpp	1.40 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -70,4 +67,3 @@
-   if ((offset_in_bytes % BytesPerInt) != 0)  return false;
-   return (offset_in_bytes / BytesPerInt) < (OFFSET_MASK >> OFFSET_SHIFT);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/location.hpp openjdk/hotspot/src/share/vm/code/location.hpp
---- openjdk6/hotspot/src/share/vm/code/location.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/location.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)location.hpp	1.47 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/nmethod.cpp openjdk/hotspot/src/share/vm/code/nmethod.cpp
---- openjdk6/hotspot/src/share/vm/code/nmethod.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)nmethod.cpp	1.371 08/02/29 12:46:11 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1974,7 +1971,7 @@
-     if (ctxk != NULL) {
-       Klass* k = Klass::cast(ctxk);
-       if (k->oop_is_instance() && ((instanceKlass*)k)->is_dependent_nmethod(this)) {
--        tty->print_cr("   [nmethod<=klass]%s", k->external_name());
-+        tty->print("   [nmethod<=klass]%s", k->external_name());
-       }
-     }
-     deps.log_dependency();  // put it into the xml log also
-diff -ruNb openjdk6/hotspot/src/share/vm/code/nmethod.hpp openjdk/hotspot/src/share/vm/code/nmethod.hpp
---- openjdk6/hotspot/src/share/vm/code/nmethod.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/nmethod.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)nmethod.hpp	1.171 07/09/01 18:01:02 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -579,5 +576,3 @@
-     lock_nmethod(_nm);
-   }
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/oopRecorder.cpp openjdk/hotspot/src/share/vm/code/oopRecorder.cpp
---- openjdk6/hotspot/src/share/vm/code/oopRecorder.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/oopRecorder.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)oopRecorder.cpp	1.22 07/05/05 17:05:22 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -157,5 +154,3 @@
-   }
-   return -1;
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/oopRecorder.hpp openjdk/hotspot/src/share/vm/code/oopRecorder.hpp
---- openjdk6/hotspot/src/share/vm/code/oopRecorder.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/oopRecorder.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oopRecorder.hpp	1.22 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/pcDesc.cpp openjdk/hotspot/src/share/vm/code/pcDesc.cpp
---- openjdk6/hotspot/src/share/vm/code/pcDesc.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/pcDesc.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)pcDesc.cpp	1.31 07/05/24 14:38:34 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -62,4 +59,3 @@
-   //Unimplemented();
-   return true;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/pcDesc.hpp openjdk/hotspot/src/share/vm/code/pcDesc.hpp
---- openjdk6/hotspot/src/share/vm/code/pcDesc.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/pcDesc.hpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)pcDesc.hpp	1.37 07/05/24 14:38:34 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -62,4 +59,3 @@
-   void print(nmethod* code);
-   bool verify(nmethod* code);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/relocInfo.cpp openjdk/hotspot/src/share/vm/code/relocInfo.cpp
---- openjdk6/hotspot/src/share/vm/code/relocInfo.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/relocInfo.cpp	2008-12-05 16:41:21.857633382 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)relocInfo.cpp	1.89 07/05/05 17:05:21 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/relocInfo.hpp openjdk/hotspot/src/share/vm/code/relocInfo.hpp
---- openjdk6/hotspot/src/share/vm/code/relocInfo.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/relocInfo.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)relocInfo.hpp	1.87 07/06/19 09:08:11 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1329,4 +1326,3 @@
- 
-   ~PatchingRelocIterator()                           { postpass(); }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/scopeDesc.cpp openjdk/hotspot/src/share/vm/code/scopeDesc.cpp
---- openjdk6/hotspot/src/share/vm/code/scopeDesc.cpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/scopeDesc.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)scopeDesc.cpp	1.58 07/07/27 16:13:17 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/scopeDesc.hpp openjdk/hotspot/src/share/vm/code/scopeDesc.hpp
---- openjdk6/hotspot/src/share/vm/code/scopeDesc.hpp	2008-11-25 10:12:05.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/scopeDesc.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)scopeDesc.hpp	1.37 07/05/24 14:38:34 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -124,6 +121,3 @@
-   void print_value_on(outputStream* st) const;
- #endif
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/stubs.cpp openjdk/hotspot/src/share/vm/code/stubs.cpp
---- openjdk6/hotspot/src/share/vm/code/stubs.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/stubs.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)stubs.cpp	1.47 07/05/05 17:05:20 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/stubs.hpp openjdk/hotspot/src/share/vm/code/stubs.hpp
---- openjdk6/hotspot/src/share/vm/code/stubs.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/stubs.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)stubs.hpp	1.34 07/05/05 17:05:22 JVM"
--#endif
- /*
-  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -209,6 +206,3 @@
-   void  verify();                                // verifies the stub queue
-   void  print();                                 // prints information about the stub queue
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/vmreg.cpp openjdk/hotspot/src/share/vm/code/vmreg.cpp
---- openjdk6/hotspot/src/share/vm/code/vmreg.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/vmreg.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vmreg.cpp	1.35 07/05/05 17:05:22 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/vmreg.hpp openjdk/hotspot/src/share/vm/code/vmreg.hpp
---- openjdk6/hotspot/src/share/vm/code/vmreg.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/vmreg.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vmreg.hpp	1.37 07/05/05 17:05:22 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/code/vtableStubs.cpp openjdk/hotspot/src/share/vm/code/vtableStubs.cpp
---- openjdk6/hotspot/src/share/vm/code/vtableStubs.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/vtableStubs.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vtableStubs.cpp	1.55 07/05/05 17:05:22 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -198,8 +195,3 @@
- }
- 
- #endif // Product
--
--
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/code/vtableStubs.hpp openjdk/hotspot/src/share/vm/code/vtableStubs.hpp
---- openjdk6/hotspot/src/share/vm/code/vtableStubs.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/code/vtableStubs.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vtableStubs.hpp	1.27 07/05/05 17:05:22 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.cpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.cpp
---- openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)abstractCompiler.cpp	1.4 07/05/05 17:05:23 JVM"
--#endif
- // 
- // Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
- // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.hpp openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp
---- openjdk6/hotspot/src/share/vm/compiler/abstractCompiler.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/abstractCompiler.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)abstractCompiler.hpp	1.26 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileBroker.cpp openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp
---- openjdk6/hotspot/src/share/vm/compiler/compileBroker.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compileBroker.cpp	1.147 07/05/17 15:50:51 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileBroker.hpp openjdk/hotspot/src/share/vm/compiler/compileBroker.hpp
---- openjdk6/hotspot/src/share/vm/compiler/compileBroker.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileBroker.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compileBroker.hpp	1.55 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileLog.cpp openjdk/hotspot/src/share/vm/compiler/compileLog.cpp
---- openjdk6/hotspot/src/share/vm/compiler/compileLog.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileLog.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compileLog.cpp	1.20 07/05/05 17:05:23 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -295,4 +292,3 @@
-   char buf[4 * K];
-   finish_log_on_error(file, buf, sizeof(buf));
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compileLog.hpp openjdk/hotspot/src/share/vm/compiler/compileLog.hpp
---- openjdk6/hotspot/src/share/vm/compiler/compileLog.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compileLog.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compileLog.hpp	1.12 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compilerOracle.cpp openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp
---- openjdk6/hotspot/src/share/vm/compiler/compilerOracle.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.cpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compilerOracle.cpp	1.35 07/09/13 11:29:49 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -711,5 +708,3 @@
-     line = *line == '\0' ? line : line + 1;
-   }
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/compilerOracle.hpp openjdk/hotspot/src/share/vm/compiler/compilerOracle.hpp
---- openjdk6/hotspot/src/share/vm/compiler/compilerOracle.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/compilerOracle.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compilerOracle.hpp	1.21 07/05/05 17:05:23 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/disassemblerEnv.hpp openjdk/hotspot/src/share/vm/compiler/disassemblerEnv.hpp
---- openjdk6/hotspot/src/share/vm/compiler/disassemblerEnv.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/disassemblerEnv.hpp	2008-12-05 16:41:21.867633533 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)disassemblerEnv.hpp	1.18 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -36,4 +33,3 @@
-   virtual char* string_for_offset(intptr_t value) = 0;
-   virtual char* string_for_constant(unsigned char* pc, intptr_t value, int is_decimal) = 0;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
---- openjdk6/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)methodLiveness.cpp	1.41 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1064,4 +1061,3 @@
- }
- 
- #endif // PRODUCT
--
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/methodLiveness.hpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp
---- openjdk6/hotspot/src/share/vm/compiler/methodLiveness.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)methodLiveness.hpp	1.25 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/oopMap.cpp openjdk/hotspot/src/share/vm/compiler/oopMap.cpp
---- openjdk6/hotspot/src/share/vm/compiler/oopMap.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/oopMap.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)oopMap.cpp	1.153 07/09/28 10:23:20 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/compiler/oopMap.hpp openjdk/hotspot/src/share/vm/compiler/oopMap.hpp
---- openjdk6/hotspot/src/share/vm/compiler/oopMap.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/compiler/oopMap.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oopMap.hpp	1.81 07/09/28 10:23:19 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)binaryTreeDictionary.cpp	1.37 07/05/05 17:05:43 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)binaryTreeDictionary.hpp	1.27 08/04/09 19:19:11 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -133,7 +130,6 @@
- const size_t MIN_TREE_CHUNK_SIZE  = sizeof(TreeChunk)/HeapWordSize;
- 
- class BinaryTreeDictionary: public FreeBlockDictionary {
--  friend class VMStructs;
-   bool       _splay;
-   size_t     _totalSize;
-   size_t     _totalFreeBlocks;
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cmsAdaptiveSizePolicy.cpp	1.19 07/05/05 17:05:24 JVM"
--#endif
- /*
-  * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cmsAdaptiveSizePolicy.hpp	1.16 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cmsCollectorPolicy.cpp	1.1 07/05/16 10:53:57 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsCollectorPolicy.hpp	1.1 07/05/16 10:53:57 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cmsGCAdaptivePolicyCounters.cpp	1.16 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsGCAdaptivePolicyCounters.hpp	1.16 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cmsLockVerifier.cpp	1.14 07/05/05 17:05:44 JVM"
--#endif
- /*
-  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -96,4 +93,3 @@
-   }
- }
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsLockVerifier.hpp	1.9 07/05/05 17:05:44 JVM"
--#endif
- /*
-  * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,8 +1,5 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsOopClosures.hpp	1.4 08/09/25 13:46:14 JVM"
--#endif
- /*
-- * Copyright (c) 2008 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *   
-  * This code is free software; you can redistribute it and/or modify it
-@@ -286,7 +283,7 @@
- // processing phase of the CMS final checkpoint step.
- class CMSKeepAliveClosure: public OopClosure {
-   CMSCollector* _collector;
--  const MemRegion _span;
-+  MemRegion     _span;
-   CMSMarkStack* _mark_stack;
-   CMSBitMap*    _bit_map;
-  public:
-@@ -295,9 +292,7 @@
-     _collector(collector),
-     _span(span),
-     _bit_map(bit_map),
--    _mark_stack(mark_stack) { 
--      assert(!_span.is_empty(), "Empty span could spell trouble");
--    }
-+    _mark_stack(mark_stack) { }
- 
-   void do_oop(oop* p);
-   void do_oop_nv(oop* p) { CMSKeepAliveClosure::do_oop(p); }
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsOopClosures.inline.hpp	1.1 07/05/16 10:52:51 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsPermGen.cpp	1.2 07/05/16 16:53:01 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp	2008-12-05 16:41:21.877633684 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cmsPermGen.hpp	1.1 07/05/02 16:12:51 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	2008-12-05 16:41:21.887633834 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compactibleFreeListSpace.cpp	1.144 08/09/06 09:20:55 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -2797,12 +2794,10 @@
-   assert(n_threads > 0, "Unexpected n_threads argument");
-   const size_t task_size = rescan_task_size();
-   size_t n_tasks = (used_region().word_size() + task_size - 1)/task_size;
--  assert((n_tasks == 0) == used_region().is_empty(), "n_tasks incorrect");
--  assert(n_tasks == 0 ||
--  ((used_region().start() + (n_tasks - 1)*task_size < used_region().end()) &&
--  (used_region().start() + n_tasks*task_size >= used_region().end())),
--  "n_tasks calculation incorrect"); 
--
-+  assert((used_region().start() + (n_tasks - 1)*task_size <
-+          used_region().end()) &&
-+         (used_region().start() + n_tasks*task_size >=
-+          used_region().end()), "n_task calculation incorrect");
-   SequentialSubTasksDone* pst = conc_par_seq_tasks();
-   assert(!pst->valid(), "Clobbering existing data?");
-   pst->set_par_threads(n_threads);
-@@ -2842,10 +2837,9 @@
-   assert(n_tasks == 0 ||
-          ((span.start() + (n_tasks - 1)*task_size < span.end()) &&
-           (span.start() + n_tasks*task_size >= span.end())),
--         "n_tasks calculation incorrect");
-+         "n_task calculation incorrect");
-   SequentialSubTasksDone* pst = conc_par_seq_tasks();
-   assert(!pst->valid(), "Clobbering existing data?");
-   pst->set_par_threads(n_threads);
-   pst->set_n_tasks((int)n_tasks);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp	2008-12-05 16:41:21.887633834 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compactibleFreeListSpace.hpp	1.91 07/05/05 17:05:45 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2008-12-05 16:41:21.887633834 +0100
-@@ -1,8 +1,5 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)concurrentMarkSweepGeneration.cpp	1.293 08/10/30 20:45:16 JVM"
--#endif
- /*
-- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
-+ * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-@@ -495,10 +492,7 @@
-                  -1 /* lock-free */, "No_lock" /* dummy */),
-   _modUnionClosure(&_modUnionTable),
-   _modUnionClosurePar(&_modUnionTable),
--  // Adjust my span to cover old (cms) gen and perm gen
--  _span(cmsGen->reserved()._union(permGen->reserved())),
--  // Construct the is_alive_closure with _span & markBitMap
--  _is_alive_closure(_span, &_markBitMap),
-+  _is_alive_closure(&_markBitMap),
-   _restart_addr(NULL),
-   _overflow_list(NULL),
-   _preserved_oop_stack(NULL),
-@@ -550,6 +544,11 @@
-   _cmsGen->cmsSpace()->set_collector(this);
-   _permGen->cmsSpace()->set_collector(this);
- 
-+  // Adjust my span to cover old (cms) gen and perm gen
-+  _span = _cmsGen->reserved()._union(_permGen->reserved());
-+  // Initialize the span of is_alive_closure
-+  _is_alive_closure.set_span(_span);
-+
-   // Allocate MUT and marking bit map
-   {
-     MutexLockerEx x(_markBitMap.lock(), Mutex::_no_safepoint_check_flag);
-@@ -3122,7 +3121,12 @@
-   if (GCExpandToAllocateDelayMillis > 0) {
-     os::sleep(Thread::current(), GCExpandToAllocateDelayMillis, false);
-   }
--  return have_lock_and_allocate(word_size, tlab);
-+  size_t adj_word_sz = CompactibleFreeListSpace::adjustObjectSize(word_size);
-+  if (parallel) {
-+    return cmsSpace()->par_allocate(adj_word_sz);
-+  } else {
-+    return cmsSpace()->allocate(adj_word_sz);
-+  }
- }
- 
- // YSR: All of this generation expansion/shrinking stuff is an exact copy of
-@@ -3598,7 +3602,6 @@
-   CompactibleFreeListSpace*  _cms_space;
-   CompactibleFreeListSpace* _perm_space;
-   HeapWord*     _global_finger;
--  HeapWord*     _restart_addr;
- 
-   //  Exposed here for yielding support
-   Mutex* const _bit_map_lock;
-@@ -3629,7 +3632,7 @@
-     _term.set_task(this);
-     assert(_cms_space->bottom() < _perm_space->bottom(),
-            "Finger incorrectly initialized below");
--    _restart_addr = _global_finger = _cms_space->bottom();
-+    _global_finger = _cms_space->bottom();
-   }
- 
- 
-@@ -3647,10 +3650,6 @@
-   bool result() { return _result; }
- 
-   void reset(HeapWord* ra) {
--    assert(_global_finger >= _cms_space->end(), "Postcondition of ::work(i)");
--    assert(_global_finger >= _perm_space->end(), "Postcondition of ::work(i)");
--    assert(ra < _perm_space->end(), "ra too large");
--    _restart_addr = _global_finger = ra;
-     _term.reset_for_reuse();
-   }
- 
-@@ -3795,24 +3794,16 @@
-   int n_tasks = pst->n_tasks();
-   // We allow that there may be no tasks to do here because
-   // we are restarting after a stack overflow.
--  assert(pst->valid() || n_tasks == 0, "Uninitialized use?");
-+  assert(pst->valid() || n_tasks == 0, "Uninitializd use?");
-   int nth_task = 0;
- 
--  HeapWord* aligned_start = sp->bottom();
--  if (sp->used_region().contains(_restart_addr)) {
--    // Align down to a card boundary for the start of 0th task
--    // for this space.
--    aligned_start =
--       (HeapWord*)align_size_down((uintptr_t)_restart_addr,
--                                     CardTableModRefBS::card_size);
--  }
--  
-+  HeapWord* start = sp->bottom();
-   size_t chunk_size = sp->marking_task_size();
-   while (!pst->is_task_claimed(/* reference */ nth_task)) {
-     // Having claimed the nth task in this space,
-     // compute the chunk that it corresponds to:
--    MemRegion span = MemRegion(aligned_start + nth_task*chunk_size,
--                               aligned_start + (nth_task+1)*chunk_size);
-+    MemRegion span = MemRegion(start + nth_task*chunk_size,
-+                               start + (nth_task+1)*chunk_size);
-     // Try and bump the global finger via a CAS;
-     // note that we need to do the global finger bump
-     // _before_ taking the intersection below, because
-@@ -3827,19 +3818,6 @@
-     // beyond the "top" address of the space.
-     span = span.intersection(sp->used_region());
-     if (!span.is_empty()) {  // Non-null task
--      HeapWord* prev_obj;
--      assert(!span.contains(_restart_addr) || nth_task == 0,
--              "Inconsistency");
--      if (nth_task == 0) {
--        // For the 0th task, we'll not need to compute a block_start.
--        if (span.contains(_restart_addr)) {
--          // In the case of a restart because of stack overflow,
--          // we might additionally skip a chunk prefix.
--          prev_obj = _restart_addr; 
--        } else {
--          prev_obj = span.start();
--        }
--      } else {
-         // We want to skip the first object because
-         // the protocol is to scan any object in its entirety
-         // that _starts_ in this span; a fortiori, any
-@@ -3847,7 +3825,7 @@
-         // as part of an earlier claimed task.
-         // Below we use the "careful" version of block_start
-         // so we do not try to navigate uninitialized objects.
--        prev_obj = sp->block_start_careful(span.start());
-+      HeapWord* prev_obj = sp->block_start_careful(span.start());
-         // Below we use a variant of block_size that uses the
-         // Printezis bits to avoid waiting for allocated
-         // objects to become initialized/parsable.
-@@ -3862,7 +3840,6 @@
-             break;
-           } 
-         }
--      }
-       if (prev_obj < span.end()) {
-         MemRegion my_span = MemRegion(prev_obj, span.end());
-         // Do the marking work within a non-empty span --
-@@ -3911,15 +3888,13 @@
-   void handle_stack_overflow(HeapWord* lost);
- };
- 
--// Grey object scanning during work stealing phase --
--// the salient assumption here is that any references
--// that are in these stolen objects being scanned must
--// already have been initialized (else they would not have
--// been published), so we do not need to check for
--// uninitialized objects before pushing here. 
-+// Grey object rescan during work stealing phase --
-+// the salient assumption here is that stolen oops must
-+// always be initialized, so we do not need to check for
-+// uninitialized objects before scanning here.
- void Par_ConcMarkingClosure::do_oop(oop* p) {
-   oop    this_oop = *p;
--  assert(this_oop->is_oop_or_null(true),
-+  assert(this_oop->is_oop_or_null(),
-          "expected an oop or NULL");
-   HeapWord* addr = (HeapWord*)this_oop;
-   // Check if oop points into the CMS generation
-@@ -3975,7 +3950,7 @@
- // in CMSCollector's _restart_address.
- void Par_ConcMarkingClosure::handle_stack_overflow(HeapWord* lost) {
-   // We need to do this under a mutex to prevent other
--  // workers from interfering with the work done below.
-+  // workers from interfering with the expansion below.
-   MutexLockerEx ml(_overflow_stack->par_lock(),
-                    Mutex::_no_safepoint_check_flag);
-   // Remember the least grey address discarded
-@@ -5463,7 +5438,7 @@
-   typedef AbstractRefProcTaskExecutor::ProcessTask ProcessTask;
-   CMSCollector*          _collector;
-   CMSBitMap*             _mark_bit_map;
--  const MemRegion        _span;
-+  MemRegion              _span;
-   OopTaskQueueSet*       _task_queues;
-   ParallelTaskTerminator _term;
-   ProcessTask&           _task;
-@@ -5480,10 +5455,8 @@
-     _collector(collector), _span(span), _mark_bit_map(mark_bit_map),
-     _task_queues(task_queues),
-     _term(total_workers, task_queues)
--    {
--      assert(_collector->_span.equals(_span) && !_span.is_empty(),
--             "Inconsistency in _span"); 
--    }
-+    { }
-+
-   OopTaskQueueSet* task_queues() { return _task_queues; }
- 
-   OopTaskQueue* work_queue(int i) { return task_queues()->queue(i); }
-@@ -5499,12 +5472,11 @@
- };
- 
- void CMSRefProcTaskProxy::work(int i) {
--  assert(_collector->_span.equals(_span), "Inconsistency in _span");
-   CMSParKeepAliveClosure par_keep_alive(_collector, _span,
-                                         _mark_bit_map, work_queue(i));
-   CMSParDrainMarkingStackClosure par_drain_stack(_collector, _span,
-                                                  _mark_bit_map, work_queue(i));
--  CMSIsAliveClosure is_alive_closure(_span, _mark_bit_map);
-+  CMSIsAliveClosure is_alive_closure(_mark_bit_map);
-   _task.work(i, is_alive_closure, par_keep_alive, par_drain_stack);
-   if (_task.marks_oops_alive()) {
-     do_work_steal(i, &par_drain_stack, &par_keep_alive,
-@@ -6825,9 +6797,11 @@
-         // during the preclean or remark phase. (CMSCleanOnEnter)
-         if (CMSCleanOnEnter) {
-           size_t sz = _collector->block_size_using_printezis_bits(addr);
-+          HeapWord* start_card_addr = (HeapWord*)round_down(
-+                                         (intptr_t)addr, CardTableModRefBS::card_size);
-           HeapWord* end_card_addr   = (HeapWord*)round_to(
-                                          (intptr_t)(addr+sz), CardTableModRefBS::card_size);
--          MemRegion redirty_range = MemRegion(addr, end_card_addr);
-+          MemRegion redirty_range = MemRegion(start_card_addr, end_card_addr);
-           assert(!redirty_range.is_empty(), "Arithmetical tautology");
-           // Bump _threshold to end_card_addr; note that
-           // _threshold cannot possibly exceed end_card_addr, anyhow.
-@@ -7245,8 +7219,7 @@
-   _should_remember_klasses(collector->cms_should_unload_classes())
- { }
- 
--// Assumes thread-safe access by callers, who are
--// responsible for mutual exclusion. 
-+
- void CMSCollector::lower_restart_addr(HeapWord* low) {
-   assert(_span.contains(low), "Out of bounds addr");
-   if (_restart_addr == NULL) {
-@@ -7272,7 +7245,7 @@
- // in CMSCollector's _restart_address.
- void Par_PushOrMarkClosure::handle_stack_overflow(HeapWord* lost) {
-   // We need to do this under a mutex to prevent other
--  // workers from interfering with the work done below.
-+  // workers from interfering with the expansion below.
-   MutexLockerEx ml(_overflow_stack->par_lock(),
-                    Mutex::_no_safepoint_check_flag);
-   // Remember the least grey address discarded
-@@ -7419,25 +7392,12 @@
-     )
-     if (simulate_overflow || !_mark_stack->push(this_oop)) {
-       if (_concurrent_precleaning) {
--         // During precleaning we can just dirty the appropriate card(s)
-+         // During precleaning we can just dirty the appropriate card
-          // in the mod union table, thus ensuring that the object remains
--         // in the grey set and continue. In the case of object arrays
--         // we need to dirty all of the cards that the object spans,
--         // since the rescan of object arrays will be limited to the
--         // dirty cards.
--         // Note that no one can be intefering with us in this action
--         // of dirtying the mod union table, so no locking or atomics
--         // are required.
--         if (this_oop->is_objArray()) {
--           size_t sz = this_oop->size();
--           HeapWord* end_card_addr = (HeapWord*)round_to(
--                                         (intptr_t)(addr+sz), CardTableModRefBS::card_size);
--           MemRegion redirty_range = MemRegion(addr, end_card_addr);
--           assert(!redirty_range.is_empty(), "Arithmetical tautology");
--           _mod_union_table->mark_range(redirty_range);
--         } else {
-+         // in the grey set  and continue. Note that no one can be intefering
-+         // with us in this action of dirtying the mod union table, so
-+         // no locking is required.
-            _mod_union_table->mark(addr);
--         } 
-          _collector->_ser_pmc_preclean_ovflw++;
-       } else {
-          // During the remark phase, we need to remember this oop
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp	2008-12-05 16:41:21.887633834 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)concurrentMarkSweepGeneration.hpp	1.163 08/09/25 13:47:54 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -438,18 +435,20 @@
- // if the object is "live" (reachable). Used in weak
- // reference processing.
- class CMSIsAliveClosure: public BoolObjectClosure {
--  const MemRegion  _span;
-+  MemRegion  _span;
-   const CMSBitMap* _bit_map;
- 
-   friend class CMSCollector;
-+ protected:
-+  void set_span(MemRegion span) { _span = span; }
-  public:
-+  CMSIsAliveClosure(CMSBitMap* bit_map):
-+    _bit_map(bit_map) { }
-+
-   CMSIsAliveClosure(MemRegion span,
-                     CMSBitMap* bit_map):
-     _span(span),
--    _bit_map(bit_map) {
--      assert(!span.is_empty(), "Empty span could spell trouble");
--    }
--
-+    _bit_map(bit_map) { }
-   void do_object(oop obj) {
-     assert(false, "not to be invoked");
-   }
-@@ -598,7 +597,7 @@
-   // ("Weak") Reference processing support
-   ReferenceProcessor*            _ref_processor;
-   CMSIsAliveClosure              _is_alive_closure;
--      // keep this textually after _markBitMap and _span; c'tor dependency
-+      // keep this textually after _markBitMap; c'tor dependency
- 
-   ConcurrentMarkSweepThread*     _cmsThread;   // the thread doing the work
-   ModUnionClosure    _modUnionClosure;
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp	2008-12-05 16:41:21.887633834 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)concurrentMarkSweepGeneration.inline.hpp	1.47 07/05/17 15:52:12 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)concurrentMarkSweepThread.cpp	1.48 07/05/05 17:06:45 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)concurrentMarkSweepThread.hpp	1.38 07/05/05 17:06:46 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)freeBlockDictionary.cpp	1.12 07/05/05 17:05:47 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)freeBlockDictionary.hpp	1.32 07/05/05 17:05:47 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)freeChunk.cpp	1.16 07/05/05 17:05:47 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)freeList.cpp	1.31 07/05/05 17:05:48 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)freeList.hpp	1.32 08/04/09 19:18:54 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -41,7 +38,6 @@
- 
- class FreeList VALUE_OBJ_CLASS_SPEC {
-   friend class CompactibleFreeListSpace;
--  friend class VMStructs;
-   FreeChunk*	_head;		// List of free chunks
-   FreeChunk*	_tail;		// Tail of list of free chunks
-   size_t	_size;		// Size in Heap words of each chunks
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vmCMSOperations.cpp	1.16 07/05/29 09:44:13 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -251,4 +248,3 @@
-   // Enable iCMS back.
-   CMSCollector::enable_icms();
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vmCMSOperations.hpp	1.13 07/05/29 09:44:13 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vmStructs_cms.hpp	1.3 08/04/09 19:18:31 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -41,15 +38,7 @@
-      static_field(ConcurrentMarkSweepThread,   _collector,                                    CMSCollector*)                         \
-   nonstatic_field(FreeChunk,                   _next,                                         FreeChunk*)                            \
-   nonstatic_field(FreeChunk,                   _prev,                                         FreeChunk*)                            \
--  nonstatic_field(FreeChunk,                   _size,                                         size_t)                                \
--  nonstatic_field(LinearAllocBlock,            _word_size,                                    size_t)                                \
--  nonstatic_field(FreeList,                    _size,                                         size_t)                                \
--  nonstatic_field(FreeList,                    _count,                                        ssize_t)                               \
--  nonstatic_field(BinaryTreeDictionary,        _totalSize,                                    size_t)                                \
--  nonstatic_field(CompactibleFreeListSpace,    _dictionary,                                   FreeBlockDictionary*)                  \
--  nonstatic_field(CompactibleFreeListSpace,    _indexedFreeList[0],                           FreeList)                              \
--  nonstatic_field(CompactibleFreeListSpace,    _smallLinearAllocBlock,                        LinearAllocBlock)
--
-+  nonstatic_field(FreeChunk,                   _size,                                         size_t)
- 
- #define VM_TYPES_CMS(declare_type,                                        \
-                      declare_toplevel_type)                               \
-@@ -68,14 +57,7 @@
-   declare_toplevel_type(SurrogateLockerThread*)                           \
-   declare_toplevel_type(CompactibleFreeListSpace*)                        \
-   declare_toplevel_type(CMSCollector*)                                    \
--  declare_toplevel_type(FreeChunk*)                                       \
--  declare_toplevel_type(BinaryTreeDictionary*)                            \
--  declare_toplevel_type(FreeBlockDictionary*)                             \
--  declare_toplevel_type(FreeList*)                                        \
--  declare_toplevel_type(FreeList)                                         \
--  declare_toplevel_type(LinearAllocBlock)                                 \
--  declare_toplevel_type(FreeBlockDictionary)                              \
--            declare_type(BinaryTreeDictionary,        FreeBlockDictionary)
-+  declare_toplevel_type(FreeChunk*)
- 
- #define VM_INT_CONSTANTS_CMS(declare_constant)                            \
-   declare_constant(Generation::ConcurrentMarkSweep)                       \
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)asParNewGeneration.cpp	1.11 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)asParNewGeneration.hpp	1.8 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)parCardTableModRefBS.cpp	1.1 07/05/16 19:06:21 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp	2008-12-05 16:41:21.897633985 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)parGCAllocBuffer.cpp	1.28 07/05/29 09:44:12 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parGCAllocBuffer.hpp	1.30 07/05/29 09:44:13 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)parNewGeneration.cpp	1.102 07/09/07 09:50:43 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parNewGeneration.hpp	1.48 07/05/17 15:52:44 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parOopClosures.hpp	1.2 07/06/22 16:49:48 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parOopClosures.inline.hpp	1.1 07/05/16 10:51:44 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -100,4 +97,3 @@
-     }
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)adjoiningGenerations.cpp	1.16 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -279,4 +276,3 @@
-     }
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adjoiningGenerations.hpp	1.14 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)adjoiningVirtualSpaces.cpp	1.14 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adjoiningVirtualSpaces.hpp	1.11 07/05/05 17:05:25 JVM"
--#endif
- /*
-  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -109,4 +106,3 @@
- 		  size_t init_low_byte_size,
- 		  size_t init_high_byte_size);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)asPSOldGen.cpp	1.20 07/10/04 10:49:35 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)asPSOldGen.hpp	1.14 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)asPSYoungGen.cpp	1.24 07/10/04 10:49:36 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)asPSYoungGen.hpp	1.16 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cardTableExtension.cpp	1.35 07/09/25 16:47:41 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -780,4 +777,3 @@
-   }
-   return min_start;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cardTableExtension.hpp	1.20 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2001-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -109,4 +106,3 @@
-   
- #endif // ASSERT
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcTaskManager.cpp	1.35 07/06/29 04:07:55 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcTaskManager.hpp	1.29 07/06/29 04:08:20 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp	2008-12-05 16:41:21.907634136 +0100
-@@ -1,7 +1,4 @@
- 
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcTaskThread.cpp	1.25 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -151,4 +148,3 @@
-     }
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcTaskThread.hpp	1.18 07/05/05 17:05:27 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)generationSizer.hpp	1.17 07/05/05 17:05:27 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -70,5 +67,3 @@
-   size_t perm_gen_size()      { return PermSize; }
-   size_t max_perm_gen_size()  { return MaxPermSize; }
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)objectStartArray.cpp	1.20 07/05/05 17:05:28 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)objectStartArray.hpp	1.21 07/05/05 17:05:28 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -163,4 +160,3 @@
-   // "start", the method will return true.
-   bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)parMarkBitMap.cpp	1.31 07/10/04 10:49:33 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parMarkBitMap.hpp	1.16 07/05/05 17:05:27 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parMarkBitMap.inline.hpp	1.6 07/05/05 17:05:27 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)parallelScavengeHeap.cpp	1.95 07/10/04 10:49:31 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parallelScavengeHeap.hpp	1.62 07/10/04 10:49:30 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)parallelScavengeHeap.inline.hpp	1.5 07/05/05 17:05:28 JVM"
--#endif
- /*
-  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)pcTasks.cpp	1.22 07/06/22 16:49:49 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -284,4 +281,3 @@
-   // Process any chunks already in the compaction managers stacks.
-   cm->drain_chunk_stacks();
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)pcTasks.hpp	1.19 07/05/05 17:05:26 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)prefetchQueue.hpp	1.13 07/05/05 17:05:28 JVM"
--#endif
- /*
-  * Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -68,6 +65,3 @@
-     return _prefetch_queue[_prefetch_index];
-   }
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psAdaptiveSizePolicy.cpp	1.82 07/10/04 10:49:34 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psAdaptiveSizePolicy.hpp	1.64 07/10/04 10:49:35 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psCompactionManager.cpp	1.17 06/07/10 23:27:02 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	2008-11-25 10:12:06.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psCompactionManager.hpp	1.17 07/05/05 17:05:29 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psGCAdaptivePolicyCounters.cpp	1.23 07/05/05 17:05:31 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -200,4 +197,3 @@
-     update_counters_from_policy();
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp	2008-12-05 16:41:21.917634287 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psGCAdaptivePolicyCounters.hpp	1.21 07/05/05 17:05:29 JVM"
--#endif
- /*
-  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psGenerationCounters.cpp	1.7 07/05/05 17:05:29 JVM"
--#endif
- 
- /*
-  * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psGenerationCounters.hpp	1.8 07/05/05 17:05:29 JVM"
--#endif
- 
- /*
-  * Copyright 2004 Sun Microsystems, Inc.  All Rights Reserved.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psMarkSweep.cpp	1.92 07/06/08 23:11:01 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psMarkSweep.hpp	1.26 07/05/05 17:05:28 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -86,4 +83,3 @@
-   // Time since last full gc (in milliseconds)
-   static jlong millis_since_last_gc();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psMarkSweepDecorator.cpp	1.26 07/05/17 15:52:53 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psMarkSweepDecorator.hpp	1.14 07/05/05 17:05:29 JVM"
--#endif
- /*
-  * Copyright 2001-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -74,7 +71,3 @@
-   void precompact();
-   void compact(bool mangle_free_space);
- };
--
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psOldGen.cpp	1.54 07/05/05 17:05:28 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psOldGen.hpp	1.37 07/05/05 17:05:30 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psParallelCompact.cpp	1.64 08/06/19 15:33:02 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1030,9 +1027,6 @@
- 
-   DEBUG_ONLY(mark_bitmap()->verify_clear();)
-   DEBUG_ONLY(summary_data().verify_clear();)
--
--  // Have worker threads release resources the next time they run a task.
--  gc_task_manager()->release_all_resources();
- }
- 
- void PSParallelCompact::post_compact()
-@@ -1978,6 +1972,12 @@
-   TimeStamp compaction_start;
-   TimeStamp collection_exit;
- 
-+  // "serial_CM" is needed until the parallel implementation
-+  // of the move and update is done.
-+  ParCompactionManager* serial_CM = new ParCompactionManager();
-+  // Don't initialize more than once.
-+  // serial_CM->initialize(&summary_data(), mark_bitmap());
-+
-   ParallelScavengeHeap* heap = gc_heap();
-   GCCause::Cause gc_cause = heap->gc_cause();
-   PSYoungGen* young_gen = heap->young_gen();
-@@ -1992,10 +1992,6 @@
-   PreGCValues pre_gc_values;
-   pre_compact(&pre_gc_values);
- 
--  // Get the compaction manager reserved for the VM thread.
--  ParCompactionManager* const vmthread_cm =
--    ParCompactionManager::manager_array(gc_task_manager()->workers());
--
-   // Place after pre_compact() where the number of invocations is incremented.
-   AdaptiveSizePolicyOutput(size_policy, heap->total_collections());
- 
-@@ -2035,7 +2031,7 @@
-     bool marked_for_unloading = false;
- 
-     marking_start.update();
--    marking_phase(vmthread_cm, maximum_heap_compaction);
-+    marking_phase(serial_CM, maximum_heap_compaction);
- 
- #ifndef PRODUCT
-     if (TraceParallelOldGCMarkingPhase) {
-@@ -2066,7 +2062,7 @@
- #endif
- 
-     bool max_on_system_gc = UseMaximumCompactionOnSystemGC && is_system_gc;
--    summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc);
-+    summary_phase(serial_CM, maximum_heap_compaction || max_on_system_gc);
- 
- #ifdef ASSERT
-     if (VerifyParallelOldWithMarkSweep &&
-@@ -2094,13 +2090,13 @@
-       // code can use the the forwarding pointers to
-       // check the new pointer calculation.  The restore_marks()
-       // has to be done before the real compact.
--      vmthread_cm->set_action(ParCompactionManager::VerifyUpdate);
--      compact_perm(vmthread_cm);
--      compact_serial(vmthread_cm);
--      vmthread_cm->set_action(ParCompactionManager::ResetObjects);
--      compact_perm(vmthread_cm);
--      compact_serial(vmthread_cm);
--      vmthread_cm->set_action(ParCompactionManager::UpdateAndCopy);
-+      serial_CM->set_action(ParCompactionManager::VerifyUpdate);
-+      compact_perm(serial_CM);
-+      compact_serial(serial_CM);
-+      serial_CM->set_action(ParCompactionManager::ResetObjects);
-+      compact_perm(serial_CM);
-+      compact_serial(serial_CM);
-+      serial_CM->set_action(ParCompactionManager::UpdateAndCopy);
- 
-       // For debugging only
-       PSMarkSweep::restore_marks();
-@@ -2111,14 +2107,16 @@
-     compaction_start.update();
-     // Does the perm gen always have to be done serially because
-     // klasses are used in the update of an object?
--    compact_perm(vmthread_cm);
-+    compact_perm(serial_CM);
- 
-     if (UseParallelOldGCCompacting) {
-       compact();
-     } else {
--      compact_serial(vmthread_cm);
-+      compact_serial(serial_CM);
-     }
- 
-+    delete serial_CM;
-+
-     // Reset the mark bitmap, summary data, and do other bookkeeping.  Must be
-     // done before resizing.
-     post_compact();
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psParallelCompact.hpp	1.48 07/10/04 10:49:38 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psPermGen.cpp	1.28 07/05/05 17:05:30 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psPermGen.hpp	1.18 07/05/05 17:05:30 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -54,4 +51,3 @@
- 
-   virtual const char* name() const { return "PSPermGen"; }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psPromotionLAB.cpp	1.17 07/05/05 17:05:30 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psPromotionLAB.hpp	1.13 07/05/05 17:05:30 JVM"
--#endif
- /*
-  * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -143,5 +140,3 @@
- 
-   debug_only(virtual bool lab_is_valid(MemRegion lab));
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psPromotionManager.cpp	1.30 07/09/25 16:47:41 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp	2008-12-05 16:41:21.927634438 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psPromotionManager.hpp	1.20 07/09/25 16:47:42 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psPromotionManager.inline.hpp	1.19 07/09/25 16:47:42 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psScavenge.cpp	1.99 07/09/07 09:53:34 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psScavenge.hpp	1.46 07/05/05 17:05:30 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psScavenge.inline.hpp	1.18 07/05/05 17:05:29 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psTasks.cpp	1.29 07/09/25 16:47:43 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -222,5 +219,3 @@
-     pm->drain_stacks(false);
-   }
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psTasks.hpp	1.21 07/05/05 17:05:29 JVM"
--#endif
- /*
-  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -146,4 +143,3 @@
- 
-   virtual void do_it(GCTaskManager* manager, uint which);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psVirtualspace.cpp	1.16 07/05/05 17:05:31 JVM"
--#endif
- /*
-  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psVirtualspace.hpp	1.15 07/05/05 17:05:31 JVM"
--#endif
- /*
-  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)psYoungGen.cpp	1.68 07/10/04 10:49:36 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)psYoungGen.hpp	1.48 07/05/05 17:05:31 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vmPSOperations.cpp	1.1 07/05/14 11:57:11 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -102,4 +99,3 @@
-   }
-   notify_gc_end();
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vmPSOperations.hpp	1.2 07/05/16 16:53:01 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vmStructs_parallelgc.hpp	1.2 07/05/01 19:01:30 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)adaptiveSizePolicy.cpp	1.13 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)adaptiveSizePolicy.hpp	1.15 07/05/05 17:05:32 JVM"
--#endif
- /*
-  * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ageTable.cpp	1.36 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/ageTable.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)ageTable.hpp	1.29 07/05/05 17:05:32 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cSpaceCounters.cpp	1.10 07/05/05 17:05:32 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cSpaceCounters.hpp	1.12 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -78,4 +75,3 @@
-       return _space->used();
-     }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.cpp	2008-12-05 16:41:21.937634589 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)collectorCounters.cpp	1.10 07/05/05 17:05:32 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/collectorCounters.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)collectorCounters.hpp	1.10 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -81,4 +78,3 @@
-       if (UsePerfData) _c->last_exit_counter()->set_value(os::elapsed_counter());
-     }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gSpaceCounters.cpp	1.11 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gSpaceCounters.hpp	1.14 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -103,4 +100,3 @@
-       return _gen->used();
-     }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcAdaptivePolicyCounters.cpp	1.10 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcAdaptivePolicyCounters.hpp	1.11 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcPolicyCounters.cpp	1.13 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcPolicyCounters.hpp	1.18 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcStats.cpp	1.9 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcStats.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcStats.hpp	1.10 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcUtil.cpp	1.21 07/05/05 17:05:32 JVM"
--#endif
- /*
-  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcUtil.hpp	1.19 07/05/05 17:05:32 JVM"
--#endif
- /*
-  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -177,4 +174,3 @@
-     _timer->start();
-   }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)generationCounters.cpp	1.10 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)generationCounters.hpp	1.14 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)immutableSpace.cpp	1.13 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -80,4 +77,3 @@
-   }
-   guarantee(p == end(), "end of last object must match end of space");
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/immutableSpace.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)immutableSpace.hpp	1.14 07/05/05 17:05:33 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)isGCActiveMark.hpp	1.9 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/liveRange.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)liveRange.hpp	1.11 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2001-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)markSweep.cpp	1.196 07/05/05 17:05:35 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -358,4 +355,3 @@
- }
- 
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)markSweep.hpp	1.67 07/05/17 15:52:55 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)markSweep.inline.hpp	1.17 07/05/29 09:44:12 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)mutableNUMASpace.cpp	1.8 07/05/05 17:05:35 JVM"
--#endif
- 
- /*
-  * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp	2008-12-05 16:41:21.947634739 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)mutableNUMASpace.hpp	1.8 07/05/05 17:05:34 JVM"
--#endif
- /*
-  * Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.cpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)mutableSpace.cpp	1.22 07/05/05 17:05:35 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableSpace.hpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)mutableSpace.hpp	1.22 07/05/05 17:05:35 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.cpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)spaceCounters.cpp	1.10 07/05/05 17:05:35 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/spaceCounters.hpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)spaceCounters.hpp	1.11 07/05/05 17:05:35 JVM"
--#endif
- /*
-  * Copyright 2002-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.cpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vmGCOperations.cpp	1.21 07/05/29 09:44:12 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp
---- openjdk6/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/shared/vmGCOperations.hpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vmGCOperations.hpp	1.14 07/05/29 09:44:12 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.cpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
---- openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.cpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)collectedHeap.cpp	1.24 07/07/19 19:08:26 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.hpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
---- openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.hpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)collectedHeap.hpp	1.58 07/09/07 10:56:50 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
---- openjdk6/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)collectedHeap.inline.hpp	1.50 07/09/07 10:56:50 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/gcCause.cpp openjdk/hotspot/src/share/vm/gc_interface/gcCause.cpp
---- openjdk6/hotspot/src/share/vm/gc_interface/gcCause.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_interface/gcCause.cpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcCause.cpp	1.20 07/05/05 17:05:40 JVM"
--#endif
- /*
-  * Copyright 2002-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/gc_interface/gcCause.hpp openjdk/hotspot/src/share/vm/gc_interface/gcCause.hpp
---- openjdk6/hotspot/src/share/vm/gc_interface/gcCause.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_interface/gcCause.hpp	2008-12-05 16:41:21.957634890 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcCause.hpp	1.24 07/05/05 17:05:40 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/includeDB_core openjdk/hotspot/src/share/vm/includeDB_core
---- openjdk6/hotspot/src/share/vm/includeDB_core	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/includeDB_core	2008-12-05 16:41:21.957634890 +0100
-@@ -720,11 +720,6 @@
- ciObjArray.hpp                          ciClassList.hpp
- ciObjArray.hpp                          objArrayOop.hpp
- 
--ciObjArray.cpp                          ciObjArray.hpp
--ciObjArray.cpp                          ciNullObject.hpp
--ciObjArray.cpp                          ciUtilities.hpp
--ciObjArray.cpp                          objArrayOop.hpp
--
- ciObjArrayKlass.cpp                     ciInstanceKlass.hpp
- ciObjArrayKlass.cpp                     ciObjArrayKlass.hpp
- ciObjArrayKlass.cpp                     ciObjArrayKlassKlass.hpp
-@@ -3073,7 +3068,6 @@
- 
- oopMapCache.cpp                         allocation.inline.hpp
- oopMapCache.cpp                         handles.inline.hpp
--oopMapCache.cpp                         jvmtiRedefineClassesTrace.hpp
- oopMapCache.cpp                         oop.inline.hpp
- oopMapCache.cpp                         oopMapCache.hpp
- oopMapCache.cpp                         resourceArea.hpp
-diff -ruNb openjdk6/hotspot/src/share/vm/includeDB_gc_parallel openjdk/hotspot/src/share/vm/includeDB_gc_parallel
---- openjdk6/hotspot/src/share/vm/includeDB_gc_parallel	2008-11-25 10:12:03.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/includeDB_gc_parallel	2008-12-05 16:41:21.967635041 +0100
-@@ -50,7 +50,6 @@
- 
- instanceRefKlass.cpp                    oop.pcgc.inline.hpp
- instanceRefKlass.cpp                    psPromotionManager.inline.hpp
--instanceRefKlass.cpp                    oop.pcgc.inline.hpp
- instanceRefKlass.cpp                    psScavenge.inline.hpp
- instanceRefKlass.cpp                    parOopClosures.inline.hpp
- 
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)abstractInterpreter.hpp	1.1 07/08/29 13:42:23 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -246,4 +243,3 @@
-  public:
-   AbstractInterpreterGenerator(StubQueue* _code);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecode.cpp openjdk/hotspot/src/share/vm/interpreter/bytecode.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecode.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecode.cpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecode.cpp	1.69 07/05/05 17:05:36 JVM"
--#endif
- /*
-  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -206,4 +203,3 @@
- }
- 
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecode.hpp openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecode.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecode.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecode.hpp	1.67 07/05/05 17:05:36 JVM"
--#endif
- /*
-  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.cpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecodeHistogram.cpp	1.29 07/05/05 17:05:36 JVM"
--#endif
- /*
-  * Copyright 1997-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecodeHistogram.hpp	1.28 07/08/29 13:42:23 JVM"
--#endif
- /*
-  * Copyright 1997-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecodeInterpreter.cpp	1.31 07/08/29 13:42:24 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecodeInterpreter.hpp	1.24 07/08/29 13:42:24 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecodeInterpreter.inline.hpp	1.10 07/08/29 13:42:24 JVM"
--#endif
- /*
-  * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml	2008-12-05 16:41:21.967635041 +0100
-@@ -1,25 +1,7 @@
- <?xml version="1.0"?> 
- <!-- 
--     Copyright 1997-2000 Sun Microsystems, Inc.  All Rights Reserved.
--     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.
-+     Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-+     SUN PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
- -->
- <!DOCTYPE processcode [
-   <!ELEMENT processcode ANY>
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl	2008-12-05 16:41:21.967635041 +0100
-@@ -1,25 +1,7 @@
- <?xml version="1.0"?> 
- <!-- 
--     Copyright 1997-2000 Sun Microsystems, Inc.  All Rights Reserved.
--     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.
-+     Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-+     SUN PROPRIETARY/CONFIDENTIAL.  Use is subject to license terms.
- -->
- 
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.cpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecodeStream.cpp	1.47 07/06/20 14:52:27 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeStream.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeStream.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecodeStream.hpp	1.54 07/06/20 14:52:27 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -173,5 +170,3 @@
- 
-   bool            is_active_breakpoint() const   { return Bytecodes::is_active_breakpoint_at(bcp()); }
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecodeTracer.cpp	1.53 07/09/28 10:23:17 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.hpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecodeTracer.hpp	1.25 07/09/28 10:23:17 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodes.cpp openjdk/hotspot/src/share/vm/interpreter/bytecodes.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodes.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodes.cpp	2008-12-05 16:41:21.967635041 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecodes.cpp	1.97 07/06/20 14:52:27 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/bytecodes.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodes.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/bytecodes.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodes.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)bytecodes.hpp	1.79 07/06/20 14:52:28 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -359,4 +356,3 @@
-   // Initialization
-   static void        initialize     ();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cppInterpreter.cpp	1.1 07/08/29 13:42:24 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -136,4 +133,3 @@
- }
- 
- #endif // CC_INTERP
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/cppInterpreter.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreter.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cppInterpreter.hpp	1.1 07/08/29 13:42:24 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cppInterpreterGenerator.hpp	1.1 07/08/07 10:57:15 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreter.cpp openjdk/hotspot/src/share/vm/interpreter/interpreter.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/interpreter.cpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/interpreter.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)interpreter.cpp	1.247 07/08/29 13:42:25 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreter.hpp openjdk/hotspot/src/share/vm/interpreter/interpreter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/interpreter.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/interpreter.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)interpreter.hpp	1.154 07/08/29 13:42:25 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -135,4 +132,3 @@
-   static InterpreterCodelet* codelet_containing(address pc)     { return (InterpreterCodelet*)_code->stub_containing(pc); }
- #include "incls/_interpreter_pd.hpp.incl"
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp	2008-11-25 10:12:07.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/interpreterGenerator.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)interpreterGenerator.hpp	1.1 07/08/07 10:57:15 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -39,5 +36,3 @@
- #include "incls/_interpreterGenerator_pd.hpp.incl"
- 
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)interpreterRuntime.cpp	1.488 07/08/29 13:42:25 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)interpreterRuntime.hpp	1.143 07/05/05 17:05:38 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.cpp openjdk/hotspot/src/share/vm/interpreter/invocationCounter.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/invocationCounter.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)invocationCounter.cpp	1.60 07/05/05 17:05:38 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -171,4 +168,3 @@
- void invocationCounter_init() {
-   InvocationCounter::reinitialize(DelayCompilationDuringStartup);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.hpp openjdk/hotspot/src/share/vm/interpreter/invocationCounter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/invocationCounter.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/invocationCounter.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)invocationCounter.hpp	1.50 07/08/29 13:42:26 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -138,5 +135,3 @@
-   if (c > 0 && new_count == 0) new_count = 1; 
-   set(state(), new_count);
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/linkResolver.cpp openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/linkResolver.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)linkResolver.cpp	1.174 07/05/05 17:05:40 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1001,4 +998,3 @@
- }
- 
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/linkResolver.hpp openjdk/hotspot/src/share/vm/interpreter/linkResolver.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/linkResolver.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)linkResolver.hpp	1.74 07/05/05 17:05:39 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -172,4 +169,3 @@
- 
-   static void resolve_invoke         (CallInfo& result, Handle recv, constantPoolHandle pool, int index, Bytecodes::Code byte, TRAPS);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.cpp openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)oopMapCache.cpp	1.86 08/11/24 12:22:25 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -535,10 +532,6 @@
-     if (!_array[i].is_empty() && _array[i].method()->is_old()) {
-       // Cache entry is occupied by an old redefined method and we don't want
-       // to pin it down so flush the entry.
--      RC_TRACE(0x08000000, ("flush: %s(%s): cached entry @%d",
--        _array[i].method()->name()->as_C_string(),
--        _array[i].method()->signature()->as_C_string(), i));
--
-       _array[i].flush();
-     }
- }
-@@ -584,15 +577,6 @@
-   // Entry is not in hashtable. 
-   // Compute entry and return it
- 
--  if (method->should_not_be_cached()) {
--    // It is either not safe or not a good idea to cache this methodOop
--    // at this time. We give the caller of lookup() a copy of the
--    // interesting info via parameter entry_for, but we don't add it to
--    // the cache. See the gory details in methodOop.cpp.
--    compute_one_oop_map(method, bci, entry_for);
--    return;
--  }
--
-   // First search for an empty slot
-   for(i = 0; i < _probe_depth; i++) {
-     entry  = entry_at(probe + i);
-@@ -600,6 +584,12 @@
-       entry->fill(method, bci);
-       entry_for->resource_copy(entry);
-       assert(!entry_for->is_empty(), "A non-empty oop map should be returned");
-+      if (method->is_old()) {
-+        // The caller of lookup() will receive a copy of the interesting
-+        // info via entry_for, but we don't keep an old redefined method in
-+        // the cache to avoid pinning down the method.
-+        entry->flush();
-+      }
-       return; 
-     }
-   }
-@@ -633,6 +623,13 @@
-   }
-   assert(!entry_for->is_empty(), "A non-empty oop map should be returned");
- 
-+  if (method->is_old()) {
-+    // The caller of lookup() will receive a copy of the interesting
-+    // info via entry_for, but we don't keep an old redefined method in
-+    // the cache to avoid pinning down the method.
-+    entry->flush();
-+  }
-+
-   return;
- }
- 
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.hpp openjdk/hotspot/src/share/vm/interpreter/oopMapCache.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/oopMapCache.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/oopMapCache.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oopMapCache.hpp	1.57 07/05/05 17:05:39 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -191,4 +188,3 @@
-   // Returns total no. of bytes allocated as part of OopMapCache's
-   static long memory_usage()                     PRODUCT_RETURN0;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/rewriter.cpp openjdk/hotspot/src/share/vm/interpreter/rewriter.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/rewriter.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/rewriter.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)rewriter.cpp	1.46 07/08/29 13:42:26 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/rewriter.hpp openjdk/hotspot/src/share/vm/interpreter/rewriter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/rewriter.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/rewriter.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)rewriter.hpp	1.20 07/05/05 17:05:40 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -38,4 +35,3 @@
-  public:
-   static void rewrite(instanceKlassHandle klass, TRAPS);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.cpp openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.cpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)templateInterpreter.cpp	1.1 07/08/29 13:42:26 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/templateInterpreter.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/templateInterpreter.hpp	2008-12-05 16:41:21.977635192 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)templateInterpreter.hpp	1.2 07/09/25 17:07:43 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp openjdk/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)templateInterpreterGenerator.hpp	1.1 07/08/07 10:57:15 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateTable.cpp openjdk/hotspot/src/share/vm/interpreter/templateTable.cpp
---- openjdk6/hotspot/src/share/vm/interpreter/templateTable.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/templateTable.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)templateTable.cpp	1.108 07/05/05 17:05:37 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/interpreter/templateTable.hpp openjdk/hotspot/src/share/vm/interpreter/templateTable.hpp
---- openjdk6/hotspot/src/share/vm/interpreter/templateTable.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/templateTable.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)templateTable.hpp	1.91 07/05/05 17:05:39 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/dict.cpp openjdk/hotspot/src/share/vm/libadt/dict.cpp
---- openjdk6/hotspot/src/share/vm/libadt/dict.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/dict.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dict.cpp	1.35 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -384,4 +381,3 @@
-   }
-   _key = _value = NULL;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/dict.hpp openjdk/hotspot/src/share/vm/libadt/dict.hpp
---- openjdk6/hotspot/src/share/vm/libadt/dict.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/dict.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)dict.hpp	1.24 07/05/05 17:05:40 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -118,4 +115,3 @@
- };
- 
- #endif // _DICT_
--
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/port.cpp openjdk/hotspot/src/share/vm/libadt/port.cpp
---- openjdk6/hotspot/src/share/vm/libadt/port.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/port.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)port.cpp	1.21 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997-1998 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/port.hpp openjdk/hotspot/src/share/vm/libadt/port.hpp
---- openjdk6/hotspot/src/share/vm/libadt/port.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/port.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)port.hpp	1.44 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/set.cpp openjdk/hotspot/src/share/vm/libadt/set.cpp
---- openjdk6/hotspot/src/share/vm/libadt/set.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/set.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)set.cpp	1.26 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/set.hpp openjdk/hotspot/src/share/vm/libadt/set.hpp
---- openjdk6/hotspot/src/share/vm/libadt/set.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/set.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)set.hpp	1.23 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -252,4 +249,3 @@
- };
- 
- #endif // _SET_
--
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/vectset.cpp openjdk/hotspot/src/share/vm/libadt/vectset.cpp
---- openjdk6/hotspot/src/share/vm/libadt/vectset.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/vectset.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)vectset.cpp	1.25 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -391,5 +388,3 @@
-   } while( i<s->size );
-   return max_juint;             // No element, iterated them all
- }
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/libadt/vectset.hpp openjdk/hotspot/src/share/vm/libadt/vectset.hpp
---- openjdk6/hotspot/src/share/vm/libadt/vectset.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/libadt/vectset.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)vectset.hpp	1.22 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -177,4 +174,3 @@
- };
- 
- #endif // _VECTOR_SET_
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocation.cpp openjdk/hotspot/src/share/vm/memory/allocation.cpp
---- openjdk6/hotspot/src/share/vm/memory/allocation.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/allocation.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)allocation.cpp	1.72 07/05/05 17:05:42 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -540,4 +537,3 @@
- }
- 
- #endif // Non-product
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocation.hpp openjdk/hotspot/src/share/vm/memory/allocation.hpp
---- openjdk6/hotspot/src/share/vm/memory/allocation.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/allocation.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)allocation.hpp	1.77 07/05/05 17:05:42 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -410,4 +407,3 @@
-   ReallocMark()   PRODUCT_RETURN;
-   void check()    PRODUCT_RETURN;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocation.inline.hpp openjdk/hotspot/src/share/vm/memory/allocation.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/allocation.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/allocation.inline.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)allocation.inline.hpp	1.22 07/05/05 17:05:42 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocationStats.cpp openjdk/hotspot/src/share/vm/memory/allocationStats.cpp
---- openjdk6/hotspot/src/share/vm/memory/allocationStats.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/allocationStats.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)allocationStats.cpp	1.6 07/05/05 17:05:42 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -31,4 +28,3 @@
- // Technically this should be derived from machine speed, and
- // ideally it would be dynamically adjusted.
- float AllocationStats::_threshold = ((float)CMS_SweepTimerThresholdMillis)/1000;
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/allocationStats.hpp openjdk/hotspot/src/share/vm/memory/allocationStats.hpp
---- openjdk6/hotspot/src/share/vm/memory/allocationStats.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/allocationStats.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)allocationStats.hpp	1.19 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/barrierSet.hpp openjdk/hotspot/src/share/vm/memory/barrierSet.hpp
---- openjdk6/hotspot/src/share/vm/memory/barrierSet.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/barrierSet.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)barrierSet.hpp	1.18 07/05/05 17:05:43 JVM"
--#endif
- /*
-  * Copyright 2000-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/barrierSet.inline.hpp openjdk/hotspot/src/share/vm/memory/barrierSet.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/barrierSet.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/barrierSet.inline.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)barrierSet.inline.hpp	1.12 07/05/05 17:05:43 JVM"
--#endif
- /*
-  * Copyright 2001-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.cpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
---- openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)blockOffsetTable.cpp	1.82 07/05/05 17:05:42 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.hpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp
---- openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp	2008-12-05 16:41:21.987635343 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)blockOffsetTable.hpp	1.57 07/05/05 17:05:43 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp openjdk/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.inline.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)blockOffsetTable.inline.hpp	1.20 07/05/05 17:05:43 JVM"
--#endif
- /*
-  * Copyright 2000-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.cpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.cpp
---- openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cardTableModRefBS.cpp	1.60 07/12/05 23:34:34 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -54,7 +51,7 @@
-   _whole_heap(whole_heap),
-   _guard_index(cards_required(whole_heap.word_size()) - 1),
-   _last_valid_index(_guard_index - 1),
--  _page_size(os::vm_page_size()),
-+  _page_size(os::page_size_for_region(_guard_index + 1, _guard_index + 1, 1)),
-   _byte_map_size(compute_byte_map_size())
- {
-   _kind = BarrierSet::CardTableModRef;
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.hpp openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
---- openjdk6/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cardTableModRefBS.hpp	1.53 07/10/04 10:49:32 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableRS.cpp openjdk/hotspot/src/share/vm/memory/cardTableRS.cpp
---- openjdk6/hotspot/src/share/vm/memory/cardTableRS.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableRS.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cardTableRS.cpp	1.45 07/05/25 12:54:50 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/cardTableRS.hpp openjdk/hotspot/src/share/vm/memory/cardTableRS.hpp
---- openjdk6/hotspot/src/share/vm/memory/cardTableRS.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/cardTableRS.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cardTableRS.hpp	1.29 07/05/05 17:05:44 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/classify.cpp openjdk/hotspot/src/share/vm/memory/classify.cpp
---- openjdk6/hotspot/src/share/vm/memory/classify.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/classify.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)classify.cpp	1.9 07/05/05 17:05:44 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/classify.hpp openjdk/hotspot/src/share/vm/memory/classify.hpp
---- openjdk6/hotspot/src/share/vm/memory/classify.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/classify.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)classify.hpp	1.10 07/05/05 17:05:42 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
---- openjdk6/hotspot/src/share/vm/memory/collectorPolicy.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)collectorPolicy.cpp	1.90 07/10/04 10:49:37 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/collectorPolicy.hpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
---- openjdk6/hotspot/src/share/vm/memory/collectorPolicy.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)collectorPolicy.hpp	1.41 07/05/29 09:44:14 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -262,4 +259,3 @@
- 
-   void initialize_gc_policy_counters();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/compactPermGen.hpp openjdk/hotspot/src/share/vm/memory/compactPermGen.hpp
---- openjdk6/hotspot/src/share/vm/memory/compactPermGen.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/compactPermGen.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compactPermGen.hpp	1.17 07/05/05 17:05:45 JVM"
--#endif
- /*
-  * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.cpp openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.cpp
---- openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compactingPermGenGen.cpp	1.22 08/11/24 12:22:45 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -29,27 +26,9 @@
- #include "incls/_compactingPermGenGen.cpp.incl"
- 
- 
--// An ObjectClosure helper: Recursively adjust all pointers in an object
--// and all objects by referenced it. Clear marks on objects in order to
--// prevent visiting any object twice. This helper is used when the
--// RedefineClasses() API has been called.
--
--class AdjustSharedObjectClosure : public ObjectClosure {
--public:
--  void do_object(oop obj) {
--    if (obj->is_shared_readwrite()) {
--      if (obj->mark()->is_marked()) {
--        obj->init_mark();         // Don't revisit this object.
--        obj->adjust_pointers();   // Adjust this object's references.
--      }
--    }
--  }
--};
--
--
--// An OopClosure helper: Recursively adjust all pointers in an object
--// and all objects by referenced it. Clear marks on objects in order
--// to prevent visiting any object twice.
-+// Recursively adjust all pointers in an object and all objects by
-+// referenced it.  Clear marks on objects in order to prevent visiting
-+// any object twice.
- 
- class RecursiveAdjustSharedObjectClosure : public OopClosure {
- public:
-@@ -295,27 +274,9 @@
- // objects in the space will page in more objects than we need.
- // Instead, use the system dictionary as strong roots into the read
- // write space.
--//
--// If a RedefineClasses() call has been made, then we have to iterate
--// over the entire shared read-write space in order to find all the
--// objects that need to be forwarded. For example, it is possible for
--// an nmethod to be found and marked in GC phase-1 only for the nmethod
--// to be freed by the time we reach GC phase-3. The underlying method
--// is still marked, but we can't (easily) find it in GC phase-3 so we
--// blow up in GC phase-4. With RedefineClasses() we want replaced code
--// (EMCP or obsolete) to go away (i.e., be collectible) once it is no
--// longer being executed by any thread so we keep minimal attachments
--// to the replaced code. However, we can't guarantee when those EMCP
--// or obsolete methods will be collected so they may still be out there
--// even after we've severed our minimal attachments.
- 
- void CompactingPermGenGen::pre_adjust_pointers() {
-   if (spec()->enable_shared_spaces()) {
--    if (JvmtiExport::has_redefined_a_class()) {
--      // RedefineClasses() requires a brute force approach
--      AdjustSharedObjectClosure blk;
--      rw_space()->object_iterate(&blk);
--    } else {
-       RecursiveAdjustSharedObjectClosure blk;
-       Universe::oops_do(&blk);
-       StringTable::oops_do(&blk);
-@@ -323,7 +284,6 @@
-       TraversePlaceholdersClosure tpc;
-       SystemDictionary::placeholders_do(&tpc);
-     }
--  }
- }
- 
- 
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.hpp openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp
---- openjdk6/hotspot/src/share/vm/memory/compactingPermGenGen.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/compactingPermGenGen.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compactingPermGenGen.hpp	1.22 07/08/31 18:41:29 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/defNewGeneration.cpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp
---- openjdk6/hotspot/src/share/vm/memory/defNewGeneration.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)defNewGeneration.cpp	1.73 07/05/22 17:24:57 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/defNewGeneration.hpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.hpp
---- openjdk6/hotspot/src/share/vm/memory/defNewGeneration.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)defNewGeneration.hpp	1.40 07/05/17 15:54:44 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp openjdk/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/defNewGeneration.inline.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)defNewGeneration.inline.hpp	1.18 07/05/05 17:05:46 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/dump.cpp openjdk/hotspot/src/share/vm/memory/dump.cpp
---- openjdk6/hotspot/src/share/vm/memory/dump.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/dump.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)dump.cpp	1.33 07/05/23 10:53:38 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/filemap.cpp openjdk/hotspot/src/share/vm/memory/filemap.cpp
---- openjdk6/hotspot/src/share/vm/memory/filemap.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/filemap.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)filemap.cpp	1.25 07/05/05 17:05:41 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/filemap.hpp openjdk/hotspot/src/share/vm/memory/filemap.hpp
---- openjdk6/hotspot/src/share/vm/memory/filemap.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/filemap.hpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)filemap.hpp	1.16 07/05/05 17:05:47 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/gcLocker.cpp openjdk/hotspot/src/share/vm/memory/gcLocker.cpp
---- openjdk6/hotspot/src/share/vm/memory/gcLocker.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/gcLocker.cpp	2008-12-05 16:41:21.997635494 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcLocker.cpp	1.52 07/05/17 15:54:45 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/gcLocker.hpp openjdk/hotspot/src/share/vm/memory/gcLocker.hpp
---- openjdk6/hotspot/src/share/vm/memory/gcLocker.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/gcLocker.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcLocker.hpp	1.60 07/05/17 15:54:47 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -286,4 +283,3 @@
-   ~No_Alloc_Verifier() {}
- #endif
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/gcLocker.inline.hpp openjdk/hotspot/src/share/vm/memory/gcLocker.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/gcLocker.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/gcLocker.inline.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)gcLocker.inline.hpp	1.21 07/05/05 17:05:49 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -73,4 +70,3 @@
-     }
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.cpp openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp
---- openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)genCollectedHeap.cpp	1.190 07/06/15 16:44:02 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.hpp openjdk/hotspot/src/share/vm/memory/genCollectedHeap.hpp
---- openjdk6/hotspot/src/share/vm/memory/genCollectedHeap.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)genCollectedHeap.hpp	1.106 07/07/22 22:36:34 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genMarkSweep.cpp openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp
---- openjdk6/hotspot/src/share/vm/memory/genMarkSweep.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)genMarkSweep.cpp	1.40 07/05/17 15:54:55 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genMarkSweep.hpp openjdk/hotspot/src/share/vm/memory/genMarkSweep.hpp
---- openjdk6/hotspot/src/share/vm/memory/genMarkSweep.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genMarkSweep.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)genMarkSweep.hpp	1.11 07/05/05 17:05:49 JVM"
--#endif
- /*
-  * Copyright 2001-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genOopClosures.hpp openjdk/hotspot/src/share/vm/memory/genOopClosures.hpp
---- openjdk6/hotspot/src/share/vm/memory/genOopClosures.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genOopClosures.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)genOopClosures.hpp	1.64 07/05/29 09:44:15 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genOopClosures.inline.hpp openjdk/hotspot/src/share/vm/memory/genOopClosures.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/genOopClosures.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genOopClosures.inline.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)genOopClosures.inline.hpp	1.40 07/05/29 09:44:15 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genRemSet.cpp openjdk/hotspot/src/share/vm/memory/genRemSet.cpp
---- openjdk6/hotspot/src/share/vm/memory/genRemSet.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genRemSet.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)genRemSet.cpp	1.11 07/05/05 17:05:50 JVM"
--#endif
- /*
-  * Copyright 2001-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genRemSet.hpp openjdk/hotspot/src/share/vm/memory/genRemSet.hpp
---- openjdk6/hotspot/src/share/vm/memory/genRemSet.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genRemSet.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)genRemSet.hpp	1.23 07/05/05 17:05:50 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/genRemSet.inline.hpp openjdk/hotspot/src/share/vm/memory/genRemSet.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/genRemSet.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/genRemSet.inline.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)genRemSet.inline.hpp	1.10 07/05/05 17:05:50 JVM"
--#endif
- /*
-  * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/generation.cpp openjdk/hotspot/src/share/vm/memory/generation.cpp
---- openjdk6/hotspot/src/share/vm/memory/generation.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generation.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)generation.cpp	1.245 07/05/05 17:05:51 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/generation.hpp openjdk/hotspot/src/share/vm/memory/generation.hpp
---- openjdk6/hotspot/src/share/vm/memory/generation.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generation.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)generation.hpp	1.195 07/05/17 15:55:02 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/generation.inline.hpp openjdk/hotspot/src/share/vm/memory/generation.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/generation.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generation.inline.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)generation.inline.hpp	1.38 07/05/05 17:05:50 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/generationSpec.cpp openjdk/hotspot/src/share/vm/memory/generationSpec.cpp
---- openjdk6/hotspot/src/share/vm/memory/generationSpec.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generationSpec.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)generationSpec.cpp	1.29 07/05/29 09:44:15 JVM"
--#endif
- /*
-  * Copyright 2001-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/generationSpec.hpp openjdk/hotspot/src/share/vm/memory/generationSpec.hpp
---- openjdk6/hotspot/src/share/vm/memory/generationSpec.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/generationSpec.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)generationSpec.hpp	1.17 07/05/05 17:05:50 JVM"
--#endif
- /*
-  * Copyright 2001-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/heap.cpp openjdk/hotspot/src/share/vm/memory/heap.cpp
---- openjdk6/hotspot/src/share/vm/memory/heap.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/heap.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)heap.cpp	1.55 07/10/04 10:49:31 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -483,4 +480,3 @@
-   }
-   guarantee(count == 0, "missing free blocks");  
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/heap.hpp openjdk/hotspot/src/share/vm/memory/heap.hpp
---- openjdk6/hotspot/src/share/vm/memory/heap.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/heap.hpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)heap.hpp	1.43 07/05/05 17:05:47 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/heapInspection.cpp openjdk/hotspot/src/share/vm/memory/heapInspection.cpp
---- openjdk6/hotspot/src/share/vm/memory/heapInspection.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.cpp	2008-12-05 16:41:22.007635645 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)heapInspection.cpp	1.21 07/05/29 09:44:16 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/heapInspection.hpp openjdk/hotspot/src/share/vm/memory/heapInspection.hpp
---- openjdk6/hotspot/src/share/vm/memory/heapInspection.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/heapInspection.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)heapInspection.hpp	1.17 07/07/02 11:47:11 JVM"
--#endif
- /*
-  * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/iterator.cpp openjdk/hotspot/src/share/vm/memory/iterator.cpp
---- openjdk6/hotspot/src/share/vm/memory/iterator.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/iterator.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)iterator.cpp	1.18 07/05/05 17:05:50 JVM"
--#endif
- /*
-  * Copyright 1997-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -35,4 +32,3 @@
- void VoidClosure::do_void() {
-   ShouldNotCallThis();
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/iterator.hpp openjdk/hotspot/src/share/vm/memory/iterator.hpp
---- openjdk6/hotspot/src/share/vm/memory/iterator.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/iterator.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)iterator.hpp	1.38 07/05/05 17:05:52 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/memRegion.cpp openjdk/hotspot/src/share/vm/memory/memRegion.cpp
---- openjdk6/hotspot/src/share/vm/memory/memRegion.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/memRegion.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)memRegion.cpp	1.23 07/05/05 17:05:52 JVM"
--#endif
- /*
-  * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/memRegion.hpp openjdk/hotspot/src/share/vm/memory/memRegion.hpp
---- openjdk6/hotspot/src/share/vm/memory/memRegion.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/memRegion.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)memRegion.hpp	1.27 07/05/05 17:05:53 JVM"
--#endif
- /*
-  * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/modRefBarrierSet.hpp openjdk/hotspot/src/share/vm/memory/modRefBarrierSet.hpp
---- openjdk6/hotspot/src/share/vm/memory/modRefBarrierSet.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/modRefBarrierSet.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)modRefBarrierSet.hpp	1.16 07/05/05 17:05:53 JVM"
--#endif
- /*
-  * Copyright 2000-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/oopFactory.cpp openjdk/hotspot/src/share/vm/memory/oopFactory.cpp
---- openjdk6/hotspot/src/share/vm/memory/oopFactory.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/oopFactory.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)oopFactory.cpp	1.83 07/05/05 17:05:53 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -146,4 +143,3 @@
-   c->set_holder_klass(klass());
-   return c;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/oopFactory.hpp openjdk/hotspot/src/share/vm/memory/oopFactory.hpp
---- openjdk6/hotspot/src/share/vm/memory/oopFactory.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/oopFactory.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oopFactory.hpp	1.61 07/05/05 17:05:53 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/permGen.cpp openjdk/hotspot/src/share/vm/memory/permGen.cpp
---- openjdk6/hotspot/src/share/vm/memory/permGen.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/permGen.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)permGen.cpp	1.54 07/05/29 09:44:16 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/permGen.hpp openjdk/hotspot/src/share/vm/memory/permGen.hpp
---- openjdk6/hotspot/src/share/vm/memory/permGen.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/permGen.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)permGen.hpp	1.38 07/05/29 09:44:16 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -74,4 +71,3 @@
-     g->update_counters();
-   }
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/referencePolicy.cpp openjdk/hotspot/src/share/vm/memory/referencePolicy.cpp
---- openjdk6/hotspot/src/share/vm/memory/referencePolicy.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/referencePolicy.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)referencePolicy.cpp	1.12 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -71,4 +68,3 @@
- 
-   return true;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/referencePolicy.hpp openjdk/hotspot/src/share/vm/memory/referencePolicy.hpp
---- openjdk6/hotspot/src/share/vm/memory/referencePolicy.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/referencePolicy.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)referencePolicy.hpp	1.11 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/referenceProcessor.cpp openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp
---- openjdk6/hotspot/src/share/vm/memory/referenceProcessor.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)referenceProcessor.cpp	1.57 07/08/17 12:30:18 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/referenceProcessor.hpp openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
---- openjdk6/hotspot/src/share/vm/memory/referenceProcessor.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)referenceProcessor.hpp	1.43 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -500,4 +497,3 @@
-   oop                 _sentinel_ref; 
-   int                 _n_queues;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/resourceArea.cpp openjdk/hotspot/src/share/vm/memory/resourceArea.cpp
---- openjdk6/hotspot/src/share/vm/memory/resourceArea.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/resourceArea.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)resourceArea.cpp	1.57 07/05/05 17:05:55 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/resourceArea.hpp openjdk/hotspot/src/share/vm/memory/resourceArea.hpp
---- openjdk6/hotspot/src/share/vm/memory/resourceArea.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/resourceArea.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)resourceArea.hpp	1.45 07/05/05 17:05:55 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/restore.cpp openjdk/hotspot/src/share/vm/memory/restore.cpp
---- openjdk6/hotspot/src/share/vm/memory/restore.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/restore.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)restore.cpp	1.14 07/05/05 17:05:44 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/serialize.cpp openjdk/hotspot/src/share/vm/memory/serialize.cpp
---- openjdk6/hotspot/src/share/vm/memory/serialize.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/serialize.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)serialize.cpp	1.9 07/05/05 17:05:55 JVM"
--#endif
- /*
-  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/sharedHeap.cpp openjdk/hotspot/src/share/vm/memory/sharedHeap.cpp
---- openjdk6/hotspot/src/share/vm/memory/sharedHeap.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/sharedHeap.cpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)sharedHeap.cpp	1.59 07/05/17 15:55:10 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/sharedHeap.hpp openjdk/hotspot/src/share/vm/memory/sharedHeap.hpp
---- openjdk6/hotspot/src/share/vm/memory/sharedHeap.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/sharedHeap.hpp	2008-12-05 16:41:22.017635795 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)sharedHeap.hpp	1.56 07/05/05 17:05:55 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -273,5 +270,3 @@
- 			     size_t bytes_after,
- 			     size_t capacity);
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/space.cpp openjdk/hotspot/src/share/vm/memory/space.cpp
---- openjdk6/hotspot/src/share/vm/memory/space.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/space.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)space.cpp	1.217 07/05/29 09:44:13 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/space.hpp openjdk/hotspot/src/share/vm/memory/space.hpp
---- openjdk6/hotspot/src/share/vm/memory/space.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/space.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)space.hpp	1.149 07/05/29 09:44:14 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/space.inline.hpp openjdk/hotspot/src/share/vm/memory/space.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/space.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/space.inline.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)space.inline.hpp	1.17 07/05/05 17:05:54 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.cpp openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.cpp
---- openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)specialized_oop_closures.cpp	1.14 07/05/05 17:05:56 JVM"
--#endif
- /*
-  * Copyright 2001-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.hpp openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.hpp
---- openjdk6/hotspot/src/share/vm/memory/specialized_oop_closures.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/specialized_oop_closures.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)specialized_oop_closures.hpp	1.30 07/05/29 09:44:17 JVM"
--#endif
- /*
-  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.cpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp
---- openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)tenuredGeneration.cpp	1.47 07/05/29 09:44:17 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.hpp openjdk/hotspot/src/share/vm/memory/tenuredGeneration.hpp
---- openjdk6/hotspot/src/share/vm/memory/tenuredGeneration.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)tenuredGeneration.hpp	1.27 07/05/29 09:44:17 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
---- openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)threadLocalAllocBuffer.cpp	1.55 07/07/05 17:12:38 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp
---- openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)threadLocalAllocBuffer.hpp	1.35 07/07/05 17:12:36 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)threadLocalAllocBuffer.inline.hpp	1.29 07/05/05 17:05:56 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/universe.cpp openjdk/hotspot/src/share/vm/memory/universe.cpp
---- openjdk6/hotspot/src/share/vm/memory/universe.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/universe.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)universe.cpp	1.361 07/09/01 18:01:02 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/universe.hpp openjdk/hotspot/src/share/vm/memory/universe.hpp
---- openjdk6/hotspot/src/share/vm/memory/universe.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/universe.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)universe.hpp	1.183 07/08/09 09:12:00 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/universe.inline.hpp openjdk/hotspot/src/share/vm/memory/universe.inline.hpp
---- openjdk6/hotspot/src/share/vm/memory/universe.inline.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/universe.inline.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)universe.inline.hpp	1.47 07/05/05 17:05:57 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -38,6 +35,3 @@
- inline bool Universe::field_type_should_be_aligned(BasicType type) {
-   return type == T_DOUBLE || type == T_LONG;
- }
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/memory/watermark.hpp openjdk/hotspot/src/share/vm/memory/watermark.hpp
---- openjdk6/hotspot/src/share/vm/memory/watermark.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/watermark.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)watermark.hpp	1.14 07/05/05 17:05:56 JVM"
--#endif
- /*
-  * Copyright 2000-2001 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -54,4 +51,3 @@
- inline bool operator!=(const WaterMark& x, const WaterMark& y) {
-   return !(x == y);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlass.cpp openjdk/hotspot/src/share/vm/oops/arrayKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/arrayKlass.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/arrayKlass.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)arrayKlass.cpp	1.95 07/05/05 17:05:59 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlass.hpp openjdk/hotspot/src/share/vm/oops/arrayKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/arrayKlass.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/arrayKlass.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)arrayKlass.hpp	1.66 07/05/05 17:05:58 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -135,4 +132,3 @@
-   // Verification
-   void oop_verify_on(oop obj, outputStream* st);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)arrayKlassKlass.cpp	1.56 07/05/29 09:44:17 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/arrayKlassKlass.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/arrayKlassKlass.hpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)arrayKlassKlass.hpp	1.39 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -70,4 +67,3 @@
-   const char* internal_name() const;
-   void oop_verify_on(oop obj, outputStream* st);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayOop.cpp openjdk/hotspot/src/share/vm/oops/arrayOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/arrayOop.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/arrayOop.cpp	2008-12-05 16:41:22.027635946 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)arrayOop.cpp	1.18 07/05/05 17:05:58 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -29,4 +26,3 @@
- # include "incls/_arrayOop.cpp.incl"
- 
- // <<this page is intentionally left blank>>
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/arrayOop.hpp openjdk/hotspot/src/share/vm/oops/arrayOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/arrayOop.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/arrayOop.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)arrayOop.hpp	1.35 07/05/05 17:06:00 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compiledICHolderKlass.cpp	1.41 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderKlass.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compiledICHolderKlass.hpp	1.32 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -84,4 +81,3 @@
-   void oop_verify_on(oop obj, outputStream* st);
- 
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.cpp openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.cpp	2008-11-25 10:12:08.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compiledICHolderOop.cpp	1.12 07/05/05 17:05:59 JVM"
--#endif
- /*
-  * Copyright 1998 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -29,4 +26,3 @@
- # include "incls/_compiledICHolderOop.cpp.incl"
- 
- // <<this page is intentionally left blank>>
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.hpp openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/compiledICHolderOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/compiledICHolderOop.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compiledICHolderOop.hpp	1.20 07/05/05 17:05:59 JVM"
--#endif
- /*
-  * Copyright 1998-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodKlass.cpp openjdk/hotspot/src/share/vm/oops/constMethodKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/constMethodKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constMethodKlass.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)constMethodKlass.cpp	1.25 07/08/29 13:42:26 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -302,4 +299,3 @@
-   // Temporarily set exception_table to point to self
-   m->set_exception_table((typeArrayOop)obj);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodKlass.hpp openjdk/hotspot/src/share/vm/oops/constMethodKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/constMethodKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constMethodKlass.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)constMethodKlass.hpp	1.15 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -91,4 +88,3 @@
-   bool oop_partially_loaded(oop obj) const;
-   void oop_set_partially_loaded(oop obj);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodOop.cpp openjdk/hotspot/src/share/vm/oops/constMethodOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/constMethodOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constMethodOop.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)constMethodOop.cpp	1.11 07/05/05 17:06:00 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constMethodOop.hpp openjdk/hotspot/src/share/vm/oops/constMethodOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/constMethodOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constMethodOop.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)constMethodOop.hpp	1.24 07/05/05 17:05:59 JVM"
--#endif
- /*
-  * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.cpp openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)constantPoolKlass.cpp	1.105 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.hpp openjdk/hotspot/src/share/vm/oops/constantPoolKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/constantPoolKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constantPoolKlass.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)constantPoolKlass.hpp	1.51 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -78,4 +75,3 @@
-   static void preload_and_initialize_all_classes(oop constant_pool, TRAPS);
- #endif
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolOop.cpp openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/constantPoolOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)constantPoolOop.cpp	1.104 07/05/05 17:06:01 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/constantPoolOop.hpp openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/constantPoolOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)constantPoolOop.hpp	1.105 07/08/29 13:42:26 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.cpp openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/cpCacheKlass.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cpCacheKlass.cpp	1.46 07/05/29 09:44:18 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -206,4 +203,3 @@
- const char* constantPoolCacheKlass::internal_name() const { 
-   return "{constant pool cache}"; 
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.hpp openjdk/hotspot/src/share/vm/oops/cpCacheKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/cpCacheKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/cpCacheKlass.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cpCacheKlass.hpp	1.33 07/05/29 09:44:19 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -69,4 +66,3 @@
-   const char* internal_name() const;
-   void oop_verify_on(oop obj, outputStream* st);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheOop.cpp openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/cpCacheOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cpCacheOop.cpp	1.79 07/05/29 09:44:19 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/cpCacheOop.hpp openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/cpCacheOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cpCacheOop.hpp	1.74 07/05/29 09:44:19 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -326,4 +323,3 @@
-   void adjust_method_entries(methodOop* old_methods, methodOop* new_methods,
-                              int methods_length, bool * trace_name_printed);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/generateOopMap.cpp openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp
---- openjdk6/hotspot/src/share/vm/oops/generateOopMap.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp	2008-12-05 16:41:22.037636097 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)generateOopMap.cpp	1.141 07/05/05 17:06:03 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -2537,4 +2534,3 @@
- #endif
-   return methodHandle(THREAD, method());
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/generateOopMap.hpp openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp
---- openjdk6/hotspot/src/share/vm/oops/generateOopMap.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)generateOopMap.hpp	1.65 07/05/05 17:06:01 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -554,6 +551,3 @@
- 
-   // Call compute_map(CHECK) to generate info.  
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/instanceKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)instanceKlass.cpp	1.324 08/11/24 12:22:48 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -2168,20 +2165,12 @@
-   RC_TRACE(0x00000100, ("adding previous version ref for %s @%d, EMCP_cnt=%d",
-     ikh->external_name(), _previous_versions->length(), emcp_method_count));
-   constantPoolHandle cp_h(ikh->constants());
--  jobject cp_ref;
--  if (cp_h->is_shared()) {
--    // a shared ConstantPool requires a regular reference; a weak
--    // reference would be collectible
--    cp_ref = JNIHandles::make_global(cp_h);
--  } else {
--    cp_ref = JNIHandles::make_weak_global(cp_h);
--  }
-+  jweak cp_ref = JNIHandles::make_weak_global(cp_h);
-   PreviousVersionNode * pv_node = NULL;
-   objArrayOop old_methods = ikh->methods();
- 
-   if (emcp_method_count == 0) {
--    // non-shared ConstantPool gets a weak reference
--    pv_node = new PreviousVersionNode(cp_ref, !cp_h->is_shared(), NULL);
-+    pv_node = new PreviousVersionNode(cp_ref, NULL);
-     RC_TRACE(0x00000400,
-       ("add: all methods are obsolete; flushing any EMCP weak refs"));
-   } else {
-@@ -2201,8 +2190,7 @@
-         }
-       }
-     }
--    // non-shared ConstantPool gets a weak reference
--    pv_node = new PreviousVersionNode(cp_ref, !cp_h->is_shared(), method_refs);
-+    pv_node = new PreviousVersionNode(cp_ref, method_refs);
-   }
- 
-   _previous_versions->append(pv_node);
-@@ -2220,7 +2208,7 @@
-     // check the previous versions array for a GC'ed weak refs
-     pv_node = _previous_versions->at(i);
-     cp_ref = pv_node->prev_constant_pool();
--    assert(cp_ref != NULL, "cp ref was unexpectedly cleared");
-+    assert(cp_ref != NULL, "weak cp ref was unexpectedly cleared");
-     if (cp_ref == NULL) {
-       delete pv_node;
-       _previous_versions->remove_at(i);
-@@ -2293,7 +2281,7 @@
-           // check the previous versions array for a GC'ed weak refs
-           pv_node = _previous_versions->at(j);
-           cp_ref = pv_node->prev_constant_pool();
--          assert(cp_ref != NULL, "cp ref was unexpectedly cleared");
-+          assert(cp_ref != NULL, "weak cp ref was unexpectedly cleared");
-           if (cp_ref == NULL) {
-             delete pv_node;
-             _previous_versions->remove_at(j);
-@@ -2391,8 +2379,8 @@
-     // been GC'ed
-     PreviousVersionNode * pv_node = _previous_versions->at(i);
- 
--    jobject cp_ref = pv_node->prev_constant_pool();
--    assert(cp_ref != NULL, "cp reference was unexpectedly cleared");
-+    jweak cp_ref = pv_node->prev_constant_pool();
-+    assert(cp_ref != NULL, "weak reference was unexpectedly cleared");
-     if (cp_ref == NULL) {
-       continue;  // robustness
-     }
-@@ -2452,11 +2440,10 @@
- 
- // Construct a PreviousVersionNode entry for the array hung off
- // the instanceKlass.
--PreviousVersionNode::PreviousVersionNode(jobject prev_constant_pool,
--  bool prev_cp_is_weak, GrowableArray<jweak>* prev_EMCP_methods) {
-+PreviousVersionNode::PreviousVersionNode(jweak prev_constant_pool,
-+  GrowableArray<jweak>* prev_EMCP_methods) {
- 
-   _prev_constant_pool = prev_constant_pool;
--  _prev_cp_is_weak = prev_cp_is_weak;
-   _prev_EMCP_methods = prev_EMCP_methods;
- }
- 
-@@ -2464,11 +2451,7 @@
- // Destroy a PreviousVersionNode
- PreviousVersionNode::~PreviousVersionNode() {
-   if (_prev_constant_pool != NULL) {
--    if (_prev_cp_is_weak) {
-       JNIHandles::destroy_weak_global(_prev_constant_pool);
--    } else {
--      JNIHandles::destroy_global(_prev_constant_pool);
--    }
-   }
- 
-   if (_prev_EMCP_methods != NULL) {
-@@ -2488,8 +2471,8 @@
-   _prev_constant_pool_handle = constantPoolHandle();  // NULL handle
-   _prev_EMCP_method_handles = NULL;
- 
--  jobject cp_ref = pv_node->prev_constant_pool();
--  assert(cp_ref != NULL, "constant pool ref was unexpectedly cleared");
-+  jweak cp_ref = pv_node->prev_constant_pool();
-+  assert(cp_ref != NULL, "weak constant pool ref was unexpectedly cleared");
-   if (cp_ref == NULL) {
-     return;  // robustness
-   }
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlass.hpp openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/instanceKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceKlass.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)instanceKlass.hpp	1.201 08/11/24 12:22:50 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -841,20 +838,11 @@
- // A collection point for interesting information about the previous
- // version(s) of an instanceKlass. This class uses weak references to
- // the information so that the information may be collected as needed
--// by the system. If the information is shared, then a regular
--// reference must be used because a weak reference would be seen as
--// collectible. A GrowableArray of PreviousVersionNodes is attached
-+// by the system. A GrowableArray of PreviousVersionNodes is attached
- // to the instanceKlass as needed. See PreviousVersionWalker below.
- class PreviousVersionNode : public CHeapObj {
-  private:
--  // A shared ConstantPool is never collected so we'll always have
--  // a reference to it so we can update items in the cache. We'll
--  // have a weak reference to a non-shared ConstantPool until all
--  // of the methods (EMCP or obsolete) have been collected; the
--  // non-shared ConstantPool becomes collectible at that point.
--  jobject _prev_constant_pool;  // regular or weak reference
--  bool    _prev_cp_is_weak;     // true if not a shared ConstantPool
--
-+  jweak _prev_constant_pool;
-   // If the previous version of the instanceKlass doesn't have any
-   // EMCP methods, then _prev_EMCP_methods will be NULL. If all the
-   // EMCP methods have been collected, then _prev_EMCP_methods can
-@@ -862,10 +850,10 @@
-   GrowableArray<jweak>* _prev_EMCP_methods;
- 
- public:
--  PreviousVersionNode(jobject prev_constant_pool, bool prev_cp_is_weak,
-+  PreviousVersionNode(jweak prev_constant_pool,
-     GrowableArray<jweak>* prev_EMCP_methods);
-   ~PreviousVersionNode();
--  jobject prev_constant_pool() const {
-+  jweak prev_constant_pool() const {
-     return _prev_constant_pool;
-   }
-   GrowableArray<jweak>* prev_EMCP_methods() const {
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)instanceKlassKlass.cpp	1.157 07/07/27 16:19:58 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -810,4 +807,3 @@
-   assert(ik->transitive_interfaces() == NULL, "just checking");
-   ik->set_transitive_interfaces((objArrayOop) obj);   // Temporarily set transitive_interfaces to point to self
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/instanceKlassKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceKlassKlass.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)instanceKlassKlass.hpp	1.54 07/05/29 09:44:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -87,4 +84,3 @@
-   bool oop_partially_loaded(oop obj) const;
-   void oop_set_partially_loaded(oop obj);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceOop.cpp openjdk/hotspot/src/share/vm/oops/instanceOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/instanceOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceOop.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)instanceOop.cpp	1.14 07/05/05 17:06:03 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -29,4 +26,3 @@
- # include "incls/_instanceOop.cpp.incl"
- 
- // <<this page is intentionally left blank>>
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceOop.hpp openjdk/hotspot/src/share/vm/oops/instanceOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/instanceOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceOop.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)instanceOop.hpp	1.15 07/05/05 17:06:04 JVM"
--#endif
- /*
-  * Copyright 1997-2000 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -32,5 +29,3 @@
-  public:
-   static int header_size() { return sizeof(instanceOopDesc)/HeapWordSize; }
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.cpp openjdk/hotspot/src/share/vm/oops/instanceRefKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceRefKlass.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)instanceRefKlass.cpp	1.90 07/05/29 09:44:20 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.hpp openjdk/hotspot/src/share/vm/oops/instanceRefKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/instanceRefKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/instanceRefKlass.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)instanceRefKlass.hpp	1.62 07/05/29 09:44:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klass.cpp openjdk/hotspot/src/share/vm/oops/klass.cpp
---- openjdk6/hotspot/src/share/vm/oops/klass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klass.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)klass.cpp	1.119 07/05/05 17:06:00 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klass.hpp openjdk/hotspot/src/share/vm/oops/klass.hpp
---- openjdk6/hotspot/src/share/vm/oops/klass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klass.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)klass.hpp	1.142 07/05/29 09:44:17 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -768,4 +765,3 @@
-   void verify_vtable_index(int index);
- #endif
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klass.inline.hpp openjdk/hotspot/src/share/vm/oops/klass.inline.hpp
---- openjdk6/hotspot/src/share/vm/oops/klass.inline.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klass.inline.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)klass.inline.hpp	1.5 07/05/05 17:06:04 JVM"
--#endif
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassKlass.cpp openjdk/hotspot/src/share/vm/oops/klassKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/klassKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassKlass.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)klassKlass.cpp	1.70 07/08/09 09:12:01 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassKlass.hpp openjdk/hotspot/src/share/vm/oops/klassKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/klassKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassKlass.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)klassKlass.hpp	1.44 07/05/29 09:44:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -82,4 +79,3 @@
-   const char* internal_name() const;
-   void oop_verify_on(oop obj, outputStream* st);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassOop.cpp openjdk/hotspot/src/share/vm/oops/klassOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/klassOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassOop.cpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)klassOop.cpp	1.14 07/05/05 17:06:04 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -27,4 +24,3 @@
- 
- # include "incls/_precompiled.incl"
- # include "incls/_klassOop.cpp.incl"
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassOop.hpp openjdk/hotspot/src/share/vm/oops/klassOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/klassOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassOop.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)klassOop.hpp	1.19 07/05/05 17:06:04 JVM"
--#endif
- /*
-  * Copyright 1997-2002 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -45,6 +42,3 @@
-   // returns the Klass part containing dispatching behavior
-   Klass* klass_part()                            { return (Klass*)((address)this + klass_part_offset_in_bytes()); }
- };
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassPS.hpp openjdk/hotspot/src/share/vm/oops/klassPS.hpp
---- openjdk6/hotspot/src/share/vm/oops/klassPS.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassPS.hpp	2008-12-05 16:41:22.047636248 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)klassPS.hpp	1.1 07/05/14 06:13:07 JVM"
--#endif
- /*
-  * Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassVtable.cpp openjdk/hotspot/src/share/vm/oops/klassVtable.cpp
---- openjdk6/hotspot/src/share/vm/oops/klassVtable.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassVtable.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)klassVtable.cpp	1.146 07/07/19 12:19:09 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -738,7 +735,7 @@
-     }    
-   }
- 
--  // The length of the itable was either zero, or it has not yet been initialized.
-+  // This lenght of the itable was either zero, or it has not yet been initialized.
-   _table_offset      = 0;
-   _size_offset_table = 0;
-   _size_method_table = 0;
-@@ -873,19 +870,16 @@
- 
- // Initialization
- void klassItable::initialize_itable(bool checkconstraints, TRAPS) {
--  // Cannot be setup doing bootstrapping, interfaces don't have
--  // itables, and klass with only ones entry have empty itables
--  if (Universe::is_bootstrapping() || 
--      _klass->is_interface() ||
--      _klass->itable_length() == itableOffsetEntry::size()) return;
--
--  // There's alway an extra itable entry so we can null-terminate it.
--  guarantee(size_offset_table() >= 1, "too small");
--  int num_interfaces = size_offset_table() - 1;
-+  // Cannot be setup doing bootstrapping
-+  if (Universe::is_bootstrapping()) return;
-+
-+  int num_interfaces = nof_interfaces();
-   if (num_interfaces > 0) {
--    if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count,
--                                    _klass->name()->as_C_string());
-+    if (TraceItables) tty->print_cr("%3d: Initializing itables for %s", ++initialize_count, _klass->name()->as_C_string());
-     
-+    // In debug mode, we got an extra NULL/NULL entry
-+    debug_only(num_interfaces--);
-+    assert(num_interfaces > 0, "to few interfaces in offset itable");
- 
-     // Interate through all interfaces
-     int i;
-@@ -896,10 +890,12 @@
-       initialize_itable_for_interface(ioe->offset(), interf_h, checkconstraints, CHECK);      
-     } 
- 
--  }  
-+#ifdef ASSERT
-   // Check that the last entry is empty
--  itableOffsetEntry* ioe = offset_entry(size_offset_table() - 1);
--  guarantee(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing");
-+    itableOffsetEntry* ioe = offset_entry(i);
-+    assert(ioe->interface_klass() == NULL && ioe->offset() == 0, "terminator entry missing");
-+#endif
-+  }
- }
- 
- 
-@@ -976,7 +972,7 @@
-   }  
- }
- 
--// Update entry for specific methodOop
-+// Update entry for specic methodOop
- void klassItable::initialize_with_method(methodOop m) {
-   itableMethodEntry* ime = method_entry(0);
-   for(int i = 0; i < _size_method_table; i++) {    
-@@ -1089,8 +1085,12 @@
-   CountInterfacesClosure cic;  
-   visit_all_interfaces(transitive_interfaces(), &cic);
-     
--  // There's alway an extra itable entry so we can null-terminate it.
--  int itable_size = calc_itable_size(cic.nof_interfaces() + 1, cic.nof_methods()); 
-+  // Add one extra entry in debug mode, so we can null-terminate the table
-+  int nof_methods    = cic.nof_methods();
-+  int nof_interfaces = cic.nof_interfaces();
-+  debug_only(if (nof_interfaces > 0) nof_interfaces++);
-+
-+  int itable_size = calc_itable_size(nof_interfaces, nof_methods);
- 
-   // Statistics
-   update_stats(itable_size * HeapWordSize);  
-@@ -1110,8 +1110,8 @@
-   int nof_methods    = cic.nof_methods();
-   int nof_interfaces = cic.nof_interfaces();
-   
--  // Add one extra entry so we can null-terminate the table
--  nof_interfaces++;
-+  // Add one extra entry in debug mode, so we can null-terminate the table
-+  debug_only(if (nof_interfaces > 0) nof_interfaces++);
-   
-   assert(compute_itable_size(objArrayHandle(klass->transitive_interfaces())) ==
-          calc_itable_size(nof_interfaces, nof_methods),
-@@ -1320,5 +1320,3 @@
- }
- 
- #endif // PRODUCT
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/klassVtable.hpp openjdk/hotspot/src/share/vm/oops/klassVtable.hpp
---- openjdk6/hotspot/src/share/vm/oops/klassVtable.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/klassVtable.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)klassVtable.hpp	1.62 07/07/19 12:19:09 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -262,7 +259,7 @@
-   itableMethodEntry* method_entry(int i) { assert(0 <= i && i <= _size_method_table, "index out of bounds");
-                                            return &((itableMethodEntry*)method_start())[i]; }
-   
--  int size_offset_table()                { return _size_offset_table; }
-+  int nof_interfaces()                   { return _size_offset_table; }
- 
-   // Initialization
-   void initialize_itable(bool checkconstraints, TRAPS);    
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/markOop.cpp openjdk/hotspot/src/share/vm/oops/markOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/markOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/markOop.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)markOop.cpp	1.30 08/11/24 12:22:53 JVM"
--#endif
- /*
-  * Copyright 1997-1999 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -40,32 +37,3 @@
-     st->print("age %d)", age());
-   }
- }
--
--
--// Give advice about whether the oop that contains this markOop
--// should be cached or not.
--bool markOopDesc::should_not_be_cached() const {
--  // the cast is because decode_pointer() isn't marked const
--  if (is_marked() && ((markOopDesc *)this)->decode_pointer() != NULL) {
--    // If the oop containing this markOop is being forwarded, then
--    // we are in the middle of GC and we do not want the containing
--    // oop to be added to a cache. We have no way of knowing whether
--    // the cache has already been visited by the current GC phase so
--    // we don't know whether the forwarded oop will be properly
--    // processed in this phase. If the forwarded oop is not properly
--    // processed, then we'll see strange crashes or asserts during
--    // the next GC run because the markOop will contain an unexpected
--    // value.
--    //
--    // This situation has been seen when we are GC'ing a methodOop
--    // because we use the methodOop while we're GC'ing it. Scary
--    // stuff. Some of the uses the methodOop cause the methodOop to
--    // be added to the OopMapCache in the instanceKlass as a side
--    // effect. This check lets the cache maintainer know when a
--    // cache addition would not be safe.
--    return true;
--  }
--
--  // caching the containing oop should be just fine
--  return false;
--}
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/markOop.hpp openjdk/hotspot/src/share/vm/oops/markOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/markOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/markOop.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)markOop.hpp	1.66 08/11/24 12:22:54 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -360,7 +357,4 @@
- 
-   // Recover address of oop from encoded form used in mark
-   inline void* decode_pointer() { if (UseBiasedLocking && has_bias_pattern()) return NULL; return clear_lock_bits(); }
--
--  // see the definition in markOop.cpp for the gory details
--  bool should_not_be_cached() const;
- };
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/markOop.inline.hpp openjdk/hotspot/src/share/vm/oops/markOop.inline.hpp
---- openjdk6/hotspot/src/share/vm/oops/markOop.inline.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/markOop.inline.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)markOop.inline.hpp	1.7 07/05/05 17:06:04 JVM"
--#endif
- /*
-  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataKlass.cpp openjdk/hotspot/src/share/vm/oops/methodDataKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/methodDataKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodDataKlass.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)methodDataKlass.cpp	1.36 07/05/29 09:44:22 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -239,4 +236,3 @@
-   guarantee(m->is_perm(), "should be in permspace");
-   m->verify_data_on(st);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataKlass.hpp openjdk/hotspot/src/share/vm/oops/methodDataKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/methodDataKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodDataKlass.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)methodDataKlass.hpp	1.30 07/05/29 09:44:23 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataOop.cpp openjdk/hotspot/src/share/vm/oops/methodDataOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/methodDataOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodDataOop.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)methodDataOop.cpp	1.51 07/05/29 09:44:22 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodDataOop.hpp openjdk/hotspot/src/share/vm/oops/methodDataOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/methodDataOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodDataOop.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)methodDataOop.hpp	1.54 07/08/29 13:42:27 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodKlass.cpp openjdk/hotspot/src/share/vm/oops/methodKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/methodKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodKlass.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)methodKlass.cpp	1.120 07/05/29 09:44:23 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -362,4 +359,3 @@
-   constMethodKlass* ck = constMethodKlass::cast(xconst->klass());
-   ck->oop_set_partially_loaded(xconst);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodKlass.hpp openjdk/hotspot/src/share/vm/oops/methodKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/methodKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodKlass.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)methodKlass.hpp	1.49 07/05/29 09:44:23 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -85,4 +82,3 @@
-   bool oop_partially_loaded(oop obj) const;
-   void oop_set_partially_loaded(oop obj);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodOop.cpp openjdk/hotspot/src/share/vm/oops/methodOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/methodOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodOop.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)methodOop.cpp	1.314 08/11/24 12:22:56 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -768,28 +765,6 @@
- }
- 
- 
--// give advice about whether this methodOop should be cached or not
--bool methodOopDesc::should_not_be_cached() const {
--  if (is_old()) {
--    // This method has been redefined. It is either EMCP or obsolete
--    // and we don't want to cache it because that would pin the method
--    // down and prevent it from being collectible if and when it
--    // finishes executing.
--    return true;
--  }
--
--  if (mark()->should_not_be_cached()) {
--    // It is either not safe or not a good idea to cache this
--    // method at this time because of the state of the embedded
--    // markOop. See markOop.cpp for the gory details.
--    return true;
--  }
--
--  // caching this method should be just fine
--  return false;
--}
--
--
- methodHandle methodOopDesc:: clone_with_new_data(methodHandle m, u_char* new_code, int new_code_length, 
-                                                 u_char* new_compressed_linenumber_table, int new_compressed_linenumber_size, TRAPS) {
-   // Code below does not work for native methods - they should never get rewritten anyway
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/methodOop.hpp openjdk/hotspot/src/share/vm/oops/methodOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/methodOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/methodOop.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)methodOop.hpp	1.221 08/11/24 12:22:56 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -527,8 +524,6 @@
-   void set_is_old()                                 { _access_flags.set_is_old(); }
-   bool is_obsolete() const                          { return access_flags().is_obsolete(); }
-   void set_is_obsolete()                            { _access_flags.set_is_obsolete(); }
--  // see the definition in methodOop.cpp for the gory details
--  bool should_not_be_cached() const;
- 
-   // JVMTI Native method prefixing support:
-   bool is_prefixed_native() const                   { return access_flags().is_prefixed_native(); }
-@@ -742,5 +737,3 @@
-   void set(methodOop method);
-   void clear(methodOop method);
- };
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlass.cpp openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/objArrayKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)objArrayKlass.cpp	1.147 07/05/29 09:44:23 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlass.hpp openjdk/hotspot/src/share/vm/oops/objArrayKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/objArrayKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)objArrayKlass.hpp	1.87 07/05/29 09:44:23 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -129,4 +126,3 @@
-   void oop_verify_old_oop(oop obj, oop* p, bool allow_dirty);
- 
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)objArrayKlassKlass.cpp	1.79 07/05/29 09:44:24 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -309,4 +306,3 @@
-   Klass* bk = Klass::cast(oak->bottom_klass());
-   guarantee(bk->oop_is_instance() || bk->oop_is_typeArray(),  "invalid bottom klass");
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayKlassKlass.hpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)objArrayKlassKlass.hpp	1.48 07/05/29 09:44:24 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -80,4 +77,3 @@
-   void oop_verify_on(oop obj, outputStream* st);
- 
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayOop.cpp openjdk/hotspot/src/share/vm/oops/objArrayOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/objArrayOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayOop.cpp	2008-12-05 16:41:22.057636399 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)objArrayOop.cpp	1.14 07/05/05 17:06:07 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -29,4 +26,3 @@
- # include "incls/_objArrayOop.cpp.incl"
- 
- // <<this page is intentionally left blank>>
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/objArrayOop.hpp openjdk/hotspot/src/share/vm/oops/objArrayOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/objArrayOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/objArrayOop.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)objArrayOop.hpp	1.29 07/05/05 17:06:07 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.cpp openjdk/hotspot/src/share/vm/oops/oop.cpp
---- openjdk6/hotspot/src/share/vm/oops/oop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)oop.cpp	1.99 07/05/29 09:44:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.hpp openjdk/hotspot/src/share/vm/oops/oop.hpp
---- openjdk6/hotspot/src/share/vm/oops/oop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oop.hpp	1.118 07/08/31 18:42:30 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.inline.hpp openjdk/hotspot/src/share/vm/oops/oop.inline.hpp
---- openjdk6/hotspot/src/share/vm/oops/oop.inline.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.inline.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oop.inline.hpp	1.142 07/09/25 16:47:44 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.inline2.hpp openjdk/hotspot/src/share/vm/oops/oop.inline2.hpp
---- openjdk6/hotspot/src/share/vm/oops/oop.inline2.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.inline2.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oop.inline2.hpp	1.14 07/08/31 18:42:30 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp openjdk/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp
---- openjdk6/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.pcgc.inline.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oop.pcgc.inline.hpp	1.16 07/05/29 09:44:24 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oop.psgc.inline.hpp openjdk/hotspot/src/share/vm/oops/oop.psgc.inline.hpp
---- openjdk6/hotspot/src/share/vm/oops/oop.psgc.inline.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oop.psgc.inline.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oop.psgc.inline.hpp	1.17 07/05/05 17:06:07 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -44,4 +41,3 @@
-   }
-   // Else skip it.  The typeArrayKlass in the header never needs scavenging.
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.cpp openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp
---- openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oopsHierarchy.cpp	1.7 07/05/05 17:06:08 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.hpp openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp
---- openjdk6/hotspot/src/share/vm/oops/oopsHierarchy.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/oopsHierarchy.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)oopsHierarchy.hpp	1.31 07/05/17 15:57:10 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolKlass.cpp openjdk/hotspot/src/share/vm/oops/symbolKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/symbolKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/symbolKlass.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)symbolKlass.cpp	1.66 07/05/29 09:44:24 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolKlass.hpp openjdk/hotspot/src/share/vm/oops/symbolKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/symbolKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/symbolKlass.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)symbolKlass.hpp	1.42 07/05/29 09:44:24 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -75,4 +72,3 @@
- #endif
-   const char* internal_name() const;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolOop.cpp openjdk/hotspot/src/share/vm/oops/symbolOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/symbolOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/symbolOop.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)symbolOop.cpp	1.28 07/05/05 17:06:08 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/symbolOop.hpp openjdk/hotspot/src/share/vm/oops/symbolOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/symbolOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/symbolOop.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)symbolOop.hpp	1.40 07/05/05 17:06:07 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -119,4 +116,3 @@
-  return (((uintptr_t)this < (uintptr_t)other) ? -1
-    : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.cpp openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlass.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)typeArrayKlass.cpp	1.125 07/05/29 09:44:24 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.hpp openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlass.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)typeArrayKlass.hpp	1.69 07/05/29 09:44:25 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp
---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)typeArrayKlassKlass.cpp	1.30 07/05/05 17:06:08 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -71,4 +68,3 @@
- const char* typeArrayKlassKlass::internal_name() const {
-   return "{type array class}";
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp
---- openjdk6/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/typeArrayKlassKlass.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)typeArrayKlassKlass.hpp	1.24 07/05/05 17:06:08 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -59,4 +56,3 @@
-  public:
-   const char* internal_name() const;
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayOop.cpp openjdk/hotspot/src/share/vm/oops/typeArrayOop.cpp
---- openjdk6/hotspot/src/share/vm/oops/typeArrayOop.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/typeArrayOop.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)typeArrayOop.cpp	1.14 07/05/05 17:06:08 JVM"
--#endif
- /*
-  * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -29,4 +26,3 @@
- # include "incls/_typeArrayOop.cpp.incl"
- 
- // <<this page is intentionally left blank>>
--
-diff -ruNb openjdk6/hotspot/src/share/vm/oops/typeArrayOop.hpp openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp
---- openjdk6/hotspot/src/share/vm/oops/typeArrayOop.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)typeArrayOop.hpp	1.46 07/05/05 17:06:08 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/addnode.cpp openjdk/hotspot/src/share/vm/opto/addnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/addnode.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)addnode.cpp	1.142 07/10/23 13:12:52 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -611,28 +608,6 @@
-   return NULL;
- }
- 
--//------------------------------unpack_offsets----------------------------------
--// Collect the AddP offset values into the elements array, giving up
--// if there are more than length.
--int AddPNode::unpack_offsets(Node* elements[], int length) {
--  int count = 0;
--  Node* addr = this;
--  Node* base = addr->in(AddPNode::Base);
--  while (addr->is_AddP()) {
--    if (addr->in(AddPNode::Base) != base) {
--      // give up
--      return -1;
--    }
--    elements[count++] = addr->in(AddPNode::Offset);
--    if (count == length) {
--      // give up
--      return -1;
--    }
--    addr = addr->in(AddPNode::Address);
--  }
--  return count;
--}
--
- //------------------------------match_edge-------------------------------------
- // Do we Match on this edge index or not?  Do not match base pointer edge
- uint AddPNode::match_edge(uint idx) const {
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/addnode.hpp openjdk/hotspot/src/share/vm/opto/addnode.hpp
---- openjdk6/hotspot/src/share/vm/opto/addnode.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/addnode.hpp	2008-12-05 16:41:22.067636550 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)addnode.hpp	1.59 07/10/23 13:12:52 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -147,11 +144,6 @@
-   static Node* Ideal_base_and_offset(Node* ptr, PhaseTransform* phase,
-                                      // second return value:
-                                      intptr_t& offset);
--
--  // Collect the AddP offset values into the elements array, giving up
--  // if there are more than length.
--  int unpack_offsets(Node* elements[], int length);
--
-   // Do not match base-ptr edge
-   virtual uint match_edge(uint idx) const;
-   static const Type *mach_bottom_type(const MachNode* n);  // used by ad_<arch>.hpp
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/adlcVMDeps.hpp openjdk/hotspot/src/share/vm/opto/adlcVMDeps.hpp
---- openjdk6/hotspot/src/share/vm/opto/adlcVMDeps.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/adlcVMDeps.hpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)adlcVMDeps.hpp	1.19 07/05/05 17:06:10 JVM"
--#endif
- /*
-  * Copyright 1998-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/block.cpp openjdk/hotspot/src/share/vm/opto/block.cpp
---- openjdk6/hotspot/src/share/vm/opto/block.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/block.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)block.cpp	1.172 07/09/28 10:23:15 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/block.hpp openjdk/hotspot/src/share/vm/opto/block.hpp
---- openjdk6/hotspot/src/share/vm/opto/block.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/block.hpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)block.hpp	1.102 07/09/25 09:22:14 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/buildOopMap.cpp openjdk/hotspot/src/share/vm/opto/buildOopMap.cpp
---- openjdk6/hotspot/src/share/vm/opto/buildOopMap.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/buildOopMap.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)buildOopMap.cpp	1.37 07/05/05 17:06:11 JVM"
--#endif
- /*
-  * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/bytecodeInfo.cpp openjdk/hotspot/src/share/vm/opto/bytecodeInfo.cpp
---- openjdk6/hotspot/src/share/vm/opto/bytecodeInfo.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/bytecodeInfo.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)bytecodeInfo.cpp	1.122 07/05/05 17:06:12 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2_globals.cpp openjdk/hotspot/src/share/vm/opto/c2_globals.cpp
---- openjdk6/hotspot/src/share/vm/opto/c2_globals.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/c2_globals.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c2_globals.cpp	1.14 07/05/17 15:57:19 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2_globals.hpp openjdk/hotspot/src/share/vm/opto/c2_globals.hpp
---- openjdk6/hotspot/src/share/vm/opto/c2_globals.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/c2_globals.hpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c2_globals.hpp	1.96 07/10/23 13:12:52 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -370,12 +367,6 @@
-   notproduct(bool, PrintEliminateLocks, false,                              \
-           "Print out when locks are eliminated")                            \
-                                                                             \
--  diagnostic(bool, EliminateAutoBox, false,                                 \
--          "Private flag to control optimizations for autobox elimination")  \
--                                                                            \
--  product(intx, AutoBoxCacheMax, 128,                                       \
--          "Sets max value cached by the java.lang.Integer autobox cache")   \
--                                                                            \
-   product(bool, DoEscapeAnalysis, false,                                    \
-           "Perform escape analysis")                                        \
-                                                                             \
-@@ -389,4 +380,3 @@
-           "Maximum times call Label_Root to prevent stack overflow")        \
- 
- C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2compiler.cpp openjdk/hotspot/src/share/vm/opto/c2compiler.cpp
---- openjdk6/hotspot/src/share/vm/opto/c2compiler.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/c2compiler.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)c2compiler.cpp	1.29 07/05/05 17:06:11 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/c2compiler.hpp openjdk/hotspot/src/share/vm/opto/c2compiler.hpp
---- openjdk6/hotspot/src/share/vm/opto/c2compiler.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/c2compiler.hpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)c2compiler.hpp	1.28 07/05/05 17:06:11 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -57,10 +54,3 @@
-   // Print compilation timers and statistics
-   void print_timers();
- };
--
--
--
--
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/callGenerator.cpp openjdk/hotspot/src/share/vm/opto/callGenerator.cpp
---- openjdk6/hotspot/src/share/vm/opto/callGenerator.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/callGenerator.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)callGenerator.cpp	1.49 07/08/07 15:24:21 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/callGenerator.hpp openjdk/hotspot/src/share/vm/opto/callGenerator.hpp
---- openjdk6/hotspot/src/share/vm/opto/callGenerator.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/callGenerator.hpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)callGenerator.hpp	1.19 07/05/05 17:06:12 JVM"
--#endif
- /*
-  * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/callnode.cpp openjdk/hotspot/src/share/vm/opto/callnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/callnode.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/callnode.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)callnode.cpp	1.238 07/10/04 14:36:00 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/callnode.hpp openjdk/hotspot/src/share/vm/opto/callnode.hpp
---- openjdk6/hotspot/src/share/vm/opto/callnode.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/callnode.hpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)callnode.hpp	1.195 07/10/04 14:36:00 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/cfgnode.cpp openjdk/hotspot/src/share/vm/opto/cfgnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/cfgnode.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp	2008-12-05 16:41:22.077636701 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)cfgnode.cpp	1.262 08/11/24 12:22:57 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -1558,6 +1555,64 @@
-     if (opt != NULL)  return opt;
-   }
- 
-+  if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
-+    // Try to undo Phi of AddP:
-+    //   (Phi (AddP base base y) (AddP base2 base2 y))
-+    // becomes:
-+    //   newbase := (Phi base base2)
-+    //   (AddP newbase newbase y)
-+    //
-+    // This occurs as a result of unsuccessful split_thru_phi and
-+    // interferes with taking advantage of addressing modes.  See the
-+    // clone_shift_expressions code in matcher.cpp
-+    Node* addp = in(1);
-+    const Type* type = addp->in(AddPNode::Base)->bottom_type();
-+    Node* y = addp->in(AddPNode::Offset);
-+    if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
-+      // make sure that all the inputs are similar to the first one,
-+      // i.e. AddP with base == address and same offset as first AddP
-+      bool doit = true;
-+      for (uint i = 2; i < req(); i++) {
-+        if (in(i) == NULL ||
-+            in(i)->Opcode() != Op_AddP ||
-+            in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
-+            in(i)->in(AddPNode::Offset) != y) {
-+          doit = false;
-+          break;
-+        }
-+        // Accumulate type for resulting Phi
-+        type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
-+      }
-+      Node* base = NULL;
-+      if (doit) {
-+        // Check for neighboring AddP nodes in a tree.
-+        // If they have a base, use that it.
-+        for (DUIterator_Fast kmax, k = this->fast_outs(kmax); k < kmax; k++) {
-+          Node* u = this->fast_out(k);
-+          if (u->is_AddP()) {
-+            Node* base2 = u->in(AddPNode::Base);
-+            if (base2 != NULL && !base2->is_top()) {
-+              if (base == NULL)
-+                base = base2;
-+              else if (base != base2)
-+                { doit = false; break; }
-+            }
-+          }
-+        }
-+      }
-+      if (doit) {
-+        if (base == NULL) {
-+          base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
-+          for (uint i = 1; i < req(); i++) {
-+            base->init_req(i, in(i)->in(AddPNode::Base));
-+          }
-+          phase->is_IterGVN()->register_new_node_with_optimizer(base);
-+        }
-+        return new (phase->C, 4) AddPNode(base, base, y);
-+      }
-+    }
-+  }
-+
-   // Split phis through memory merges, so that the memory merges will go away.
-   // Piggy-back this transformation on the search for a unique input....
-   // It will be as if the merged memory is the unique value of the phi.
-@@ -1897,4 +1952,3 @@
-   st->print("%s", Name());
- }
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/cfgnode.hpp openjdk/hotspot/src/share/vm/opto/cfgnode.hpp
---- openjdk6/hotspot/src/share/vm/opto/cfgnode.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/cfgnode.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)cfgnode.hpp	1.117 07/10/23 13:12:52 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -313,14 +310,8 @@
-   virtual const RegMask &out_RegMask() const;
-   void dominated_by(Node* prev_dom, PhaseIterGVN* igvn);
-   int is_range_check(Node* &range, Node* &index, jint &offset);
--  Node* fold_compares(PhaseGVN* phase);
-   static Node* up_one_dom(Node* curr, bool linear_only = false);
- 
--  // Takes the type of val and filters it through the test represented
--  // by if_proj and returns a more refined type if one is produced.
--  // Returns NULL is it couldn't improve the type.
--  static const TypeInt* filtered_int_type(PhaseGVN* phase, Node* val, Node* if_proj);
--
- #ifndef PRODUCT
-   virtual void dump_spec(outputStream *st) const;
- #endif
-@@ -488,4 +479,3 @@
-   virtual void format( PhaseRegAlloc *, outputStream *st ) const;
- #endif
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/chaitin.cpp openjdk/hotspot/src/share/vm/opto/chaitin.cpp
---- openjdk6/hotspot/src/share/vm/opto/chaitin.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/chaitin.cpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)chaitin.cpp	1.116 07/09/28 10:23:12 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -46,7 +43,7 @@
-   if( _degree_valid ) tty->print( "%d ", _eff_degree );
-   else tty->print("? ");
- 
--  if( is_multidef() ) {
-+  if( _def == NodeSentinel ) {
-     tty->print("MultiDef ");
-     if (_defs != NULL) {
-       tty->print("(");
-@@ -767,7 +764,7 @@
-         // if the LRG is an unaligned pair, we will have to spill
-         // so clear the LRG's register mask if it is not already spilled
-         if ( !n->is_SpillCopy() && 
--               (lrg._def == NULL || lrg.is_multidef() || !lrg._def->is_SpillCopy()) &&
-+               (lrg._def == NULL || lrg._def == NodeSentinel || !lrg._def->is_SpillCopy()) &&
-                lrgmask.is_misaligned_Pair()) {
-           lrg.Clear();
-         }
-@@ -1284,7 +1281,7 @@
-     // Live range is live and no colors available
-     else {   
-       assert( lrg->alive(), "" );
--      assert( !lrg->_fat_proj || lrg->is_multidef() ||
-+      assert( !lrg->_fat_proj || lrg->_def == NodeSentinel ||
-               lrg->_def->outcnt() > 0, "fat_proj cannot spill");
-       assert( !orig_mask.is_AllStack(), "All Stack does not spill" );
- 
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/chaitin.hpp openjdk/hotspot/src/share/vm/opto/chaitin.hpp
---- openjdk6/hotspot/src/share/vm/opto/chaitin.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/chaitin.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)chaitin.hpp	1.161 08/03/26 10:13:00 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -159,8 +156,6 @@
- 
-   // Alive if non-zero, dead if zero
-   bool alive() const { return _def != NULL; }
--  bool is_multidef() const { return _def == NodeSentinel; }
--  bool is_singledef() const { return _def != NodeSentinel; }
- 
- #ifndef PRODUCT
-   void dump( ) const;
-@@ -325,8 +320,7 @@
-   uint split_DEF( Node *def, Block *b, int loc, uint max, Node **Reachblock, Node **debug_defs, GrowableArray<uint> splits, int slidx );
-   uint split_USE( Node *def, Block *b, Node *use, uint useidx, uint max, bool def_down, bool cisc_sp, GrowableArray<uint> splits, int slidx );
-   int clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &maxlrg );
--  Node *split_Rematerialize(Node *def, Block *b, uint insidx, uint &maxlrg, GrowableArray<uint> splits,
--                            int slidx, uint *lrg2reach, Node **Reachblock, bool walkThru);
-+  Node *split_Rematerialize( Node *def, Block *b, uint insidx, uint &maxlrg, GrowableArray<uint> splits, int slidx, uint *lrg2reach, Node **Reachblock, bool walkThru );
-   // True if lidx is used before any real register is def'd in the block
-   bool prompt_use( Block *b, uint lidx );
-   Node *get_spillcopy_wide( Node *def, Node *use, uint uidx );
-@@ -463,8 +457,7 @@
-   bool may_be_copy_of_callee( Node *def ) const;
- 
-   // If nreg already contains the same constant as val then eliminate it
--  bool eliminate_copy_of_constant(Node* val, Node* n,
--                                  Block *current_block, Node_List& value, Node_List &regnd,
-+  bool eliminate_copy_of_constant(Node* val, Block *current_block, Node_List& value, Node_List &regnd,
-                                   OptoReg::Name nreg, OptoReg::Name nreg2);
-   // Extend the node to LRG mapping
-   void add_reference( const Node *node, const Node *old_node);
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/classes.cpp openjdk/hotspot/src/share/vm/opto/classes.cpp
---- openjdk6/hotspot/src/share/vm/opto/classes.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/classes.cpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)classes.cpp	1.31 07/05/05 17:06:12 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -35,4 +32,3 @@
- #define macro(x) int x##Node::Opcode() const { return Op_##x; }
- #include "classes.hpp"
- #undef macro
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/classes.hpp openjdk/hotspot/src/share/vm/opto/classes.hpp
---- openjdk6/hotspot/src/share/vm/opto/classes.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/classes.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)classes.hpp	1.178 07/07/19 19:08:27 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/coalesce.cpp openjdk/hotspot/src/share/vm/opto/coalesce.cpp
---- openjdk6/hotspot/src/share/vm/opto/coalesce.cpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/coalesce.cpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)coalesce.cpp	1.196 07/09/28 10:23:11 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -607,8 +604,8 @@
-   // If both are single def, then src_def powers one live range
-   // and def_copy powers the other.  After merging, src_def powers
-   // the combined live range.
--  lrgs(lr1)._def = (lrgs(lr1).is_multidef() ||
--                        lrgs(lr2).is_multidef() ) 
-+  lrgs(lr1)._def = (lrgs(lr1)._def == NodeSentinel ||
-+                        lrgs(lr2)._def == NodeSentinel )
-     ? NodeSentinel : src_def;
-   lrgs(lr2)._def = NULL;    // No def for lrg 2
-   lrgs(lr2).Clear();        // Force empty mask for LRG 2
-@@ -916,4 +913,3 @@
-     */
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/coalesce.hpp openjdk/hotspot/src/share/vm/opto/coalesce.hpp
---- openjdk6/hotspot/src/share/vm/opto/coalesce.hpp	2008-11-25 10:12:09.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/coalesce.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)coalesce.hpp	1.44 07/05/05 17:06:14 JVM"
--#endif
- /*
-  * Copyright 1997-2003 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -110,4 +107,3 @@
- 
-   void update_ifg(uint lr1, uint lr2, IndexSet *n_lr1, IndexSet *n_lr2);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/compile.cpp openjdk/hotspot/src/share/vm/opto/compile.cpp
---- openjdk6/hotspot/src/share/vm/opto/compile.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/compile.cpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)compile.cpp	1.633 07/09/28 10:23:11 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/compile.hpp openjdk/hotspot/src/share/vm/opto/compile.hpp
---- openjdk6/hotspot/src/share/vm/opto/compile.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/compile.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)compile.hpp	1.232 07/09/28 10:23:10 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/connode.cpp openjdk/hotspot/src/share/vm/opto/connode.cpp
---- openjdk6/hotspot/src/share/vm/opto/connode.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/connode.cpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)connode.cpp	1.222 07/10/16 13:32:21 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/connode.hpp openjdk/hotspot/src/share/vm/opto/connode.hpp
---- openjdk6/hotspot/src/share/vm/opto/connode.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/connode.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)connode.hpp	1.160 07/05/05 17:06:13 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/divnode.cpp openjdk/hotspot/src/share/vm/opto/divnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/divnode.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/divnode.cpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)divnode.cpp	1.88 07/05/05 17:06:13 JVM"
--#endif
- /*
-  * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/divnode.hpp openjdk/hotspot/src/share/vm/opto/divnode.hpp
---- openjdk6/hotspot/src/share/vm/opto/divnode.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/divnode.hpp	2008-12-05 16:41:22.087636851 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)divnode.hpp	1.31 07/05/05 17:06:16 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -178,4 +175,3 @@
-   // Make a divmod and associated projections from a div or mod.
-   static DivModLNode* make(Compile* C, Node* div_or_mod);
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/doCall.cpp openjdk/hotspot/src/share/vm/opto/doCall.cpp
---- openjdk6/hotspot/src/share/vm/opto/doCall.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/doCall.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)doCall.cpp	1.207 07/07/19 19:08:29 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/domgraph.cpp openjdk/hotspot/src/share/vm/opto/domgraph.cpp
---- openjdk6/hotspot/src/share/vm/opto/domgraph.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/domgraph.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)domgraph.cpp	1.76 07/07/11 15:38:57 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -665,4 +662,3 @@
- 
- }
- #endif
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/escape.cpp openjdk/hotspot/src/share/vm/opto/escape.cpp
---- openjdk6/hotspot/src/share/vm/opto/escape.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/escape.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)escape.cpp	1.10 07/05/17 15:58:23 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/escape.hpp openjdk/hotspot/src/share/vm/opto/escape.hpp
---- openjdk6/hotspot/src/share/vm/opto/escape.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/escape.hpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)escape.hpp	1.9 07/05/17 15:58:25 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -320,4 +317,3 @@
-   void dump();
- #endif
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/gcm.cpp openjdk/hotspot/src/share/vm/opto/gcm.cpp
---- openjdk6/hotspot/src/share/vm/opto/gcm.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/gcm.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)gcm.cpp	1.259 08/07/10 14:40:09 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -310,6 +307,7 @@
- 
-     // Test and set the visited bit.
-     if (mid->raise_LCA_visited() == mark)  continue;  // already visited
-+    mid->set_raise_LCA_visited(mark);
- 
-     // Don't process the current LCA, otherwise the search may terminate early
-     if (mid != LCA && mid->raise_LCA_mark() == mark) {
-@@ -319,8 +317,6 @@
-       assert(early->dominates(LCA), "early is high enough");
-       // Resume searching at that point, skipping intermediate levels.
-       worklist.push(LCA);
--      if (LCA == mid)
--        continue; // Don't mark as visited to avoid early termination.
-     } else {
-       // Keep searching through this block's predecessors.
-       for (uint j = 1, jmax = mid->num_preds(); j < jmax; j++) {
-@@ -328,7 +324,6 @@
-         worklist.push(mid_parent);
-       }
-     }
--    mid->set_raise_LCA_visited(mark);
-   }
-   return LCA;
- }
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/generateOptoStub.cpp openjdk/hotspot/src/share/vm/opto/generateOptoStub.cpp
---- openjdk6/hotspot/src/share/vm/opto/generateOptoStub.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/generateOptoStub.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)generateOptoStub.cpp	1.101 07/05/05 17:06:17 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -292,4 +289,3 @@
-   }
-   root()->add_req(_gvn.transform(ret));
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/graphKit.cpp openjdk/hotspot/src/share/vm/opto/graphKit.cpp
---- openjdk6/hotspot/src/share/vm/opto/graphKit.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/graphKit.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)graphKit.cpp	1.132 07/10/04 14:36:00 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/graphKit.hpp openjdk/hotspot/src/share/vm/opto/graphKit.hpp
---- openjdk6/hotspot/src/share/vm/opto/graphKit.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/graphKit.hpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)graphKit.hpp	1.59 07/08/07 15:24:25 JVM"
--#endif
- /*
-  * Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -721,4 +718,3 @@
-   BuildCutout(GraphKit* kit, Node* p, float prob, float cnt = COUNT_UNKNOWN);
-   ~BuildCutout();
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.cpp openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
---- openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)idealGraphPrinter.cpp	1.2 07/10/02 11:32:04 JVM"
--#endif
- /*
-  * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.hpp openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.hpp
---- openjdk6/hotspot/src/share/vm/opto/idealGraphPrinter.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/idealGraphPrinter.hpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)idealGraphPrinter.hpp	1.1 07/09/28 11:48:37 JVM"
--#endif
- /*
-  * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealKit.cpp openjdk/hotspot/src/share/vm/opto/idealKit.cpp
---- openjdk6/hotspot/src/share/vm/opto/idealKit.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/idealKit.cpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)idealKit.cpp	1.8 07/06/18 14:25:26 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/idealKit.hpp openjdk/hotspot/src/share/vm/opto/idealKit.hpp
---- openjdk6/hotspot/src/share/vm/opto/idealKit.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/idealKit.hpp	2008-12-05 16:41:22.097637002 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)idealKit.hpp	1.8 07/06/18 14:25:26 JVM"
--#endif
- /*
-  * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/ifg.cpp openjdk/hotspot/src/share/vm/opto/ifg.cpp
---- openjdk6/hotspot/src/share/vm/opto/ifg.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/ifg.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ifg.cpp	1.62 07/05/05 17:06:13 JVM"
--#endif
- /*
-  * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -597,7 +594,7 @@
- 
-           // Insure high score for immediate-use spill copies so they get a color
-           if( n->is_SpillCopy()             
--              && lrgs(r).is_singledef()        // MultiDef live range can still split
-+              && lrgs(r)._def != NodeSentinel     // MultiDef live range can still split
-               && n->outcnt() == 1              // and use must be in this block
-               && _cfg._bbs[n->unique_out()->_idx] == b ) {
-             // All single-use MachSpillCopy(s) that immediately precede their 
-@@ -814,4 +811,3 @@
- 
-   return must_spill;
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/ifnode.cpp openjdk/hotspot/src/share/vm/opto/ifnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/ifnode.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/ifnode.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)ifnode.cpp	1.63 07/10/23 13:12:51 JVM"
--#endif
- /*
-  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -546,159 +543,6 @@
-   return NULL;                  // Dead loop?  Or hit root?
- }
- 
--
--//------------------------------filtered_int_type--------------------------------
--// Return a possibly more restrictive type for val based on condition control flow for an if
--const TypeInt* IfNode::filtered_int_type(PhaseGVN* gvn, Node *val, Node* if_proj) {
--  assert(if_proj &&
--         (if_proj->Opcode() == Op_IfTrue || if_proj->Opcode() == Op_IfFalse), "expecting an if projection");
--  if (if_proj->in(0) && if_proj->in(0)->is_If()) {
--    IfNode* iff = if_proj->in(0)->as_If();
--    if (iff->in(1) && iff->in(1)->is_Bool()) {
--      BoolNode* bol = iff->in(1)->as_Bool();
--      if (bol->in(1) && bol->in(1)->is_Cmp()) {
--        const CmpNode* cmp  = bol->in(1)->as_Cmp();
--        if (cmp->in(1) == val) {
--          const TypeInt* cmp2_t = gvn->type(cmp->in(2))->isa_int();
--          if (cmp2_t != NULL) {
--            jint lo = cmp2_t->_lo;
--            jint hi = cmp2_t->_hi;
--            BoolTest::mask msk = if_proj->Opcode() == Op_IfTrue ? bol->_test._test : bol->_test.negate();
--            switch (msk) {
--            case BoolTest::ne:
--              // Can't refine type
--              return NULL;
--            case BoolTest::eq:
--              return cmp2_t;
--            case BoolTest::lt:
--              lo = TypeInt::INT->_lo;
--              if (hi - 1 < hi) {
--                hi = hi - 1;
--              }
--              break;
--            case BoolTest::le:
--              lo = TypeInt::INT->_lo;
--              break;
--            case BoolTest::gt:
--              if (lo + 1 > lo) {
--                lo = lo + 1;
--              }
--              hi = TypeInt::INT->_hi;
--              break;
--            case BoolTest::ge:
--              // lo unchanged
--              hi = TypeInt::INT->_hi;
--              break;
--            }
--            const TypeInt* rtn_t = TypeInt::make(lo, hi, cmp2_t->_widen);
--            return rtn_t;
--          }
--        }
--      }
--    }
--  }
--  return NULL;
--}
--
--//------------------------------fold_compares----------------------------
--// See if a pair of CmpIs can be converted into a CmpU.  In some cases
--// the direction of this if is determined by the preciding if so it
--// can be eliminate entirely.  Given an if testing (CmpI n c) check
--// for an immediately control dependent if that is testing (CmpI n c2)
--// and has one projection leading to this if and the other projection
--// leading to a region that merges one of this ifs control
--// projections.
--//            
--//                   If
--//                  / |
--//                 /  |
--//                /   |
--//              If    |
--//              /\    |
--//             /  \   |
--//            /    \  |
--//           /    Region
--//  
--Node* IfNode::fold_compares(PhaseGVN* phase) {
--  if (!EliminateAutoBox || Opcode() != Op_If) return NULL;
--
--  Node* this_cmp = in(1)->in(1);
--  if (this_cmp != NULL && this_cmp->Opcode() == Op_CmpI &&
--      this_cmp->in(2)->is_Con() && this_cmp->in(2) != phase->C->top()) {
--    Node* ctrl = in(0);
--    BoolNode* this_bool = in(1)->as_Bool();
--    Node* n = this_cmp->in(1);
--    int hi = this_cmp->in(2)->get_int();
--    if (ctrl != NULL && ctrl->is_Proj() && ctrl->outcnt() == 1 &&
--        ctrl->in(0)->is_If() &&
--        ctrl->in(0)->outcnt() == 2 &&
--        ctrl->in(0)->in(1)->is_Bool() &&
--        ctrl->in(0)->in(1)->in(1)->Opcode() == Op_CmpI &&
--        ctrl->in(0)->in(1)->in(1)->in(2)->is_Con() &&
--        ctrl->in(0)->in(1)->in(1)->in(1) == n) {
--      IfNode* dom_iff = ctrl->in(0)->as_If();
--      Node* otherproj = dom_iff->proj_out(!ctrl->as_Proj()->_con);
--      if (otherproj->outcnt() == 1 && otherproj->unique_out()->is_Region() &&
--          this_bool->_test._test != BoolTest::ne && this_bool->_test._test != BoolTest::eq) {
--        // Identify which proj goes to the region and which continues on
--        RegionNode* region = otherproj->unique_out()->as_Region();
--        Node* success = NULL;
--        Node* fail = NULL;
--        for (int i = 0; i < 2; i++) {
--          Node* proj = proj_out(i);
--          if (success == NULL && proj->outcnt() == 1 && proj->unique_out() == region) {
--            success = proj;
--          } else if (fail == NULL) {
--            fail = proj;
--          } else {
--            success = fail = NULL;
--          }
--        }
--        if (success != NULL && fail != NULL && !region->has_phi()) {
--          int lo = dom_iff->in(1)->in(1)->in(2)->get_int();
--          BoolNode* dom_bool = dom_iff->in(1)->as_Bool();
--          Node* dom_cmp =  dom_bool->in(1);
--          const TypeInt* failtype  = filtered_int_type(phase, n, ctrl);
--          if (failtype != NULL) {
--            const TypeInt* type2 = filtered_int_type(phase, n, fail);
--            if (type2 != NULL) {
--              failtype = failtype->join(type2)->is_int();
--            } else {
--              failtype = NULL;
--            }
--          }
--
--          if (failtype != NULL &&
--              dom_bool->_test._test != BoolTest::ne && dom_bool->_test._test != BoolTest::eq) {
--            int bound = failtype->_hi - failtype->_lo + 1;
--            if (failtype->_hi != max_jint && failtype->_lo != min_jint && bound > 1) {
--              // Merge the two compares into a single unsigned compare by building  (CmpU (n - lo) hi)
--              BoolTest::mask cond = fail->as_Proj()->_con ? BoolTest::lt : BoolTest::ge;
--              Node* adjusted = phase->transform(new (phase->C, 3) SubINode(n, phase->intcon(failtype->_lo)));
--              Node* newcmp = phase->transform(new (phase->C, 3) CmpUNode(adjusted, phase->intcon(bound)));
--              Node* newbool = phase->transform(new (phase->C, 2) BoolNode(newcmp, cond));
--              phase->hash_delete(dom_iff);
--              dom_iff->set_req(1, phase->intcon(ctrl->as_Proj()->_con));
--              phase->is_IterGVN()->_worklist.push(dom_iff);
--              phase->hash_delete(this);
--              set_req(1, newbool);
--              return this;
--            }
--            if (failtype->_lo > failtype->_hi) {
--              // previous if determines the result of this if so
--              // replace Bool with constant
--              phase->hash_delete(this);
--              set_req(1, phase->intcon(success->as_Proj()->_con));
--              return this;
--            }
--          }
--        }
--      }
--    }
--  }
--  return NULL;
--}
--
- //------------------------------remove_useless_bool----------------------------
- // Check for people making a useless boolean: things like
- // if( (x < y ? true : false) ) { ... }
-@@ -900,11 +744,6 @@
-     // Normal equivalent-test check.
-     if( !dom ) return NULL;     // Dead loop?
- 
--    Node* result = fold_compares(phase);
--    if (result != NULL) {
--      return result;
--    }
--
-     // Search up the dominator tree for an If with an identical test
-     while( dom->Opcode() != op    ||  // Not same opcode?
-            dom->in(1)    != in(1) ||  // Not same input 1?
-@@ -1081,4 +920,3 @@
-     ? in(0)->in(0)              // IfNode control
-     : this;                     // no progress
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/indexSet.cpp openjdk/hotspot/src/share/vm/opto/indexSet.cpp
---- openjdk6/hotspot/src/share/vm/opto/indexSet.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/indexSet.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)indexSet.cpp	1.24 07/05/05 17:06:16 JVM"
--#endif
- /*
-  * Copyright 1998-2004 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/indexSet.hpp openjdk/hotspot/src/share/vm/opto/indexSet.hpp
---- openjdk6/hotspot/src/share/vm/opto/indexSet.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/indexSet.hpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)indexSet.hpp	1.29 07/05/05 17:06:18 JVM"
--#endif
- /*
-  * Copyright 1998-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/lcm.cpp openjdk/hotspot/src/share/vm/opto/lcm.cpp
---- openjdk6/hotspot/src/share/vm/opto/lcm.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/lcm.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)lcm.cpp	1.102 07/05/17 15:58:55 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -935,7 +932,3 @@
-     }
-   }
- }
--
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/library_call.cpp openjdk/hotspot/src/share/vm/opto/library_call.cpp
---- openjdk6/hotspot/src/share/vm/opto/library_call.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/library_call.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)library_call.cpp	1.167 07/07/25 17:43:16 JVM"
--#endif
- /*
-  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -4922,4 +4919,3 @@
-                     copyfunc_addr, copyfunc_name, adr_type,
-                     src_start, dest_start, copy_length XTOP);
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/live.cpp openjdk/hotspot/src/share/vm/opto/live.cpp
---- openjdk6/hotspot/src/share/vm/opto/live.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/live.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)live.cpp	1.70 07/05/17 17:44:00 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/live.hpp openjdk/hotspot/src/share/vm/opto/live.hpp
---- openjdk6/hotspot/src/share/vm/opto/live.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/live.hpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)live.hpp	1.43 07/05/05 17:06:19 JVM"
--#endif
- /*
-  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/locknode.cpp openjdk/hotspot/src/share/vm/opto/locknode.cpp
---- openjdk6/hotspot/src/share/vm/opto/locknode.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/locknode.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)locknode.cpp	1.49 07/05/17 15:59:05 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -123,6 +120,3 @@
-   // for a null check on Unlock.
-   shared_unlock(map()->peek_monitor_box(), map()->peek_monitor_obj());
- } 
--
--
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/locknode.hpp openjdk/hotspot/src/share/vm/opto/locknode.hpp
---- openjdk6/hotspot/src/share/vm/opto/locknode.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/locknode.hpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)locknode.hpp	1.40 07/09/28 10:23:10 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -98,4 +95,3 @@
-   const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;}
- 
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopTransform.cpp openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
---- openjdk6/hotspot/src/share/vm/opto/loopTransform.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)loopTransform.cpp	1.116 07/06/01 11:35:03 JVM"
--#endif
- /*
-  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopUnswitch.cpp openjdk/hotspot/src/share/vm/opto/loopUnswitch.cpp
---- openjdk6/hotspot/src/share/vm/opto/loopUnswitch.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/loopUnswitch.cpp	2008-12-05 16:41:22.107637153 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)loopUnswitch.cpp	1.6 07/06/29 14:41:32 JVM"
--#endif
- /*
-  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/loopnode.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp	2008-12-05 16:41:22.117637304 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)loopnode.cpp	1.262 07/10/23 13:12:50 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -654,7 +651,7 @@
-     while (if_cnt < if_limit) {
-       if ((pred->Opcode() == Op_IfTrue || pred->Opcode() == Op_IfFalse)) {
-         if_cnt++;
--        const TypeInt* if_t = IfNode::filtered_int_type(&_igvn, val, pred);
-+        const TypeInt* if_t = filtered_type_at_if(val, pred);
-         if (if_t != NULL) {
-           if (rtn_t == NULL) {
-             rtn_t = if_t;
-@@ -677,6 +674,59 @@
- }
- 
- 
-+//------------------------------filtered_type_at_if--------------------------------
-+// Return a possibly more restrictive type for val based on condition control flow for an if
-+const TypeInt* PhaseIdealLoop::filtered_type_at_if( Node* val, Node *if_proj) {
-+  assert(if_proj &&
-+         (if_proj->Opcode() == Op_IfTrue || if_proj->Opcode() == Op_IfFalse), "expecting an if projection");
-+  if (if_proj->in(0) && if_proj->in(0)->is_If()) {
-+    IfNode* iff = if_proj->in(0)->as_If();
-+    if (iff->in(1) && iff->in(1)->is_Bool()) {
-+      BoolNode* bol = iff->in(1)->as_Bool();
-+      if (bol->in(1) && bol->in(1)->is_Cmp()) {
-+        const CmpNode* cmp  = bol->in(1)->as_Cmp();
-+        if (cmp->in(1) == val) {
-+          const TypeInt* cmp2_t = _igvn.type(cmp->in(2))->isa_int();
-+          if (cmp2_t != NULL) {
-+            jint lo = cmp2_t->_lo;
-+            jint hi = cmp2_t->_hi;
-+            BoolTest::mask msk = if_proj->Opcode() == Op_IfTrue ? bol->_test._test : bol->_test.negate();
-+            switch (msk) {
-+            case BoolTest::ne:
-+              // Can't refine type
-+              return NULL;
-+            case BoolTest::eq:
-+              return cmp2_t;
-+            case BoolTest::lt:
-+              lo = TypeInt::INT->_lo;
-+              if (hi - 1 < hi) {
-+                hi = hi - 1;
-+              }
-+              break;
-+            case BoolTest::le:
-+              lo = TypeInt::INT->_lo;
-+              break;
-+            case BoolTest::gt:
-+              if (lo + 1 > lo) {
-+                lo = lo + 1;
-+              }
-+              hi = TypeInt::INT->_hi;
-+              break;
-+            case BoolTest::ge:
-+              // lo unchanged
-+              hi = TypeInt::INT->_hi;
-+              break;
-+            }
-+            const TypeInt* rtn_t = TypeInt::make(lo, hi, cmp2_t->_widen);
-+            return rtn_t;
-+          }
-+        }
-+      }
-+    }
-+  }
-+  return NULL;
-+}
-+
- //------------------------------dump_spec--------------------------------------
- // Dump special per-node info
- #ifndef PRODUCT
-@@ -2834,4 +2884,3 @@
-     }
-   }
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopnode.hpp openjdk/hotspot/src/share/vm/opto/loopnode.hpp
---- openjdk6/hotspot/src/share/vm/opto/loopnode.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/loopnode.hpp	2008-12-05 16:41:22.117637304 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)loopnode.hpp	1.146 07/10/23 13:12:55 JVM"
--#endif
- /*
-  * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -853,6 +850,7 @@
-   const TypeInt* filtered_type( Node *n ) { return filtered_type(n, NULL); }
-  // Helpers for filtered type
-   const TypeInt* filtered_type_from_dominators( Node* val, Node *val_ctrl);
-+  const TypeInt* filtered_type_at_if( Node* val, Node *if_proj);
- 
-   // Helper functions
-   void register_new_node( Node *n, Node *blk );
-@@ -919,4 +917,3 @@
- 
-   IdealLoopTree* current() { return _curnt; }  // Return current value of iterator.
- };
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/loopopts.cpp openjdk/hotspot/src/share/vm/opto/loopopts.cpp
---- openjdk6/hotspot/src/share/vm/opto/loopopts.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/loopopts.cpp	2008-12-05 16:41:22.117637304 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)loopopts.cpp	1.222 08/11/24 12:23:09 JVM"
--#endif
- /*
-  * Copyright 1999-2006 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -32,11 +29,6 @@
- //------------------------------split_thru_phi---------------------------------
- // Split Node 'n' through merge point if there is enough win.
- Node *PhaseIdealLoop::split_thru_phi( Node *n, Node *region, int policy ) {
--  if (n->Opcode() == Op_ConvI2L && n->bottom_type() != TypeLong::BOTTOM) {
--    // ConvI2L may have type information on it which is unsafe to push up
--    // so disable this for now
--    return NULL;
--  }
-   int wins = 0;
-   assert( !n->is_CFG(), "" );
-   assert( region->is_Region(), "" );
-@@ -2683,4 +2675,3 @@
-   }
- 
- }
--
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/machnode.cpp openjdk/hotspot/src/share/vm/opto/machnode.cpp
---- openjdk6/hotspot/src/share/vm/opto/machnode.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/machnode.cpp	2008-12-05 16:41:22.117637304 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)machnode.cpp	1.200 07/09/28 10:23:08 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/machnode.hpp openjdk/hotspot/src/share/vm/opto/machnode.hpp
---- openjdk6/hotspot/src/share/vm/opto/machnode.hpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/machnode.hpp	2008-12-05 16:41:22.117637304 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_HDR
--#pragma ident "@(#)machnode.hpp	1.204 07/09/28 10:23:08 JVM"
--#endif
- /*
-  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-diff -ruNb openjdk6/hotspot/src/share/vm/opto/macro.cpp openjdk/hotspot/src/share/vm/opto/macro.cpp
---- openjdk6/hotspot/src/share/vm/opto/macro.cpp	2008-11-25 10:12:10.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/opto/macro.cpp	2008-12-05 16:41:22.117637304 +0100
-@@ -1,6 +1,3 @@
--#ifdef USE_PRAGMA_IDENT_SRC
--#pragma ident "@(#)macro.cpp	1.33 07/10/04 14:36:00 JVM"
--#endif
- /*
-  * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-@@ -996,4 +993,3 @@
-   _igvn.optimize();
-   return false;
- }
--
-diff -r