hotspot/src/share/vm/opto/buildOopMap.cpp

rev 611 : Merge

*** 1,10 ****
  #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.
   *
   * 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 "@(#)buildOopMap.cpp      1.37 07/05/05 17:06:11 JVM"
  #endif
  /*
!  * Copyright 2002-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.
*** 316,325 ****
--- 316,345 ----
          if (b->is_stack() || b->is_concrete() || true ) {
            omap->set_derived_oop( r, b);
          }
        }
  
+     } else if( t->isa_narrowoop() ) {
+       assert( !OptoReg::is_valid(_callees[reg]), "oop can't be callee save" );
+       // Check for a legal reg name in the oopMap and bailout if it is not.
+       if (!omap->legal_vm_reg_name(r)) {
+         regalloc->C->record_method_not_compilable("illegal oopMap register name");
+         continue;
+       }
+       if( mcall ) {
+           // Outgoing argument GC mask responsibility belongs to the callee,
+           // not the caller.  Inspect the inputs to the call, to see if
+           // this live-range is one of them.
+         uint cnt = mcall->tf()->domain()->cnt();
+         uint j;
+         for( j = TypeFunc::Parms; j < cnt; j++)
+           if( mcall->in(j) == def )
+             break;            // reaching def is an argument oop
+         if( j < cnt )         // arg oops dont go in GC map
+           continue;           // Continue on to the next register
+       }
+       omap->set_narrowoop(r);
      } else if( OptoReg::is_valid(_callees[reg])) { // callee-save?
        // It's a callee-save value
        assert( dup_check[_callees[reg]]==0, "trying to callee save same reg twice" );
        debug_only( dup_check[_callees[reg]]=1; )
        VMReg callee = OptoReg::as_VMReg(OptoReg::Name(_callees[reg]));