summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/inc/corcompile.h2
-rw-r--r--src/zap/zapinfo.cpp6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/inc/corcompile.h b/src/inc/corcompile.h
index 8a5b4131ee..9120e5aafb 100644
--- a/src/inc/corcompile.h
+++ b/src/inc/corcompile.h
@@ -727,7 +727,6 @@ enum CORCOMPILE_FIXUP_BLOB_KIND
ENCODE_CHECK_FIELD_OFFSET,
ENCODE_DELEGATE_CTOR,
- ENCODE_METHOD_NATIVE_ENTRY, /* NativeCallable method token */
ENCODE_MODULE_HANDLE = 0x50, /* Module token */
ENCODE_STATIC_FIELD_ADDRESS, /* For accessing a static field */
@@ -741,6 +740,7 @@ enum CORCOMPILE_FIXUP_BLOB_KIND
ENCODE_VARARGS_METHODREF,
ENCODE_VARARGS_SIG,
ENCODE_ACTIVE_DEPENDENCY, /* Conditional active dependency */
+ ENCODE_METHOD_NATIVE_ENTRY, /* NativeCallable method token */
};
enum EncodeMethodSigFlags
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp
index eba29327a4..345a920902 100644
--- a/src/zap/zapinfo.cpp
+++ b/src/zap/zapinfo.cpp
@@ -2104,6 +2104,12 @@ void ZapInfo::getCallInfo(CORINFO_RESOLVED_TOKEN * pResolvedToken,
m_zapper->Warning(W("ReadyToRun: Methods with security checks not supported\n"));
ThrowHR(E_NOTIMPL);
}
+
+ if (GetCompileInfo()->IsNativeCallableMethod(pResult->hMethod))
+ {
+ m_zapper->Warning(W("ReadyToRun: References to methods with NativeCallableAttribute not supported\n"));
+ ThrowHR(E_NOTIMPL);
+ }
}
#endif