Merge pull request #2376 from gacholio/maskfix

Fix incorrect mask
eclipse-openj9 · Jul 12, 2018 · 3cbbe5f · 3cbbe5f
2 parents 7a45ac8 + 4d50624
commit 3cbbe5f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/runtime/codert_vm/cnathelp.cpp b/runtime/codert_vm/cnathelp.cpp
@@ -1087,7 +1087,7 @@ slow_jitMonitorEnterImpl(J9VMThread *currentThread, bool forMethod)
 			Assert_CodertVM_false(NULL == inlineMap);
 			if ((NULL == getJitInlinedCallInfo(metaData)) || (NULL == getFirstInlinedCallSite(metaData, inlineMap))) {
 				J9SFJITResolveFrame *resolveFrame = (J9SFJITResolveFrame*)currentThread->sp;
-				resolveFrame->specialFrameFlags = (resolveFrame->specialFrameFlags &~J9_STACK_FLAGS_JIT_RESOLVE_FRAME) | J9_STACK_FLAGS_JIT_FAILED_METHOD_MONITOR_ENTER_RESOLVE;
+				resolveFrame->specialFrameFlags = (resolveFrame->specialFrameFlags & ~J9_STACK_FLAGS_JIT_FRAME_SUB_TYPE_MASK) | J9_STACK_FLAGS_JIT_FAILED_METHOD_MONITOR_ENTER_RESOLVE;
 			}
 		}
 		addr = setNativeOutOfMemoryErrorFromJIT(currentThread, J9NLS_VM_FAILED_TO_ALLOCATE_MONITOR);