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

     1.1 --- a/src/share/vm/oops/methodOop.cpp	Tue Jul 24 10:51:00 2012 -0700
     1.2 +++ b/src/share/vm/oops/methodOop.cpp	Fri Jul 27 16:14:15 2012 -0700
     1.3 @@ -582,7 +582,8 @@
     1.4  
     1.5  
     1.6  bool methodOopDesc::has_native_function() const {
     1.7 -  assert(!is_method_handle_intrinsic(), "");
     1.8 +  if (is_method_handle_intrinsic())
     1.9 +    return false;  // special-cased in SharedRuntime::generate_native_wrapper
    1.10    address func = native_function();
    1.11    return (func != NULL && func != SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
    1.12  }
    1.13 @@ -612,6 +613,9 @@
    1.14    if (number_of_breakpoints() > 0) {
    1.15      return true;
    1.16    }
    1.17 +  if (is_method_handle_intrinsic()) {
    1.18 +    return !is_synthetic();  // the generated adapters must be compiled
    1.19 +  }
    1.20    if (comp_level == CompLevel_any) {
    1.21      return is_not_c1_compilable() || is_not_c2_compilable();
    1.22    }