*** old/src/share/vm/opto/callnode.cpp	Thu Feb 23 12:08:43 2012
--- new/src/share/vm/opto/callnode.cpp	Thu Feb 23 12:08:43 2012

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 1536,1549 ****
--- 1536,1546 ----
    if (can_reshape && EliminateLocks && !is_non_esc_obj()) {
      //
      // If we are locking an unescaped object, the lock/unlock is unnecessary
      //
      ConnectionGraph *cgr = phase->C->congraph();
      PointsToNode::EscapeState es = PointsToNode::GlobalEscape;
      if (cgr != NULL)
        es = cgr->escape_state(obj_node());
      if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
+     if (cgr != NULL && cgr->not_global_escape(obj_node())) {
        assert(!is_eliminated() || is_coarsened(), "sanity");
        // The lock could be marked eliminated by lock coarsening
        // code during first IGVN before EA. Replace coarsened flag
        // to eliminate all associated locks/unlocks.
        this->set_non_esc_obj();

*** 1678,1691 ****
--- 1675,1685 ----
    if (can_reshape && EliminateLocks && !is_non_esc_obj()) {
      //
      // If we are unlocking an unescaped object, the lock/unlock is unnecessary.
      //
      ConnectionGraph *cgr = phase->C->congraph();
      PointsToNode::EscapeState es = PointsToNode::GlobalEscape;
      if (cgr != NULL)
        es = cgr->escape_state(obj_node());
      if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
+     if (cgr != NULL && cgr->not_global_escape(obj_node())) {
        assert(!is_eliminated() || is_coarsened(), "sanity");
        // The lock could be marked eliminated by lock coarsening
        // code during first IGVN before EA. Replace coarsened flag
        // to eliminate all associated locks/unlocks.
        this->set_non_esc_obj();