diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
| commit | 56d4ba8a9338c3ff7378d18378f38ad847f130f2 (patch) | |
| tree | 40b9463880286b1bc0b4c3f858680f1ff210c933 /src/vm/comutilnative.cpp | |
| parent | 8be2f9bb0039e2c49f59c4fb66cebf5467485ba2 (diff) | |
| download | coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.gz coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.bz2 coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.zip | |
Revert "Remove always defined FEATURE_CORESYSTEM"
This reverts commit 751771a8976f909af772e35c167bd7e3ffbe44c8.
Diffstat (limited to 'src/vm/comutilnative.cpp')
| -rw-r--r-- | src/vm/comutilnative.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/vm/comutilnative.cpp b/src/vm/comutilnative.cpp index 04ad7a8c1a..1c9703a0ac 100644 --- a/src/vm/comutilnative.cpp +++ b/src/vm/comutilnative.cpp @@ -1500,6 +1500,12 @@ void QCALLTYPE Buffer::MemMove(void *dst, void *src, size_t length) { QCALL_CONTRACT; +#if defined(FEATURE_CORECLR) && !defined(FEATURE_CORESYSTEM) + // Callers of memcpy do expect and handle access violations in some scenarios. + // Access violations in the runtime dll are turned into fail fast by the vector exception handler by default. + // We need to supress this behavior for CoreCLR using AVInRuntimeImplOkayHolder because of memcpy is statically linked in. + AVInRuntimeImplOkayHolder avOk; +#endif memmove(dst, src, length); } |