Merge pull request #3082 from alexanderkyte/no_alloc_klass_error

[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 d16f9ef660245c8b944665b45f97c4f012c05f3d..e143901748d710d2e2f8bce87d31b0bf32dbe102 100644 (file)
--- a/mono/utils/mono-error-internals.h
+++ b/mono/utils/mono-error-internals.h
@@ -2,7 +2,7 @@
 #define __MONO_ERROR_INTERNALS_H__
 
 #include "mono/utils/mono-compiler.h"
-#include "mono/metadata/object-internals.h"
+#include "mono/metadata/class-internals.h"
 
 /*Keep in sync with MonoError*/
 typedef struct {
@@ -33,14 +33,22 @@ typedef struct {
 } MonoErrorInternal;
 
 #define error_init(error) do { \
-       (error)->error_code = MONO_ERROR_NONE;  \
-       (error)->flags = 0;     \
+       ((MonoErrorInternal*)(error))->error_code = MONO_ERROR_NONE;    \
+       ((MonoErrorInternal*)(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)
+
+/* Only use this in icalls */
+#define return_val_and_set_pending_if_nok(error,value) \
+       if (mono_error_set_pending_exception ((error))) \
+               return (value);
+
 void
-mono_error_assert_ok_pos (MonoError *error, const char* filename, int lineno);
+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__);
 
@@ -81,17 +89,32 @@ 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_execution_engine (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_not_implemented (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_not_supported (MonoError *error, const char *msg_format, ...);
+
+void
+mono_error_set_invalid_operation (MonoError *error, const char *msg_format, ...);
+
 void
 mono_error_set_exception_instance (MonoError *error, MonoException *exc);
 
 void
-mono_error_set_from_loader_error (MonoError *error);
+mono_error_set_invalid_program (MonoError *oerror, const char *msg_format, ...);
 
 MonoException*
 mono_error_prepare_exception (MonoError *error, MonoError *error_out);
@@ -103,6 +126,6 @@ void
 mono_error_raise_exception (MonoError *error);
 
 void
-mono_loader_set_error_from_mono_error (MonoError *oerror);
+mono_error_move (MonoError *dest, MonoError *src);
 
 #endif