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

     1.1 --- a/src/share/vm/c1/c1_GraphBuilder.cpp	Thu Sep 01 01:31:25 2011 -0700
     1.2 +++ b/src/share/vm/c1/c1_GraphBuilder.cpp	Fri Sep 02 00:36:18 2011 -0700
     1.3 @@ -3744,26 +3744,20 @@
     1.4    ciCallSite*     call_site     = stream()->get_call_site();
     1.5    ciMethodHandle* method_handle = call_site->get_target();
     1.6  
     1.7 -  // Inline constant and mutable call sites.  We don't inline
     1.8 -  // volatile call sites optimistically since they are specified
     1.9 -  // to change their value often and that would result in a lot of
    1.10 -  // deoptimizations and recompiles.
    1.11 -  if (call_site->is_constant_call_site() || call_site->is_mutable_call_site()) {
    1.12 -    // Set the callee to have access to the class and signature in the
    1.13 -    // MethodHandleCompiler.
    1.14 -    method_handle->set_callee(callee);
    1.15 -    method_handle->set_caller(method());
    1.16 -
    1.17 -    // Get an adapter for the MethodHandle.
    1.18 -    ciMethod* method_handle_adapter = method_handle->get_invokedynamic_adapter();
    1.19 -    if (method_handle_adapter != NULL) {
    1.20 -      if (try_inline(method_handle_adapter, /*holder_known=*/ true)) {
    1.21 -        // Add a dependence for invalidation of the optimization.
    1.22 -        if (!call_site->is_constant_call_site()) {
    1.23 -          dependency_recorder()->assert_call_site_target_value(call_site, method_handle);
    1.24 -        }
    1.25 -        return true;
    1.26 +  // Set the callee to have access to the class and signature in the
    1.27 +  // MethodHandleCompiler.
    1.28 +  method_handle->set_callee(callee);
    1.29 +  method_handle->set_caller(method());
    1.30 +
    1.31 +  // Get an adapter for the MethodHandle.
    1.32 +  ciMethod* method_handle_adapter = method_handle->get_invokedynamic_adapter();
    1.33 +  if (method_handle_adapter != NULL) {
    1.34 +    if (try_inline(method_handle_adapter, /*holder_known=*/ true)) {
    1.35 +      // Add a dependence for invalidation of the optimization.
    1.36 +      if (!call_site->is_constant_call_site()) {
    1.37 +        dependency_recorder()->assert_call_site_target_value(call_site, method_handle);
    1.38        }
    1.39 +      return true;
    1.40      }
    1.41    }
    1.42    return false;