summaryrefslogtreecommitdiff
path: root/src/dlls/mscorrc
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2018-08-11 07:43:16 -0700
committerGitHub <noreply@github.com>2018-08-11 07:43:16 -0700
commitaf4ec7c89d0192ad14392da04e8c097da8ec9e48 (patch)
tree0b3018c1c576114d2b5b0f355df6ff48972a6c5d /src/dlls/mscorrc
parentf551543427176850c84b9e11c7b8d528c3f282a7 (diff)
downloadcoreclr-af4ec7c89d0192ad14392da04e8c097da8ec9e48.tar.gz
coreclr-af4ec7c89d0192ad14392da04e8c097da8ec9e48.tar.bz2
coreclr-af4ec7c89d0192ad14392da04e8c097da8ec9e48.zip
Make RuntimeType sealed and deleted support for introspection only loads (#19427)
- Sealed Runtime makes `is RuntimeType` and similar checks faster. These checks are fairly common in reflection. - Delete support for introspection only loads from the runtime. We do not plan to use in .NET Core. The support for introspection loads inherited from RuntimeType and thus it is incompatible with sealed RuntimeType.
Diffstat (limited to 'src/dlls/mscorrc')
-rw-r--r--src/dlls/mscorrc/mscorrc.rc7
-rw-r--r--src/dlls/mscorrc/resource.h7
2 files changed, 0 insertions, 14 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc
index c18bbe96d9..cf5b6b2b27 100644
--- a/src/dlls/mscorrc/mscorrc.rc
+++ b/src/dlls/mscorrc/mscorrc.rc
@@ -825,8 +825,6 @@ BEGIN
IDS_EE_DUPLICATE_DECLSEC "Multiple permission sets specified with the same SecurityAction."
IDS_EE_SAFEARRAYSZARRAYMISMATCH "SafeArray cannot be marshaled to this array type because it has either nonzero lower bounds or more than one dimension."
- IDS_EE_REFLECTIONONLYGETTYPE_NOASSEMBLY "Explicit assembly name must be specified when loading a type as ReflectionOnly"
- IDS_EE_REFLECTIONONLY_LOADFAILURE "Cannot resolve dependency to assembly '%1' because it has not been preloaded. When using the ReflectionOnly APIs, dependent assemblies must be pre-loaded or loaded on demand through the ReflectionOnlyAssemblyResolve event."
IDS_EE_WINRT_LOADFAILURE "Could not find Windows Runtime type '%1'."
IDS_EE_WINRT_THIRDPARTY_NOTSUPPORTED "Types from custom Windows Runtime components are not supported in desktop applications."
@@ -928,11 +926,6 @@ BEGIN
IDS_CLASSLOAD_NSTRUCT_NEGATIVE_OFFSET "Could not load type '%1' from assembly '%2' because field '%3' was given a negative offset."
- IDS_EE_CODEEXECUTION_IN_INTROSPECTIVE_ASSEMBLY "Code execution is prohibited in an assembly loaded as ReflectionOnly."
-
- IDS_CLASSLOAD_ASSEMBLY_RESOLVE_RETURNED_INTROSPECTION "AssemblyResolveEvent handlers cannot return Assemblies loaded for reflection only."
- IDS_CLASSLOAD_ASSEMBLY_RESOLVE_RETURNED_EXECUTION "ReflectionOnlyAssemblyResolve handlers must return Assemblies loaded for reflection only."
-
IDS_CLASSLOAD_OVERLAPPING_INTERFACES "The type '%1' in assembly '%2' has a contracting interface set for some instantiations"
IDS_CLASSLOAD_32BITCLRLOADING64BITASSEMBLY "Attempted to load a 64-bit assembly on a 32-bit platform."
diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h
index b183ec8138..fb095fc291 100644
--- a/src/dlls/mscorrc/resource.h
+++ b/src/dlls/mscorrc/resource.h
@@ -379,8 +379,6 @@
#define IDS_EE_CLASSLOAD_INVALIDINSTANTIATION 0x1a59
#define IDS_EE_BADMARSHALFIELD_ZEROLENGTHFIXEDSTRING 0x1a5a
-#define IDS_EE_CODEEXECUTION_IN_INTROSPECTIVE_ASSEMBLY 0x1a61
-
#define IDS_EE_BADMARSHAL_CRITICALHANDLENATIVETOCOM 0x1a62
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
@@ -391,9 +389,6 @@
#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
-#define IDS_CLASSLOAD_ASSEMBLY_RESOLVE_RETURNED_INTROSPECTION 0x1a6d
-#define IDS_CLASSLOAD_ASSEMBLY_RESOLVE_RETURNED_EXECUTION 0x1a6e
-
#define IDS_CLASSLOAD_CONSTRAINT_MISMATCH_ON_IMPLICIT_OVERRIDE 0x1a6f
#define IDS_CLASSLOAD_CONSTRAINT_MISMATCH_ON_IMPLICIT_IMPLEMENTATION 0x1a70
#define IDS_CLASSLOAD_CONSTRAINT_MISMATCH_ON_LOCAL_METHOD_IMPL 0x1a71
@@ -401,7 +396,6 @@
#define IDS_CLASSLOAD_CONSTRAINT_MISMATCH_ON_INTERFACE_METHOD_IMPL 0x1a73
#define IDS_EE_NDIRECT_BADNATL_VARARGS_CALLCONV 0x1a75
-#define IDS_EE_REFLECTIONONLYGETTYPE_NOASSEMBLY 0x1a77
#define IDS_CLASSLOAD_VARIANCE_IN_METHOD_ARG 0x1a79
#define IDS_CLASSLOAD_VARIANCE_IN_METHOD_RESULT 0x1a7a
@@ -429,7 +423,6 @@
#define IDS_EE_BADMARSHAL_CRITICALHANDLEARRAY 0x1a90
#define IDS_EE_BADMARSHALFIELD_ERROR_MSG 0x1a92
#define IDS_EE_BADMARSHAL_ERROR_MSG 0x1a93
-#define IDS_EE_REFLECTIONONLY_LOADFAILURE 0x1a96
#define IDS_EE_COM_INVISIBLE_PARENT 0x1a97
#define IDS_EE_REMOTE_COGETCLASSOBJECT_FAILED 0x1a98