Merge pull request #2580 from ItsVeryWindy/master

[mono.git] / mono / utils / mono-error-internals.h

diff --git a/mono/utils/mono-error-internals.h b/mono/utils/mono-error-internals.h
index b96cd54d2c7a8512454161d5c1da22e05b6278db..e4f49fbad3881a91ca28601f693a795bfc3d9a41 100644 (file)
--- a/mono/utils/mono-error-internals.h
+++ b/mono/utils/mono-error-internals.h
@@ -15,16 +15,37 @@ typedef struct {
        const char *member_name;
        const char *exception_name_space;
        const char *exception_name;
-       MonoClass *klass;
+       union {
+               /* Valid if error_code != MONO_ERROR_EXCEPTION_INSTANCE.
+                * Used by type or field load errors and generic error specified by class.
+                */
+               MonoClass *klass;
+               /* Valid if error_code == MONO_ERROR_EXCEPTION_INSTANCE.
+                * Generic error specified by a managed instance.
+                */
+               uint32_t instance_handle;
+       } exn;
        const char *full_message;
        const char *full_message_with_fields;
+       const char *first_argument;
 
-       void *padding [4];
-    char message [128];
+       void *padding [3];
 } MonoErrorInternal;
 
+#define error_init(error) do { \
+       (error)->error_code = MONO_ERROR_NONE;  \
+       (error)->flags = 0;     \
+} while (0);
+
+#define is_ok(error) ((error)->error_code == MONO_ERROR_NONE)
+
+#define return_if_nok(error) do { if (!is_ok ((error))) return; } while (0)
+#define return_val_if_nok(error,val) do { if (!is_ok ((error))) return (val); } while (0)
+
 void
-mono_error_assert_ok (MonoError *error);
+mono_error_assert_ok_pos (MonoError *error, const char* filename, int lineno) MONO_LLVM_INTERNAL;
+
+#define mono_error_assert_ok(e) mono_error_assert_ok_pos (e, __FILE__, __LINE__);
 
 void
 mono_error_dup_strings (MonoError *error, gboolean dup_strings);
@@ -63,12 +84,18 @@ mono_error_set_out_of_memory (MonoError *error, const char *msg_format, ...);
 void
 mono_error_set_argument (MonoError *error, const char *argument, const char *msg_format, ...);
 
+void
+mono_error_set_argument_null (MonoError *oerror, const char *argument, const char *msg_format, ...);
+
 void
 mono_error_set_not_verifiable (MonoError *oerror, MonoMethod *method, const char *msg_format, ...);
 
 void
 mono_error_set_generic_error (MonoError *error, const char * name_space, const char *name, const char *msg_format, ...);
 
+void
+mono_error_set_exception_instance (MonoError *error, MonoException *exc);
+
 void
 mono_error_set_from_loader_error (MonoError *error);