hotspot/src/share/vm/oops/oop.cpp

rev 611 : Merge

*** 1,10 ****
  #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.
   *
   * 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.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)oop.cpp      1.99 07/05/29 09:44:21 JVM"
  #endif
  /*
!  * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 106,119 ****
--- 106,123 ----
  void oopDesc::verify() { 
    verify_on(tty); 
  }
  
  
+ // XXX verify_old_oop doesn't do anything (should we remove?)
  void oopDesc::verify_old_oop(oop* p, bool allow_dirty) {
    blueprint()->oop_verify_old_oop(this, p, allow_dirty);
  }
  
+ void oopDesc::verify_old_oop(narrowOop* p, bool allow_dirty) {
+   blueprint()->oop_verify_old_oop(this, p, allow_dirty);
+ }
  
  bool oopDesc::partially_loaded() {
    return blueprint()->oop_partially_loaded(this);
  }
  
*** 131,135 ****
--- 135,142 ----
    assert(!is_shared_readonly(), "using identity hash on readonly object?");
    return ObjectSynchronizer::identity_hash_value_for(object);
  }
  
  VerifyOopClosure VerifyOopClosure::verify_oop;
+ 
+ void VerifyOopClosure::do_oop(oop* p)       { VerifyOopClosure::do_oop_work(p); }
+ void VerifyOopClosure::do_oop(narrowOop* p) { VerifyOopClosure::do_oop_work(p); }