Skip to content

Commit 2274525

Browse files
janvorlijanvorli
committed
PR feedback
1 parent 28ab232 commit 2274525

File tree

2 files changed

+34
-38
lines changed

2 files changed

+34
-38
lines changed

‎src/coreclr/vm/jitinterface.h

+33-33
Original file line numberDiff line numberDiff line change
@@ -762,23 +762,23 @@ class CEECodeGenInfo : public CEEInfo
762762

763763
// CEEJitInfo is the concrete implementation of callbacks that the EE must provide for the JIT to do its
764764
// work. See code:ICorJitInfo#JitToEEInterface for more on this interface.
765-
class CEEJitInfo : public CEECodeGenInfo
765+
class CEEJitInfo final : public CEECodeGenInfo
766766
{
767767
public:
768768
// ICorJitInfo stuff
769769

770-
void allocMem (AllocMemArgs *pArgs) override final;
771-
void * allocGCInfo(size_t size) override final;
772-
virtual void setEHcount (unsigned cEH) override final;
770+
void allocMem (AllocMemArgs *pArgs) override;
771+
void * allocGCInfo(size_t size) override;
772+
virtual void setEHcount (unsigned cEH) override;
773773
virtual void setEHinfo (
774774
unsigned EHnumber,
775775
const CORINFO_EH_CLAUSE* clause
776-
) override final;
776+
) override;
777777

778778
void WriteCodeBytes();
779-
void WriteCode(EECodeGenManager * jitMgr) override final;
779+
void WriteCode(EECodeGenManager * jitMgr) override;
780780

781-
void reserveUnwindInfo(bool isFunclet, bool isColdCode, uint32_t unwindSize) override final;
781+
void reserveUnwindInfo(bool isFunclet, bool isColdCode, uint32_t unwindSize) override;
782782

783783
void allocUnwindInfo (
784784
uint8_t * pHotCode, /* IN */
@@ -788,14 +788,14 @@ class CEEJitInfo : public CEECodeGenInfo
788788
uint32_t unwindSize, /* IN */
789789
uint8_t * pUnwindBlock, /* IN */
790790
CorJitFuncKind funcKind /* IN */
791-
) override final;
791+
) override;
792792

793793
HRESULT allocPgoInstrumentationBySchema(
794794
CORINFO_METHOD_HANDLE ftnHnd, /* IN */
795795
PgoInstrumentationSchema* pSchema, /* IN/OUT */
796796
uint32_t countSchemaItems, /* IN */
797797
uint8_t** pInstrumentationData /* OUT */
798-
) override final;
798+
) override;
799799

800800
HRESULT getPgoInstrumentationResults(
801801
CORINFO_METHOD_HANDLE ftnHnd, /* IN */
@@ -804,27 +804,27 @@ class CEEJitInfo : public CEECodeGenInfo
804804
uint8_t**pInstrumentationData, /* OUT */
805805
PgoSource *pPgoSource, /* OUT */
806806
bool* pDynamicPgo /* OUT */
807-
) override final;
807+
) override;
808808

809809
void recordCallSite(
810810
uint32_t instrOffset, /* IN */
811811
CORINFO_SIG_INFO * callSig, /* IN */
812812
CORINFO_METHOD_HANDLE methodHandle /* IN */
813-
) override final;
813+
) override;
814814

815815
void recordRelocation(
816816
void *location,
817817
void *locationRW,
818818
void *target,
819819
uint16_t fRelocType,
820-
int32_t addlDelta) override final;
820+
int32_t addlDelta) override;
821821

822-
uint16_t getRelocTypeHint(void * target) override final;
822+
uint16_t getRelocTypeHint(void * target) override;
823823

824-
uint32_t getExpectedTargetArchitecture() override final;
824+
uint32_t getExpectedTargetArchitecture() override;
825825

826-
void BackoutJitData(EECodeGenManager * jitMgr) override final;
827-
void SetDebugInfo(PTR_BYTE pDebugInfo) override final;
826+
void BackoutJitData(EECodeGenManager * jitMgr) override;
827+
void SetDebugInfo(PTR_BYTE pDebugInfo) override;
828828

829829
void ResetForJitRetry()
830830
{
@@ -891,7 +891,7 @@ class CEEJitInfo : public CEECodeGenInfo
891891
m_reserveForJumpStubs = value;
892892
}
893893

894-
virtual PatchpointInfo* GetPatchpointInfo() override final
894+
virtual PatchpointInfo* GetPatchpointInfo() override
895895
{
896896
#ifdef FEATURE_ON_STACK_REPLACEMENT
897897
return m_pPatchpointInfoFromJit;
@@ -985,7 +985,7 @@ class CEEJitInfo : public CEECodeGenInfo
985985
}
986986

987987
void* getHelperFtn(CorInfoHelpFunc ftnNum, /* IN */
988-
void ** ppIndirection) override final; /* OUT */
988+
void ** ppIndirection) override; /* OUT */
989989
static PCODE getHelperFtnStatic(CorInfoHelpFunc ftnNum);
990990

991991
// Override of CEEInfo::GetProfilingHandle. The first time this is called for a
@@ -997,15 +997,15 @@ class CEEJitInfo : public CEECodeGenInfo
997997
bool *pbHookFunction,
998998
void **pProfilerHandle,
999999
bool *pbIndirectedHandles
1000-
) override final;
1000+
) override;
10011001

1002-
InfoAccessType constructStringLiteral(CORINFO_MODULE_HANDLE scopeHnd, mdToken metaTok, void **ppValue) override final;
1003-
InfoAccessType emptyStringLiteral(void ** ppValue) override final;
1004-
CORINFO_CLASS_HANDLE getStaticFieldCurrentClass(CORINFO_FIELD_HANDLE field, bool* pIsSpeculative) override final;
1005-
void* getMethodSync(CORINFO_METHOD_HANDLE ftnHnd, void **ppIndirection) override final;
1002+
InfoAccessType constructStringLiteral(CORINFO_MODULE_HANDLE scopeHnd, mdToken metaTok, void **ppValue) override;
1003+
InfoAccessType emptyStringLiteral(void ** ppValue) override;
1004+
CORINFO_CLASS_HANDLE getStaticFieldCurrentClass(CORINFO_FIELD_HANDLE field, bool* pIsSpeculative) override;
1005+
void* getMethodSync(CORINFO_METHOD_HANDLE ftnHnd, void **ppIndirection) override;
10061006

1007-
void setPatchpointInfo(PatchpointInfo* patchpointInfo) override final;
1008-
PatchpointInfo* getOSRInfo(unsigned* ilOffset) override final;
1007+
void setPatchpointInfo(PatchpointInfo* patchpointInfo) override;
1008+
PatchpointInfo* getOSRInfo(unsigned* ilOffset) override;
10091009

10101010
protected :
10111011

@@ -1055,7 +1055,7 @@ protected :
10551055
};
10561056

10571057
#ifdef FEATURE_INTERPRETER
1058-
class CInterpreterJitInfo : public CEECodeGenInfo
1058+
class CInterpreterJitInfo final : public CEECodeGenInfo
10591059
{
10601060
public:
10611061
// ICorJitInfo stuff
@@ -1072,19 +1072,19 @@ class CInterpreterJitInfo : public CEECodeGenInfo
10721072
} CONTRACTL_END;
10731073
}
10741074

1075-
void allocMem(AllocMemArgs *pArgs) override final;
1076-
void * allocGCInfo(size_t size) override final;
1077-
virtual void setEHcount (unsigned cEH) override final;
1075+
void allocMem(AllocMemArgs *pArgs) override;
1076+
void * allocGCInfo(size_t size) override;
1077+
virtual void setEHcount (unsigned cEH) override;
10781078
virtual void setEHinfo (
10791079
unsigned EHnumber,
10801080
const CORINFO_EH_CLAUSE* clause
1081-
) override final;
1081+
) override;
10821082

10831083
void WriteCodeBytes();
1084-
void WriteCode(EECodeGenManager * jitMgr) override final;
1084+
void WriteCode(EECodeGenManager * jitMgr) override;
10851085

1086-
void BackoutJitData(EECodeGenManager * jitMgr) override final;
1087-
void SetDebugInfo(PTR_BYTE pDebugInfo) override final;
1086+
void BackoutJitData(EECodeGenManager * jitMgr) override;
1087+
void SetDebugInfo(PTR_BYTE pDebugInfo) override;
10881088

10891089
void ResetForJitRetry()
10901090
{

‎src/tests/JIT/interpreter/InterpreterTester.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@ public class InterpreterTester
1616
[Fact]
1717
public static void RunTests()
1818
{
19-
string corerun = TestLibrary.Utilities.IsWindows ? "corerun.exe" : "corerun";
20-
string libInterp = TestLibrary.Utilities.IsWindows ? "clrinterpreter.dll" : (TestLibrary.Utilities.IsMacOSX ? "libclrinterpreter.dylib" : "libclrinterpreter.so");
2119
string coreRoot = Environment.GetEnvironmentVariable("CORE_ROOT");
2220
string interpreterApp = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Interpreter.dll");
2321

24-
var startInfo = new ProcessStartInfo(Path.Combine(coreRoot, corerun), interpreterApp);
25-
startInfo.EnvironmentVariables["DOTNET_InterpreterName"] = libInterp;
26-
startInfo.EnvironmentVariables["DOTNET_InterpreterPath"] = Path.Combine(coreRoot, libInterp);
22+
var startInfo = new ProcessStartInfo(Path.Combine(coreRoot, "corerun"), interpreterApp);
2723
startInfo.EnvironmentVariables["DOTNET_Interpreter"] = "RunInterpreterTests";
2824

2925
using (Process p = Process.Start(startInfo))

0 commit comments

Comments
 (0)