Support for synchronized methods. #458
Conversation
| @@ -303,9 +303,10 @@ void GenIR::readerPrePass(uint8_t *Buffer, uint32_t NumBytes) { | |||
| ABIMethodSignature(MethodSignature, *this, *JitContext->TheABIInfo); | |||
| Function = ABIMethodSig.createFunction(*this, *JitContext->CurrentModule); | |||
|
|
|||
| EntryBlock = BasicBlock::Create(*JitContext->LLVMContext, "entry", Function); | |||
| llvm::LLVMContext *LLVMContext = JitContext->LLVMContext; | |||
There was a problem hiding this comment.
Nit: this could be LLVMContext &LLVMContext = *JitContext->LLVMContext
|
LGTM modulo two nits. |
| @@ -367,9 +368,26 @@ void GenIR::readerPrePass(uint8_t *Buffer, uint32_t NumBytes) { | |||
| // Check for special cases where the Jit needs to do extra work. | |||
| const uint32_t MethodFlags = getCurrentMethodAttribs(); | |||
|
|
|||
| // TODO: support for synchronized methods | |||
| // Check for syncronized method. If a method is syncronized the JIT is | |||
|
Ditto, LGTM with just a few other nits. |
| } else { | ||
| HelperId = IsEnter ? CORINFO_HELP_MON_ENTER : CORINFO_HELP_MON_EXIT; | ||
| } | ||
| callHelperImpl(HelperId, Type::getVoidTy(*JitContext->LLVMContext), |
There was a problem hiding this comment.
Sounds good. I'll merge once CI build is done.
These calls are guaranteed not to throw and the monitor object is guaranteed not to be null.
There was a problem hiding this comment.
These calls are guaranteed not to throw and the monitor object is guaranteed not to be null.
Is this true for an arbitrary mscorlib?
There was a problem hiding this comment.
What does arbitrary mean in this context? Is this possibly a non-CoreCLR/modern surface mscorlib? (we do not support desktop)
There was a problem hiding this comment.
These are calls to jit helpers, they don't call into mscorlib.
There was a problem hiding this comment.
Yeah, I just looked. Disregard my comment.
Add calls to MONITOR_ENTER on entry to the method and MONITOR_EXIT on returns. We can't catch exceptions yet; when we can we will need to add a try/fault for the entire method so that we can call MONITOR_EXIT on unhandled exceptions. We have a synchronized method in HelloWorld (System.IO.TextWriter+SyncTextWriter.WriteLine). I verified that the generated IR looks correct. I also tested with a simple two-thread race that the behavior of synchronized instance and static methods is as expected.
erozenfeld
force-pushed
the
SynchMethods
branch
from
3b4dc4e
to
ac30783
Compare
Support for synchronized methods.
Add calls to MONITOR_ENTER on entry to the method and MONITOR_EXIT on returns.
We can't catch exceptions yet; when we can we will need to add a try/fault for the entire method
so that we can call MONITOR_EXIT on unhandled exceptions.
We have a synchronized method in HelloWorld (System.IO.TextWriter+SyncTextWriter.WriteLine).
I verified that the generated IR looks correct. I also tested with a simple two-thread race that the
behavior of synchronized instance and static methods is as expected.