Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/library_call.cpp	Mon Jul 20 08:20:00 2009 -0700
     1.2 +++ b/src/share/vm/opto/library_call.cpp	Mon Jul 27 06:15:29 2009 -0700
     1.3 @@ -310,11 +310,6 @@
     1.4      if (!InlineAtomicLong)  return NULL;
     1.5      break;
     1.6  
     1.7 -  case vmIntrinsics::_Object_init:
     1.8 -  case vmIntrinsics::_invoke:
     1.9 -    // We do not intrinsify these; they are marked for other purposes.
    1.10 -    return NULL;
    1.11 -
    1.12    case vmIntrinsics::_getCallerClass:
    1.13      if (!UseNewReflection)  return NULL;
    1.14      if (!InlineReflectionGetCallerClass)  return NULL;
    1.15 @@ -327,6 +322,8 @@
    1.16      break;
    1.17  
    1.18   default:
    1.19 +    assert(id <= vmIntrinsics::LAST_COMPILER_INLINE, "caller responsibility");
    1.20 +    assert(id != vmIntrinsics::_Object_init && id != vmIntrinsics::_invoke, "enum out of order?");
    1.21      break;
    1.22    }
    1.23  
    1.24 @@ -394,18 +391,11 @@
    1.25    }
    1.26  
    1.27    if (PrintIntrinsics) {
    1.28 -    switch (intrinsic_id()) {
    1.29 -    case vmIntrinsics::_invoke:
    1.30 -    case vmIntrinsics::_Object_init:
    1.31 -      // We do not expect to inline these, so do not produce any noise about them.
    1.32 -      break;
    1.33 -    default:
    1.34 -      tty->print("Did not inline intrinsic %s%s at bci:%d in",
    1.35 -                 vmIntrinsics::name_at(intrinsic_id()),
    1.36 -                 (is_virtual() ? " (virtual)" : ""), kit.bci());
    1.37 -      kit.caller()->print_short_name(tty);
    1.38 -      tty->print_cr(" (%d bytes)", kit.caller()->code_size());
    1.39 -    }
    1.40 +    tty->print("Did not inline intrinsic %s%s at bci:%d in",
    1.41 +               vmIntrinsics::name_at(intrinsic_id()),
    1.42 +               (is_virtual() ? " (virtual)" : ""), kit.bci());
    1.43 +    kit.caller()->print_short_name(tty);
    1.44 +    tty->print_cr(" (%d bytes)", kit.caller()->code_size());
    1.45    }
    1.46    C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
    1.47    return NULL;