[runtime] Require C# namespace to be quoted.

In GENERATE_GET_CLASS_WITH_CACHE and GENERATE_TRY_GET_CLASS_WITH_CACHE,
we were just quoting the namespace immediately.

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 523b826de169580d8f7e4a170f3c3e57acefde6c..921aa7e2d611a2191140f50efce4bb772f8da35a 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -130,9 +130,9 @@ get_shadow_assembly_location_base (MonoDomain *domain, MonoError *error);
 static MonoLoadFunc load_function = NULL;
 
 /* Lazy class loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (assembly, System.Reflection, "Assembly");
+static GENERATE_GET_CLASS_WITH_CACHE (assembly, "System.Reflection", "Assembly");
 
-static GENERATE_GET_CLASS_WITH_CACHE (appdomain, System, "AppDomain");
+static GENERATE_GET_CLASS_WITH_CACHE (appdomain, "System", "AppDomain");
 
 static MonoDomain *
 mono_domain_from_appdomain_handle (MonoAppDomainHandle appdomain);

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index f16479158b865bdbe2bf5af1e1e8b6187a4234ab..33300ffe884fa100278bc414205957f47bf19dbb 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -217,7 +217,7 @@ static mono_mutex_t assembly_binding_mutex;
 static GSList *loaded_assembly_bindings = NULL;
 
 /* Class lazy loading functions */
-static GENERATE_TRY_GET_CLASS_WITH_CACHE (internals_visible, System.Runtime.CompilerServices, "InternalsVisibleToAttribute")
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (internals_visible, "System.Runtime.CompilerServices", "InternalsVisibleToAttribute")
 static MonoAssembly*
 mono_assembly_invoke_search_hook_internal (MonoAssemblyName *aname, MonoAssembly *requesting, gboolean refonly, gboolean postload);
 static MonoAssembly*

diff --git a/mono/metadata/class-internals.h b/mono/metadata/class-internals.h
index 39bdf8ebaa1e590e59d8aad39dbeab39863b21e8..99c8d5b593d397041a059287ea79b1d47b997bb7 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -1129,21 +1129,21 @@ MonoClass* mono_class_get_##shortname##_class (void);
 #define GENERATE_TRY_GET_CLASS_WITH_CACHE_DECL(shortname) \
 MonoClass* mono_class_try_get_##shortname##_class (void);
 
-#define GENERATE_GET_CLASS_WITH_CACHE(shortname,namespace,name) \
+#define GENERATE_GET_CLASS_WITH_CACHE(shortname,name_space,name) \
 MonoClass*     \
 mono_class_get_##shortname##_class (void)      \
 {      \
        static MonoClass *tmp_class;    \
        MonoClass *klass = tmp_class;   \
        if (!klass) {   \
-               klass = mono_class_load_from_name (mono_defaults.corlib, #namespace, name);     \
+               klass = mono_class_load_from_name (mono_defaults.corlib, name_space, name);     \
                mono_memory_barrier (); \
                tmp_class = klass;      \
        }       \
        return klass;   \
 }
 
-#define GENERATE_TRY_GET_CLASS_WITH_CACHE(shortname,namespace,name) \
+#define GENERATE_TRY_GET_CLASS_WITH_CACHE(shortname,name_space,name) \
 MonoClass*     \
 mono_class_try_get_##shortname##_class (void)  \
 {      \
@@ -1152,7 +1152,7 @@ mono_class_try_get_##shortname##_class (void)     \
        MonoClass *klass = (MonoClass *)tmp_class;      \
        mono_memory_barrier (); \
        if (!inited) {  \
-               klass = mono_class_try_load_from_name (mono_defaults.corlib, #namespace, name); \
+               klass = mono_class_try_load_from_name (mono_defaults.corlib, name_space, name); \
                tmp_class = klass;      \
                mono_memory_barrier (); \
                inited = TRUE;  \

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index efdf249c61587ec203aaee14b1526fef6096624d..585999a6dab5d014c228c1f2103122f97147ff4d 100644 (file)
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -10593,7 +10593,7 @@ mono_class_full_name (MonoClass *klass)
 }
 
 /* Declare all shared lazy type lookup functions */
-GENERATE_TRY_GET_CLASS_WITH_CACHE (safehandle, System.Runtime.InteropServices, "SafeHandle")
+GENERATE_TRY_GET_CLASS_WITH_CACHE (safehandle, "System.Runtime.InteropServices", "SafeHandle")
 
 /**
  * mono_method_get_base_method:

diff --git a/mono/metadata/cominterop.c b/mono/metadata/cominterop.c
index 650c97c8afcbcf723314934adf9ddf446f0e2d78..b587e25fa41615ac04ba133c6c1a74047d200567 100644 (file)
--- a/mono/metadata/cominterop.c
+++ b/mono/metadata/cominterop.c
@@ -103,15 +103,15 @@ static mono_mutex_t cominterop_mutex;
 #define STDCALL
 #endif
 
-GENERATE_GET_CLASS_WITH_CACHE (interop_proxy, Mono.Interop, "ComInteropProxy")
-GENERATE_GET_CLASS_WITH_CACHE (idispatch,     Mono.Interop, "IDispatch")
-GENERATE_GET_CLASS_WITH_CACHE (iunknown,      Mono.Interop, "IUnknown")
+GENERATE_GET_CLASS_WITH_CACHE (interop_proxy, "Mono.Interop", "ComInteropProxy")
+GENERATE_GET_CLASS_WITH_CACHE (idispatch,     "Mono.Interop", "IDispatch")
+GENERATE_GET_CLASS_WITH_CACHE (iunknown,      "Mono.Interop", "IUnknown")
 
-GENERATE_GET_CLASS_WITH_CACHE (com_object, System, "__ComObject")
-GENERATE_GET_CLASS_WITH_CACHE (variant,    System, "Variant")
+GENERATE_GET_CLASS_WITH_CACHE (com_object, "System", "__ComObject")
+GENERATE_GET_CLASS_WITH_CACHE (variant,    "System", "Variant")
 
-static GENERATE_GET_CLASS_WITH_CACHE (interface_type_attribute, System.Runtime.InteropServices, "InterfaceTypeAttribute")
-static GENERATE_GET_CLASS_WITH_CACHE (guid_attribute, System.Runtime.InteropServices, "GuidAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (interface_type_attribute, "System.Runtime.InteropServices", "InterfaceTypeAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (guid_attribute, "System.Runtime.InteropServices", "GuidAttribute")
 
 /* Upon creation of a CCW, only allocate a weak handle and set the
  * reference count to 0. If the unmanaged client code decides to addref and

diff --git a/mono/metadata/custom-attrs.c b/mono/metadata/custom-attrs.c
index 749a19e05e818831d52e5ef461aa2bf08e5a53a1..864b846303935d16e0f081507b3ab58052e564ec 100644 (file)
--- a/mono/metadata/custom-attrs.c
+++ b/mono/metadata/custom-attrs.c
@@ -39,8 +39,8 @@
 
 static gboolean type_is_reference (MonoType *type);
 
-static GENERATE_GET_CLASS_WITH_CACHE (custom_attribute_typed_argument, System.Reflection, "CustomAttributeTypedArgument");
-static GENERATE_GET_CLASS_WITH_CACHE (custom_attribute_named_argument, System.Reflection, "CustomAttributeNamedArgument");
+static GENERATE_GET_CLASS_WITH_CACHE (custom_attribute_typed_argument, "System.Reflection", "CustomAttributeTypedArgument");
+static GENERATE_GET_CLASS_WITH_CACHE (custom_attribute_named_argument, "System.Reflection", "CustomAttributeNamedArgument");
 
 /*
  * LOCKING: Acquires the loader lock. 

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index b90c2e97404d8b6146d1e945b813eeee4da77cb2..890e7155beeab41c07a6f82a18ab8b98f660c81b 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -111,12 +111,12 @@ extern MonoString* ves_icall_System_Environment_GetOSVersionString (void);
 ICALL_EXPORT MonoReflectionAssemblyHandle ves_icall_System_Reflection_Assembly_GetCallingAssembly (MonoError *error);
 
 /* Lazy class loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (system_version, System, "Version")
-static GENERATE_GET_CLASS_WITH_CACHE (assembly_name, System.Reflection, "AssemblyName")
-static GENERATE_GET_CLASS_WITH_CACHE (constructor_info, System.Reflection, "ConstructorInfo")
-static GENERATE_GET_CLASS_WITH_CACHE (property_info, System.Reflection, "PropertyInfo")
-static GENERATE_GET_CLASS_WITH_CACHE (event_info, System.Reflection, "EventInfo")
-static GENERATE_GET_CLASS_WITH_CACHE (module, System.Reflection, "Module")
+static GENERATE_GET_CLASS_WITH_CACHE (system_version, "System", "Version")
+static GENERATE_GET_CLASS_WITH_CACHE (assembly_name, "System.Reflection", "AssemblyName")
+static GENERATE_GET_CLASS_WITH_CACHE (constructor_info, "System.Reflection", "ConstructorInfo")
+static GENERATE_GET_CLASS_WITH_CACHE (property_info, "System.Reflection", "PropertyInfo")
+static GENERATE_GET_CLASS_WITH_CACHE (event_info, "System.Reflection", "EventInfo")
+static GENERATE_GET_CLASS_WITH_CACHE (module, "System.Reflection", "Module")
 
 static MonoArrayHandle
 type_array_from_modifiers (MonoImage *image, MonoType *type, int optional, MonoError *error);

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index 1a6ab6e6dd47cc8b818be9c69ea1d1dce37862e6..2adb0d606506d3fa505533a18d21067d8cb0e45e 100644 (file)
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -56,7 +56,7 @@ static const CultureInfoEntry* culture_info_entry_from_lcid (int lcid);
 static const RegionInfoEntry* region_info_entry_from_lcid (int lcid);
 
 /* Lazy class loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (culture_info, System.Globalization, "CultureInfo")
+static GENERATE_GET_CLASS_WITH_CACHE (culture_info, "System.Globalization", "CultureInfo")
 
 static int
 culture_lcid_locator (const void *a, const void *b)

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index a19ec7703e76bdd96f7790316b305c8088e54b4c..b06c455707d942abba005039cbb82d91d0224fb6 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -215,11 +215,11 @@ static void
 mono_icall_end (MonoThreadInfo *info, HandleStackMark *stackmark, MonoError *error);
 
 /* Lazy class loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (string_builder, System.Text, "StringBuilder");
-static GENERATE_GET_CLASS_WITH_CACHE (date_time, System, "DateTime");
-static GENERATE_GET_CLASS_WITH_CACHE (fixed_buffer_attribute, System.Runtime.CompilerServices, "FixedBufferAttribute");
-static GENERATE_TRY_GET_CLASS_WITH_CACHE (unmanaged_function_pointer_attribute, System.Runtime.InteropServices, "UnmanagedFunctionPointerAttribute");
-static GENERATE_TRY_GET_CLASS_WITH_CACHE (icustom_marshaler, System.Runtime.InteropServices, "ICustomMarshaler");
+static GENERATE_GET_CLASS_WITH_CACHE (string_builder, "System.Text", "StringBuilder");
+static GENERATE_GET_CLASS_WITH_CACHE (date_time, "System", "DateTime");
+static GENERATE_GET_CLASS_WITH_CACHE (fixed_buffer_attribute, "System.Runtime.CompilerServices", "FixedBufferAttribute");
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (unmanaged_function_pointer_attribute, "System.Runtime.InteropServices", "UnmanagedFunctionPointerAttribute");
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (icustom_marshaler, "System.Runtime.InteropServices", "ICustomMarshaler");
 
 /* MonoMethod pointers to SafeHandle::DangerousAddRef and ::DangerousRelease */
 static MonoMethod *sh_dangerous_add_ref;

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 88f5acaa0242b624046058035634d5b6cd8bb494..8162ea01f89f28adbdd9802a8852dcaf086fab16 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -69,11 +69,11 @@ static MonoMethod*
 class_get_virtual_method (MonoClass *klass, MonoMethod *method, gboolean is_proxy, MonoError *error);
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (pointer, System.Reflection, "Pointer")
-static GENERATE_GET_CLASS_WITH_CACHE (remoting_services, System.Runtime.Remoting, "RemotingServices")
-static GENERATE_GET_CLASS_WITH_CACHE (unhandled_exception_event_args, System, "UnhandledExceptionEventArgs")
-static GENERATE_GET_CLASS_WITH_CACHE (sta_thread_attribute, System, "STAThreadAttribute")
-static GENERATE_GET_CLASS_WITH_CACHE (activation_services, System.Runtime.Remoting.Activation, "ActivationServices")
+static GENERATE_GET_CLASS_WITH_CACHE (pointer, "System.Reflection", "Pointer")
+static GENERATE_GET_CLASS_WITH_CACHE (remoting_services, "System.Runtime.Remoting", "RemotingServices")
+static GENERATE_GET_CLASS_WITH_CACHE (unhandled_exception_event_args, "System", "UnhandledExceptionEventArgs")
+static GENERATE_GET_CLASS_WITH_CACHE (sta_thread_attribute, "System", "STAThreadAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (activation_services, "System.Runtime.Remoting.Activation", "ActivationServices")
 
 
 #define ldstr_lock() mono_os_mutex_lock (&ldstr_section)

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 60195bcef0e605794747d4b90db40012b8ff54b8..1ddb08757a35cf6ad594485318d1edbe172b5bb9 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -52,20 +52,20 @@ static void get_default_param_value_blobs (MonoMethod *method, char **blobs, gui
 static MonoType* mono_reflection_get_type_with_rootimage (MonoImage *rootimage, MonoImage* image, MonoTypeNameParse *info, gboolean ignorecase, gboolean *type_resolve, MonoError *error);
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (mono_assembly, System.Reflection, "MonoAssembly")
-static GENERATE_GET_CLASS_WITH_CACHE (mono_module, System.Reflection, "MonoModule")
-static GENERATE_GET_CLASS_WITH_CACHE (mono_method, System.Reflection, "MonoMethod");
-static GENERATE_GET_CLASS_WITH_CACHE (mono_cmethod, System.Reflection, "MonoCMethod");
-static GENERATE_GET_CLASS_WITH_CACHE (mono_field, System.Reflection, "MonoField");
-static GENERATE_GET_CLASS_WITH_CACHE (mono_event, System.Reflection, "MonoEvent");
-static GENERATE_GET_CLASS_WITH_CACHE (mono_property, System.Reflection, "MonoProperty");
-static GENERATE_GET_CLASS_WITH_CACHE (mono_parameter_info, System.Reflection, "MonoParameterInfo");
-static GENERATE_GET_CLASS_WITH_CACHE (missing, System.Reflection, "Missing");
-static GENERATE_GET_CLASS_WITH_CACHE (method_body, System.Reflection, "MethodBody");
-static GENERATE_GET_CLASS_WITH_CACHE (local_variable_info, System.Reflection, "LocalVariableInfo");
-static GENERATE_GET_CLASS_WITH_CACHE (exception_handling_clause, System.Reflection, "ExceptionHandlingClause");
-static GENERATE_GET_CLASS_WITH_CACHE (type_builder, System.Reflection.Emit, "TypeBuilder");
-static GENERATE_GET_CLASS_WITH_CACHE (dbnull, System, "DBNull");
+static GENERATE_GET_CLASS_WITH_CACHE (mono_assembly, "System.Reflection", "MonoAssembly")
+static GENERATE_GET_CLASS_WITH_CACHE (mono_module, "System.Reflection", "MonoModule")
+static GENERATE_GET_CLASS_WITH_CACHE (mono_method, "System.Reflection", "MonoMethod");
+static GENERATE_GET_CLASS_WITH_CACHE (mono_cmethod, "System.Reflection", "MonoCMethod");
+static GENERATE_GET_CLASS_WITH_CACHE (mono_field, "System.Reflection", "MonoField");
+static GENERATE_GET_CLASS_WITH_CACHE (mono_event, "System.Reflection", "MonoEvent");
+static GENERATE_GET_CLASS_WITH_CACHE (mono_property, "System.Reflection", "MonoProperty");
+static GENERATE_GET_CLASS_WITH_CACHE (mono_parameter_info, "System.Reflection", "MonoParameterInfo");
+static GENERATE_GET_CLASS_WITH_CACHE (missing, "System.Reflection", "Missing");
+static GENERATE_GET_CLASS_WITH_CACHE (method_body, "System.Reflection", "MethodBody");
+static GENERATE_GET_CLASS_WITH_CACHE (local_variable_info, "System.Reflection", "LocalVariableInfo");
+static GENERATE_GET_CLASS_WITH_CACHE (exception_handling_clause, "System.Reflection", "ExceptionHandlingClause");
+static GENERATE_GET_CLASS_WITH_CACHE (type_builder, "System.Reflection.Emit", "TypeBuilder");
+static GENERATE_GET_CLASS_WITH_CACHE (dbnull, "System", "DBNull");
 
 
 static int class_ref_info_handle_count;

diff --git a/mono/metadata/remoting.c b/mono/metadata/remoting.c
index 532bd06c9bd9a19b8639e80e2e4657ddd95e080b..b85e950ab55e18c39cb8361edc3edaeef7154cca 100644 (file)
--- a/mono/metadata/remoting.c
+++ b/mono/metadata/remoting.c
@@ -70,9 +70,9 @@ static MonoReflectionType *
 type_from_handle (MonoType *handle);
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (remoting_services, System.Runtime.Remoting, "RemotingServices")
-static GENERATE_GET_CLASS_WITH_CACHE (call_context, System.Runtime.Remoting.Messaging, "CallContext")
-static GENERATE_GET_CLASS_WITH_CACHE (context, System.Runtime.Remoting.Contexts, "Context")
+static GENERATE_GET_CLASS_WITH_CACHE (remoting_services, "System.Runtime.Remoting", "RemotingServices")
+static GENERATE_GET_CLASS_WITH_CACHE (call_context, "System.Runtime.Remoting.Messaging", "CallContext")
+static GENERATE_GET_CLASS_WITH_CACHE (context, "System.Runtime.Remoting.Contexts", "Context")
 
 static mono_mutex_t remoting_mutex;
 static gboolean remoting_mutex_inited;

diff --git a/mono/metadata/security-core-clr.c b/mono/metadata/security-core-clr.c
index 1d177cb4dddc19c982c3e98dd51c67c193b78cd2..fab9cb946b013e0441ed99896a543656a8b47b48 100644 (file)
--- a/mono/metadata/security-core-clr.c
+++ b/mono/metadata/security-core-clr.c
@@ -124,8 +124,8 @@ mono_security_core_clr_is_platform_image (MonoImage *image)
 #ifndef DISABLE_SECURITY
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (security_critical, System.Security, "SecurityCriticalAttribute")
-static GENERATE_GET_CLASS_WITH_CACHE (security_safe_critical, System.Security, "SecuritySafeCriticalAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (security_critical, "System.Security", "SecurityCriticalAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (security_safe_critical, "System.Security", "SecuritySafeCriticalAttribute")
 
 static MonoClass*
 security_critical_attribute (void)

diff --git a/mono/metadata/security-manager.c b/mono/metadata/security-manager.c
index 6f5cb2f8baeae62fa6f79642b0c94fc5a803def5..7006806ed34478d83cb122fb5ea5b2b782d49b89 100644 (file)
--- a/mono/metadata/security-manager.c
+++ b/mono/metadata/security-manager.c
@@ -11,8 +11,8 @@
 #include "security-manager.h"
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (security_manager, System.Security, "SecurityManager")
-static GENERATE_TRY_GET_CLASS_WITH_CACHE (execution_context, System.Threading, "ExecutionContext")
+static GENERATE_GET_CLASS_WITH_CACHE (security_manager, "System.Security", "SecurityManager")
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (execution_context, "System.Threading", "ExecutionContext")
 
 static MonoSecurityMode mono_security_mode = MONO_SECURITY_MODE_NONE;
 

diff --git a/mono/metadata/sre.c b/mono/metadata/sre.c
index 0d4e3865b5db93c92da049507bcc3e19bf4795bb..fbde1f1cc0fd3e00e6281d61ab0b514512a03609 100644 (file)
--- a/mono/metadata/sre.c
+++ b/mono/metadata/sre.c
@@ -36,8 +36,8 @@
 #include "mono/utils/mono-digest.h"
 #include "mono/utils/w32api.h"
 
-static GENERATE_GET_CLASS_WITH_CACHE (marshal_as_attribute, System.Runtime.InteropServices, "MarshalAsAttribute");
-static GENERATE_GET_CLASS_WITH_CACHE (module_builder, System.Reflection.Emit, "ModuleBuilder");
+static GENERATE_GET_CLASS_WITH_CACHE (marshal_as_attribute, "System.Runtime.InteropServices", "MarshalAsAttribute");
+static GENERATE_GET_CLASS_WITH_CACHE (module_builder, "System.Reflection.Emit", "ModuleBuilder");
 
 static char* string_to_utf8_image_raw (MonoImage *image, MonoString *s, MonoError *error);
 

diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index 5712f07d175a15b1c4b39250c9519504634b66e6..28b66c8eb3da13ed2d013971115376e0bbaf0628 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -206,7 +206,7 @@ static gboolean shutting_down = FALSE;
 static gint32 managed_thread_id_counter = 0;
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (appdomain_unloaded_exception, System, "AppDomainUnloadedException")
+static GENERATE_GET_CLASS_WITH_CACHE (appdomain_unloaded_exception, "System", "AppDomainUnloadedException")
 
 static void
 mono_threads_lock (void)

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index 0e12c7c09fd5d817310f0ad875a4847d4406289a..f826b7965e77f86719fd45b5d15f4545286801b0 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -2079,10 +2079,10 @@ init_stack_with_value_at_exception_boundary (VerifyContext *ctx, ILCodeDesc *cod
                code->stack->stype |= BOXED_MASK;
 }
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (ienumerable, System.Collections.Generic, "IEnumerable`1")
-static GENERATE_GET_CLASS_WITH_CACHE (icollection, System.Collections.Generic, "ICollection`1")
-static GENERATE_GET_CLASS_WITH_CACHE (ireadonly_list, System.Collections.Generic, "IReadOnlyList`1")
-static GENERATE_GET_CLASS_WITH_CACHE (ireadonly_collection, System.Collections.Generic, "IReadOnlyCollection`1")
+static GENERATE_GET_CLASS_WITH_CACHE (ienumerable, "System.Collections.Generic", "IEnumerable`1")
+static GENERATE_GET_CLASS_WITH_CACHE (icollection, "System.Collections.Generic", "ICollection`1")
+static GENERATE_GET_CLASS_WITH_CACHE (ireadonly_list, "System.Collections.Generic", "IReadOnlyList`1")
+static GENERATE_GET_CLASS_WITH_CACHE (ireadonly_collection, "System.Collections.Generic", "IReadOnlyCollection`1")
 
 
 static MonoClass*

diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index cda09bf81946c61dd911aa829f4dfb227db94b31..a77f9fc119494653411fff16ad727374ab056257 100644 (file)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -163,8 +163,8 @@ static MonoMethodSignature *helper_sig_get_tls_tramp;
 static MonoMethodSignature *helper_sig_set_tls_tramp;
 
 /* type loading helpers */
-static GENERATE_GET_CLASS_WITH_CACHE (runtime_helpers, System.Runtime.CompilerServices, "RuntimeHelpers")
-static GENERATE_TRY_GET_CLASS_WITH_CACHE (debuggable_attribute, System.Diagnostics, "DebuggableAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (runtime_helpers, "System.Runtime.CompilerServices", "RuntimeHelpers")
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (debuggable_attribute, "System.Diagnostics", "DebuggableAttribute")
 
 /*
  * Instruction metadata

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index cab9adc2fd1da137a7d5ae5fb2309ac44819972e..f3b918e565ea10d74a8489fa82af2facbe2c6166 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -1301,7 +1301,7 @@ mini_jit_info_table_find (MonoDomain *domain, char *addr, MonoDomain **out_domai
 }
 
 /* Class lazy loading functions */
-static GENERATE_GET_CLASS_WITH_CACHE (runtime_compat_attr, System.Runtime.CompilerServices, "RuntimeCompatibilityAttribute")
+static GENERATE_GET_CLASS_WITH_CACHE (runtime_compat_attr, "System.Runtime.CompilerServices", "RuntimeCompatibilityAttribute")
 
 /*
  * wrap_non_exception_throws:

diff --git a/mono/mini/mini-generic-sharing.c b/mono/mini/mini-generic-sharing.c
index 16ece34815164b5e79d844af477557bbeb42476c..e29b80e2e30438dd1a0858ebe132864ce5ce008c 100644 (file)
--- a/mono/mini/mini-generic-sharing.c
+++ b/mono/mini/mini-generic-sharing.c
@@ -2673,7 +2673,7 @@ mini_method_is_open (MonoMethod *method)
 }
 
 /* Lazy class loading functions */
-static GENERATE_TRY_GET_CLASS_WITH_CACHE (iasync_state_machine, System.Runtime.CompilerServices, "IAsyncStateMachine")
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (iasync_state_machine, "System.Runtime.CompilerServices", "IAsyncStateMachine")
 
 static G_GNUC_UNUSED gboolean
 is_async_state_machine_class (MonoClass *klass)