Skip to content

Commit 62f3514

Browse files
committed
Fix Unix build break
1 parent b8fe223 commit 62f3514

File tree

1 file changed

+14
-25
lines changed

1 file changed

+14
-25
lines changed

src/coreclr/inc/eetwain.h

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,7 @@ TADDR GetAmbientSP(PREGDISPLAY pContext,
403403
Get the number of bytes used for stack parameters.
404404
This is currently only used on x86.
405405
*/
406-
virtual
407-
ULONG32 GetStackParameterSize(EECodeInfo* pCodeInfo);
406+
ULONG32 GetStackParameterSize(EECodeInfo* pCodeInfo) override;
408407

409408
/*
410409
Unwind the current stack frame, i.e. update the virtual register
@@ -414,12 +413,11 @@ ULONG32 GetStackParameterSize(EECodeInfo* pCodeInfo);
414413
(if UpdateAllRegs), callee-UNsaved registers are trashed)
415414
Returns success of operation.
416415
*/
417-
virtual
418416
bool UnwindStackFrame(
419417
PREGDISPLAY pRD,
420418
EECodeInfo *pCodeInfo,
421419
unsigned flags,
422-
CodeManState *pState);
420+
CodeManState *pState) override;
423421

424422
#ifdef HAS_LIGHTUNWIND
425423
enum LightUnwindFlag
@@ -444,13 +442,11 @@ void LightUnwindStackFrame(
444442
Is the function currently at a "GC safe point" ?
445443
Can call EnumGcRefs() successfully
446444
*/
447-
virtual
448445
bool IsGcSafe( EECodeInfo *pCodeInfo,
449-
DWORD dwRelOffset);
446+
DWORD dwRelOffset) override;
450447

451448
#if defined(TARGET_ARM) || defined(TARGET_ARM64) || defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
452-
virtual
453-
bool HasTailCalls(EECodeInfo *pCodeInfo);
449+
bool HasTailCalls(EECodeInfo *pCodeInfo) override;
454450
#endif // TARGET_ARM || TARGET_ARM64 || TARGET_LOONGARCH64 || defined(TARGET_RISCV64)
455451

456452
/*
@@ -460,13 +456,12 @@ bool HasTailCalls(EECodeInfo *pCodeInfo);
460456
object have to be individually enumerated).
461457
Returns success of operation.
462458
*/
463-
virtual
464459
bool EnumGcRefs(PREGDISPLAY pContext,
465460
EECodeInfo *pCodeInfo,
466461
unsigned flags,
467462
GCEnumCallback pCallback,
468463
LPVOID hCallBack,
469-
DWORD relOffsetOverride = NO_OVERRIDE_OFFSET);
464+
DWORD relOffsetOverride = NO_OVERRIDE_OFFSET) override;
470465

471466
#ifdef FEATURE_CONSERVATIVE_GC
472467
// Temporary conservative collection, for testing purposes, until we have
@@ -478,22 +473,20 @@ bool EnumGcRefsConservative(PREGDISPLAY pRD,
478473
LPVOID hCallBack);
479474
#endif // FEATURE_CONSERVATIVE_GC
480475

481-
virtual
482476
OBJECTREF GetInstance(
483477
PREGDISPLAY pContext,
484-
EECodeInfo * pCodeInfo);
478+
EECodeInfo * pCodeInfo) override;
485479

486480
/*
487481
Returns the extra argument passed to shared generic code if it is still alive.
488482
Returns NULL in all other cases.
489483
*/
490-
virtual
491484
PTR_VOID GetParamTypeArg(PREGDISPLAY pContext,
492-
EECodeInfo * pCodeInfo);
485+
EECodeInfo * pCodeInfo) override;
493486

494487
// Returns the type of the context parameter (this, methodtable, methoddesc, or none)
495-
virtual GenericParamContextType GetParamContextType(PREGDISPLAY pContext,
496-
EECodeInfo * pCodeInfo);
488+
GenericParamContextType GetParamContextType(PREGDISPLAY pContext,
489+
EECodeInfo * pCodeInfo) override;
497490

498491
#if defined(FEATURE_EH_FUNCLETS) && defined(USE_GC_INFO_DECODER)
499492
/*
@@ -514,46 +507,42 @@ PTR_VOID GetExactGenericsToken(SIZE_T baseStackSlot,
514507
Returns the offset of the GuardStack cookie if it exists.
515508
Returns NULL if there is no cookie.
516509
*/
517-
virtual
518510
void * GetGSCookieAddr(PREGDISPLAY pContext,
519511
EECodeInfo * pCodeInfo,
520512
unsigned flags,
521-
CodeManState * pState);
513+
CodeManState * pState) override;
522514

523515

524516
#ifndef USE_GC_INFO_DECODER
525517
/*
526518
Returns true if the given IP is in the given method's prolog or an epilog.
527519
*/
528-
virtual
529520
bool IsInPrologOrEpilog(
530521
DWORD relOffset,
531522
GCInfoToken gcInfoToken,
532-
size_t* prologSize);
523+
size_t* prologSize) override;
533524

534525
/*
535526
Returns true if the given IP is in the synchronized region of the method (valid for synchronized functions only)
536527
*/
537-
virtual
538528
bool IsInSynchronizedRegion(
539529
DWORD relOffset,
540530
GCInfoToken gcInfoToken,
541-
unsigned flags);
531+
unsigned flags) override;
542532
#endif // !USE_GC_INFO_DECODER
543533

544534
/*
545535
Returns the size of a given function.
546536
*/
547-
virtual
548-
size_t GetFunctionSize(GCInfoToken gcInfoToken);
537+
size_t GetFunctionSize(GCInfoToken gcInfoToken) override;
549538

550539
/*
551540
* Get information necessary for return address hijacking of the method represented by the gcInfoToken.
552541
* If it can be hijacked, it sets the returnKind output parameter to the kind of the return value and
553542
* returns true.
554543
* If hijacking is not possible for some reason, it return false.
555544
*/
556-
virtual bool GetReturnAddressHijackInfo(GCInfoToken gcInfoToken X86_ARG(ReturnKind * returnKind));
545+
bool GetReturnAddressHijackInfo(GCInfoToken gcInfoToken X86_ARG(ReturnKind * returnKind)) override;
557546

558547
#ifndef USE_GC_INFO_DECODER
559548
/*

0 commit comments

Comments
 (0)