Also verify stateAfter on MonitorEnterNode

Author: tkrodriguez

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/phases/VerifyLockDepthPhase.java

@@ -183,7 +183,9 @@ protected void node(FixedNode node) {
                 state.verifyState(during.asFixedNode(), during.stateDuring());
             }
             if (node instanceof MonitorEnterNode) {
-                state.push((MonitorEnterNode) node);
+                MonitorEnterNode enter = (MonitorEnterNode) node;
+                state.push(enter);
+                state.verifyState(node, enter.stateAfter());
             } else if (node instanceof MonitorExitNode) {
                 state.pop((MonitorExitNode) node);
             } else if (node instanceof AccessMonitorNode) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LockEliminationPhase.java

@@ -26,7 +26,6 @@
 
 import java.util.Optional;
 
-import jdk.graal.compiler.debug.Assertions;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.nodes.FixedNode;
@@ -69,7 +68,7 @@ protected void run(StructuredGraph graph) {
             if ((next instanceof MonitorEnterNode)) {
                 // should never happen, osr monitor enters are always direct successors of the graph
                 // start
-                assert !(next instanceof OSRMonitorEnterNode) : Assertions.errorMessageContext("next", next);
+                GraalError.guarantee(!(next instanceof OSRMonitorEnterNode), "OSRMonitorEnterNode can't be seen here: %s", next);
                 AccessMonitorNode monitorEnterNode = (AccessMonitorNode) next;
                 if (isCompatibleLock(monitorEnterNode, monitorExitNode, true, cfg)) {
                     /*