diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-02-01 18:13:41 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-01 19:21:37 -0800 |
commit | c52bec686afe4439b2b6c7acc1fe9df21f005b70 (patch) | |
tree | 362aa5603630b2987975e3c2170c7418eb3d8fc2 | |
parent | 652ee28c44e94f99a56e3be925f4d70b2344c72a (diff) | |
download | coreclr-c52bec686afe4439b2b6c7acc1fe9df21f005b70.tar.gz coreclr-c52bec686afe4439b2b6c7acc1fe9df21f005b70.tar.bz2 coreclr-c52bec686afe4439b2b6c7acc1fe9df21f005b70.zip |
Fix fallout from enabling profiling
- Compiler optimization assumption invalid: EE expects method to exist: System.StubHelpers.StubHelpers:ProfilerBeginTransitionCallback
- Add stubs for ARM
-rw-r--r-- | clr.coreclr.props | 2 | ||||
-rw-r--r-- | src/mscorlib/model.xml | 4 | ||||
-rw-r--r-- | src/vm/arm/unixstubs.cpp | 15 |
3 files changed, 17 insertions, 4 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 2373b7b5c3..77b5791914 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -103,8 +103,6 @@ <FeatureStubsAsIL>true</FeatureStubsAsIL> - <ProfilingSupportedBuild>false</ProfilingSupportedBuild> - <!-- Windows specific features --> <FeatureWin32Registry>false</FeatureWin32Registry> <FeatureAppX>false</FeatureAppX> diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index 49295b55c0..7d51ae8202 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -11373,8 +11373,8 @@ <Member Name="MarshalToManagedVaListInternal(System.IntPtr,System.IntPtr)" /> <Member Name="MarshalToUnmanagedVaListInternal(System.IntPtr,System.UInt32,System.IntPtr)" /> <Member Name="CalcVaListSize(System.IntPtr)" /> - <Member Name="ProfilerBeginTransitionCallback(System.IntPtr,System.IntPtr,System.Object)" Platform="Win" /> <!-- EE --> - <Member Name="ProfilerEndTransitionCallback(System.IntPtr,System.IntPtr)" Platform="Win" /> <!-- EE --> + <Member Name="ProfilerBeginTransitionCallback(System.IntPtr,System.IntPtr,System.Object)" /> <!-- EE --> + <Member Name="ProfilerEndTransitionCallback(System.IntPtr,System.IntPtr)" /> <!-- EE --> <Member Name="SafeHandleAddRef(System.Runtime.InteropServices.SafeHandle,System.Boolean@)" /> <Member Name="SafeHandleRelease(System.Runtime.InteropServices.SafeHandle)" /> <Member Name="ValidateObject(System.Object,System.IntPtr,System.Object)" /> diff --git a/src/vm/arm/unixstubs.cpp b/src/vm/arm/unixstubs.cpp index 0cfb7c679b..9fd4cbf985 100644 --- a/src/vm/arm/unixstubs.cpp +++ b/src/vm/arm/unixstubs.cpp @@ -35,4 +35,19 @@ extern "C" { PORTABILITY_ASSERT("Implement for PAL"); } + + void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID) + { + PORTABILITY_ASSERT("Implement for PAL"); + } + + void ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID) + { + PORTABILITY_ASSERT("Implement for PAL"); + } + + void ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID) + { + PORTABILITY_ASSERT("Implement for PAL"); + } }; |