Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix several CLR declarations #1408

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Fix several CLR declarations #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/CLR/Core/Interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,10 +795,12 @@ HRESULT CLR_RT_Thread::Execute_Inner()
NANOCLR_CLEANUP_END();
}

HRESULT CLR_RT_Thread::Execute_DelegateInvoke( CLR_RT_StackFrame* stack )
HRESULT CLR_RT_Thread::Execute_DelegateInvoke( CLR_RT_StackFrame& stackArg )
{
NATIVE_PROFILE_CLR_CORE();
NANOCLR_HEADER();

CLR_RT_StackFrame* stack = &stackArg;

const CLR_RECORD_METHODDEF* md;
CLR_RT_HeapBlock_Delegate* dlg;
Expand Down Expand Up @@ -860,10 +862,12 @@ HRESULT CLR_RT_Thread::Execute_DelegateInvoke( CLR_RT_StackFrame* stack )
NANOCLR_NOCLEANUP();
}

HRESULT CLR_RT_Thread::Execute_IL( CLR_RT_StackFrame* stack )
HRESULT CLR_RT_Thread::Execute_IL( CLR_RT_StackFrame& stackArg )
{
NATIVE_PROFILE_CLR_CORE();
NANOCLR_HEADER();

CLR_RT_StackFrame* stack = &stackArg;

CLR_RT_Thread* th = stack->m_owningThread;
CLR_RT_Assembly* assm = stack->m_call.m_assm;
Expand Down
4 changes: 2 additions & 2 deletions src/CLR/Include/nanoCLR_Runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,8 +2519,8 @@ struct CLR_RT_Thread : public CLR_RT_ObjectToEvent_Destination // EVENT HEAP - N

static void ProtectFromGCCallback( void* state );

static HRESULT Execute_DelegateInvoke( CLR_RT_StackFrame* stack );
static HRESULT Execute_IL ( CLR_RT_StackFrame* stack );
static HRESULT Execute_DelegateInvoke( CLR_RT_StackFrame& stack );
static HRESULT Execute_IL ( CLR_RT_StackFrame& stack );

//--//

Expand Down