src/share/vm/runtime/sharedRuntime.cpp

rev 1024 : imported patch indy-cleanup-6893081.patch
rev 1026 : imported patch indy.compiler.inline.patch

*** 2143,2153 ****
    // Return argument 0 register.  In the LP64 build pointers
    // take 2 registers, but the VM wants only the 'main' name.
    return regs.first();
  }
  
! VMRegPair *SharedRuntime::find_callee_arguments(symbolOop sig, bool is_static, int* arg_size) {
    // This method is returning a data structure allocating as a
    // ResourceObject, so do not put any ResourceMarks in here.
    char *s = sig->as_C_string();
    int len = (int)strlen(s);
    *s++; len--;                  // Skip opening paren
--- 2143,2153 ----
    // Return argument 0 register.  In the LP64 build pointers
    // take 2 registers, but the VM wants only the 'main' name.
    return regs.first();
  }
  
! VMRegPair *SharedRuntime::find_callee_arguments(symbolOop sig, bool has_receiver, int* arg_size) {
    // This method is returning a data structure allocating as a
    // ResourceObject, so do not put any ResourceMarks in here.
    char *s = sig->as_C_string();
    int len = (int)strlen(s);
    *s++; len--;                  // Skip opening paren
*** 2155,2165 ****
    while( *(--t) != ')' ) ;      // Find close paren
  
    BasicType *sig_bt = NEW_RESOURCE_ARRAY( BasicType, 256 );
    VMRegPair *regs = NEW_RESOURCE_ARRAY( VMRegPair, 256 );
    int cnt = 0;
!   if (!is_static) {
      sig_bt[cnt++] = T_OBJECT; // Receiver is argument 0; not in signature
    }
  
    while( s < t ) {
      switch( *s++ ) {            // Switch on signature character
--- 2155,2165 ----
    while( *(--t) != ')' ) ;      // Find close paren
  
    BasicType *sig_bt = NEW_RESOURCE_ARRAY( BasicType, 256 );
    VMRegPair *regs = NEW_RESOURCE_ARRAY( VMRegPair, 256 );
    int cnt = 0;
!   if (has_receiver) {
      sig_bt[cnt++] = T_OBJECT; // Receiver is argument 0; not in signature
    }
  
    while( s < t ) {
      switch( *s++ ) {            // Switch on signature character