Merge pull request #2524 from lambdageek/monoerror-mono_string_new_utf16_checked

[mono.git] / mono / utils / mono-error.c

diff --git a/mono/utils/mono-error.c b/mono/utils/mono-error.c
index ca3350c5fd4b442074194c7afbd580aaae64f8a3..768b169079f4b8f4a95dde7d593621761818333c 100644 (file)
--- a/mono/utils/mono-error.c
+++ b/mono/utils/mono-error.c
@@ -119,12 +119,12 @@ mono_error_ok (MonoError *error)
 }
 
 void
-mono_error_assert_ok (MonoError *error)
+mono_error_assert_ok_pos (MonoError *error, const char* filename, int lineno)
 {
        if (mono_error_ok (error))
                return;
 
-       g_error ("%s\n", mono_error_get_message (error));
+       g_error ("%s:%d: %s\n", filename, lineno, mono_error_get_message (error));
 }
 
 unsigned short
@@ -347,6 +347,7 @@ mono_error_set_exception_instance (MonoError *oerror, MonoException *exc)
 {
        MonoErrorInternal *error = (MonoErrorInternal*)oerror;
 
+       mono_error_prepare (error);
        error->error_code = MONO_ERROR_EXCEPTION_INSTANCE;
        error->exn.instance_handle = mono_gchandle_new (exc ? &exc->object : NULL, FALSE);
 }
@@ -480,6 +481,18 @@ mono_error_set_argument (MonoError *oerror, const char *argument, const char *ms
        set_error_message ();
 }
 
+void
+mono_error_set_argument_null (MonoError *oerror, const char *argument, const char *msg_format, ...)
+{
+       MonoErrorInternal *error = (MonoErrorInternal*)oerror;
+       mono_error_prepare (error);
+
+       error->error_code = MONO_ERROR_ARGUMENT_NULL;
+       error->first_argument = argument;
+
+       set_error_message ();
+}
+
 void
 mono_error_set_not_verifiable (MonoError *oerror, MonoMethod *method, const char *msg_format, ...)
 {
@@ -644,6 +657,10 @@ mono_error_prepare_exception (MonoError *oerror, MonoError *error_out)
                exception = mono_get_exception_argument (error->first_argument, error->full_message);
                break;
 
+       case MONO_ERROR_ARGUMENT_NULL:
+               exception = mono_get_exception_argument_null (error->first_argument);
+               break;
+
        case MONO_ERROR_NOT_VERIFIABLE: {
                char *type_name = NULL, *message;
                if (error->exn.klass) {