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

     1.1 --- a/src/share/vm/opto/runtime.cpp	Wed Jan 27 22:38:37 2010 -0800
     1.2 +++ b/src/share/vm/opto/runtime.cpp	Mon Feb 01 17:35:05 2010 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 + * Copyright 1998-2010 Sun Microsystems, Inc.  All Rights Reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -810,7 +810,7 @@
    1.11      // we are switching to old paradigm: search for exception handler in caller_frame
    1.12      // instead in exception handler of caller_frame.sender()
    1.13  
    1.14 -    if (JvmtiExport::can_post_exceptions()) {
    1.15 +    if (JvmtiExport::can_post_on_exceptions()) {
    1.16        // "Full-speed catching" is not necessary here,
    1.17        // since we're notifying the VM on every catch.
    1.18        // Force deoptimization and the rest of the lookup
    1.19 @@ -975,8 +975,8 @@
    1.20      assert(stub_frame.is_runtime_frame() || exception_blob()->contains(stub_frame.pc()), "sanity check");
    1.21      frame caller_frame = stub_frame.sender(&reg_map);
    1.22  
    1.23 -    VM_DeoptimizeFrame deopt(thread, caller_frame.id());
    1.24 -    VMThread::execute(&deopt);
    1.25 +    // bypass VM_DeoptimizeFrame and deoptimize the frame directly
    1.26 +    Deoptimization::deoptimize_frame(thread, caller_frame.id());
    1.27    }
    1.28  }
    1.29