diff options
Diffstat (limited to 'src/vm/appdomain.cpp')
| -rw-r--r-- | src/vm/appdomain.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 4eb716164c..bcffb3b8aa 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -2485,6 +2485,11 @@ void SystemDomain::LoadBaseSystemClasses() // Load String g_pStringClass = MscorlibBinder::LoadPrimitiveType(ELEMENT_TYPE_STRING); +#ifdef FEATURE_UTF8STRING + // Load Utf8String + g_pUtf8StringClass = MscorlibBinder::GetClass(CLASS__UTF8_STRING); +#endif // FEATURE_UTF8STRING + // Used by Buffer::BlockCopy g_pByteArrayMT = ClassLoader::LoadArrayTypeThrowing( TypeHandle(MscorlibBinder::GetElementType(ELEMENT_TYPE_U1))).AsArray()->GetMethodTable(); @@ -4218,8 +4223,8 @@ static const char *fileLoadLevelName[] = "LOADLIBRARY", // FILE_LOAD_LOADLIBRARY "POST_LOADLIBRARY", // FILE_LOAD_POST_LOADLIBRARY "EAGER_FIXUPS", // FILE_LOAD_EAGER_FIXUPS - "VTABLE FIXUPS", // FILE_LOAD_VTABLE_FIXUPS "DELIVER_EVENTS", // FILE_LOAD_DELIVER_EVENTS + "VTABLE FIXUPS", // FILE_LOAD_VTABLE_FIXUPS "LOADED", // FILE_LOADED "VERIFY_EXECUTION", // FILE_LOAD_VERIFY_EXECUTION "ACTIVE", // FILE_ACTIVE |