From 0ff423e60d9297d9f3466264e07ba290dcf5d611 Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Mon, 27 Feb 2017 14:21:19 +0900 Subject: [PATCH] Clean up PInvokeStubForHost and PInvokeStubForHostInner (dotnet/coreclr#9815) Commit migrated from https://github.com/dotnet/coreclr/commit/62fd770f1e7b362081ad50412ad337d79aa53c53 --- src/coreclr/src/vm/amd64/unixstubs.cpp | 10 ---------- src/coreclr/src/vm/arm/stubs.cpp | 6 ------ src/coreclr/src/vm/arm/unixstubs.cpp | 5 ----- src/coreclr/src/vm/dllimport.h | 6 ------ src/coreclr/src/vm/i386/unixstubs.cpp | 10 ---------- 5 files changed, 37 deletions(-) diff --git a/src/coreclr/src/vm/amd64/unixstubs.cpp b/src/coreclr/src/vm/amd64/unixstubs.cpp index eba5cc2..2904149 100644 --- a/src/coreclr/src/vm/amd64/unixstubs.cpp +++ b/src/coreclr/src/vm/amd64/unixstubs.cpp @@ -11,16 +11,6 @@ extern "C" PORTABILITY_ASSERT("Implement for PAL"); } - void PInvokeStubForHost() - { - PORTABILITY_ASSERT("Implement for PAL"); - } - - void PInvokeStubForHostInner(DWORD dwStackSize, LPVOID pStackFrame, LPVOID pTarget) - { - PORTABILITY_ASSERT("Implement for PAL"); - } - void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID) { PORTABILITY_ASSERT("Implement for PAL"); diff --git a/src/coreclr/src/vm/arm/stubs.cpp b/src/coreclr/src/vm/arm/stubs.cpp index 2051d13..c276d21 100644 --- a/src/coreclr/src/vm/arm/stubs.cpp +++ b/src/coreclr/src/vm/arm/stubs.cpp @@ -2481,12 +2481,6 @@ void HijackFrame::UpdateRegDisplay(const PREGDISPLAY pRD) } #endif -void PInvokeStubForHost(void) -{ - // Hosted P/Invoke is not implemented on ARM. See ARMTODO in code:CorHost2::SetHostControl. - UNREACHABLE(); -} - class UMEntryThunk * UMEntryThunk::Decode(void *pCallback) { _ASSERTE(offsetof(UMEntryThunkCode, m_code) == 0); diff --git a/src/coreclr/src/vm/arm/unixstubs.cpp b/src/coreclr/src/vm/arm/unixstubs.cpp index 8a68103..62f6047 100644 --- a/src/coreclr/src/vm/arm/unixstubs.cpp +++ b/src/coreclr/src/vm/arm/unixstubs.cpp @@ -11,11 +11,6 @@ extern "C" PORTABILITY_ASSERT("Implement for PAL"); } - void PInvokeStubForHostInner(DWORD dwStackSize, LPVOID pStackFrame, LPVOID pTarget) - { - PORTABILITY_ASSERT("Implement for PAL"); - } - void RedirectForThreadAbort() { PORTABILITY_ASSERT("Implement for PAL"); diff --git a/src/coreclr/src/vm/dllimport.h b/src/coreclr/src/vm/dllimport.h index 8d14aff..c9d1fbf 100644 --- a/src/coreclr/src/vm/dllimport.h +++ b/src/coreclr/src/vm/dllimport.h @@ -572,12 +572,6 @@ protected: DWORD m_dwStubFlags; }; -#ifndef _TARGET_X86_ -// The one static host for stub used on !_TARGET_X86_ -EXTERN_C void PInvokeStubForHost(void); -#endif - - class NDirectStubParameters { public: diff --git a/src/coreclr/src/vm/i386/unixstubs.cpp b/src/coreclr/src/vm/i386/unixstubs.cpp index 30cb66d..9c695b9 100644 --- a/src/coreclr/src/vm/i386/unixstubs.cpp +++ b/src/coreclr/src/vm/i386/unixstubs.cpp @@ -16,16 +16,6 @@ extern "C" PORTABILITY_ASSERT("Implement for PAL"); } - void PInvokeStubForHost() - { - PORTABILITY_ASSERT("Implement for PAL"); - } - - void PInvokeStubForHostInner(DWORD dwStackSize, LPVOID pStackFrame, LPVOID pTarget) - { - PORTABILITY_ASSERT("Implement for PAL"); - } - void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID) { PORTABILITY_ASSERT("Implement for PAL"); -- 2.7.4