[runtime] Avoid invalid characters.

There were some unquoted backticks and form-feed characters.

diff --git a/mono/arch/s390x/tramp.c b/mono/arch/s390x/tramp.c
index fe9f3107a34af95e19459e74d5244d712a0df219..a79f64e00ec896b1d085c4cabd43fa63b373713b 100644 (file)
--- a/mono/arch/s390x/tramp.c
+++ b/mono/arch/s390x/tramp.c
@@ -62,7 +62,7 @@ typedef struct {
 } size_data;   
 
 /*========================= End of Typedefs ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - add_general                                       */
@@ -95,7 +95,7 @@ add_general (guint *gr, size_data *sz, gboolean simple)
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - calculate_sizes                                   */
@@ -299,7 +299,7 @@ enum_retvalue:
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - emit_prolog                                       */
@@ -337,7 +337,7 @@ emit_prolog (guint8 *p, MonoMethodSignature *sig, size_data *sz)
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - emit_save_parameters                              */
@@ -534,7 +534,7 @@ emit_save_parameters (guint8 *p, MonoMethodSignature *sig, size_data *sz)
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - alloc_code_memory                                 */
@@ -562,7 +562,7 @@ alloc_code_memory (guint code_size)
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - emit_call_and_store_retval                        */
@@ -664,7 +664,7 @@ printf("Returning %d bytes for type %d (%d)\n",retSize,simpletype,sig->pinvoke);
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - emit_epilog                                       */
@@ -687,7 +687,7 @@ emit_epilog (guint8 *p, MonoMethodSignature *sig, size_data *sz)
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - mono_arch_create_trampoline.                      */
@@ -726,7 +726,7 @@ mono_arch_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor)
 }
 
 /*========================= End of Function ========================*/
-\f
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - mono_arch_create_method_pointer                   */

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index d7abbb593f38e6bb8959f5b59c667f750865e7a0..5c81db2d8262944e2f4d8e14d85467bc06026fd8 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -131,9 +131,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 fd129813503bff85321aea4a371776ca83b9f520..d83d40b13ea997c910eb9d64d8ea1f02e178057d 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 363596915064cb30ee0903ff9991bb7be9b7f2e6..39bdf8ebaa1e590e59d8aad39dbeab39863b21e8 100644 (file)
--- a/mono/metadata/class-internals.h
+++ b/mono/metadata/class-internals.h
@@ -1136,7 +1136,7 @@ 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, #namespace, name);     \
                mono_memory_barrier (); \
                tmp_class = klass;      \
        }       \
@@ -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, #namespace, name); \
                tmp_class = klass;      \
                mono_memory_barrier (); \
                inited = TRUE;  \

diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 4cf5fcf45754804080565adb1ab40e4b2f8c377e..efdf249c61587ec203aaee14b1526fef6096624d 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 769e06867deb7316cc06babd87de69c0efef84b9..b3edf0f4aff551185ad4675f47f23b83558df743 100644 (file)
--- a/mono/metadata/cominterop.c
+++ b/mono/metadata/cominterop.c
@@ -104,15 +104,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 2358e6a3b680fd95eff26e916e76b911ff8642f9..749a19e05e818831d52e5ef461aa2bf08e5a53a1 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 774bf8bc50fc32363f9d11632acf7b0422bf80cb..b90c2e97404d8b6146d1e945b813eeee4da77cb2 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 9316b410cd6fcc1d13b13de6ca147141bdc9e98b..1a6ab6e6dd47cc8b818be9c69ea1d1dce37862e6 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 ef0259cdf8bc5342f8d4e41b741a5f90a9e1561a..b92acd24932f3bc3726c95768de988da85aac8ac 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -216,11 +216,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 382eb9fa03e825c0ba8149e4981ec6dd38ccdc60..c1c887f8db9ec3323b41c57d990dd578c14b134e 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -71,11 +71,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 c6d637cb61c16ed0a280a1152fba4cc17f9dd623..60195bcef0e605794747d4b90db40012b8ff54b8 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 c2e040dfc0693fc7623655ae6d44d5195a290438..532bd06c9bd9a19b8639e80e2e4657ddd95e080b 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 f817f956297457016c5c2a7665d87b96fdd59da1..1d177cb4dddc19c982c3e98dd51c67c193b78cd2 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 0dfb927bc29eeae095980873a14a68a4990dc9e3..6f5cb2f8baeae62fa6f79642b0c94fc5a803def5 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 df218b3ea045edbf6c8503505e955a9315082d19..0d4e3865b5db93c92da049507bcc3e19bf4795bb 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 bbbb9f69b88052bd30133aac0b262a525a511911..d643bfd76e82395cddc40ccea4d7eac476ec9f96 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -208,7 +208,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 106bae0725557f553a4fbb760eea7b3d04a9ee74..a9a1d5361a53014de423c5ddc8b6f4057e7c4c2c 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -2080,10 +2080,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 2519adbeb5da4cb53d8cec1c540f77cb6783b2d0..2ff64a9754ded0e17e52e2541d3f086160f2e3d5 100644 (file)
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -164,8 +164,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 e044d7040b70d2708df3a68500311f61fc15c8f5..cab9adc2fd1da137a7d5ae5fb2309ac44819972e 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 687249e0939c186124a5fceea4c7f5b6cde75cb6..16ece34815164b5e79d844af477557bbeb42476c 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)