Skip to content

Commit c200ad6

Browse files
authored
Fix resetting for JIT retry (#113842)
I've made a mistake in my recent PR where the `ResetForJitRetry` method on a new base class was not marked as virtual by accident. So the JIT specific version was not executed and part of the state was not reset. Close #113840
1 parent 12fc2d2 commit c200ad6

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

src/coreclr/vm/jitinterface.h

+2-12
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ class CEECodeGenInfo : public CEEInfo
562562
freeArrayInternal(m_pNativeVarInfo);
563563
}
564564

565-
void ResetForJitRetry()
565+
virtual void ResetForJitRetry()
566566
{
567567
CONTRACTL {
568568
NOTHROW;
@@ -766,7 +766,7 @@ class CEEJitInfo final : public CEECodeGenInfo
766766
void BackoutJitData(EECodeGenManager * jitMgr) override;
767767
void SetDebugInfo(PTR_BYTE pDebugInfo) override;
768768

769-
void ResetForJitRetry()
769+
void ResetForJitRetry() override
770770
{
771771
CONTRACTL {
772772
NOTHROW;
@@ -1025,16 +1025,6 @@ class CInterpreterJitInfo final : public CEECodeGenInfo
10251025

10261026
void BackoutJitData(EECodeGenManager * jitMgr) override;
10271027
void SetDebugInfo(PTR_BYTE pDebugInfo) override;
1028-
1029-
void ResetForJitRetry()
1030-
{
1031-
CONTRACTL {
1032-
NOTHROW;
1033-
GC_NOTRIGGER;
1034-
} CONTRACTL_END;
1035-
1036-
CEECodeGenInfo::ResetForJitRetry();
1037-
}
10381028
};
10391029
#endif // FEATURE_INTERPRETER
10401030

0 commit comments

Comments
 (0)