1.1 --- a/src/share/vm/opto/callnode.cpp Fri Mar 09 13:34:45 2012 -0800
1.2 +++ b/src/share/vm/opto/callnode.cpp Mon Mar 12 10:46:47 2012 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. 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 @@ -1538,10 +1538,7 @@
1.11 // If we are locking an unescaped object, the lock/unlock is unnecessary
1.12 //
1.13 ConnectionGraph *cgr = phase->C->congraph();
1.14 - PointsToNode::EscapeState es = PointsToNode::GlobalEscape;
1.15 - if (cgr != NULL)
1.16 - es = cgr->escape_state(obj_node());
1.17 - if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
1.18 + if (cgr != NULL && cgr->not_global_escape(obj_node())) {
1.19 assert(!is_eliminated() || is_coarsened(), "sanity");
1.20 // The lock could be marked eliminated by lock coarsening
1.21 // code during first IGVN before EA. Replace coarsened flag
1.22 @@ -1680,10 +1677,7 @@
1.23 // If we are unlocking an unescaped object, the lock/unlock is unnecessary.
1.24 //
1.25 ConnectionGraph *cgr = phase->C->congraph();
1.26 - PointsToNode::EscapeState es = PointsToNode::GlobalEscape;
1.27 - if (cgr != NULL)
1.28 - es = cgr->escape_state(obj_node());
1.29 - if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
1.30 + if (cgr != NULL && cgr->not_global_escape(obj_node())) {
1.31 assert(!is_eliminated() || is_coarsened(), "sanity");
1.32 // The lock could be marked eliminated by lock coarsening
1.33 // code during first IGVN before EA. Replace coarsened flag
