Fix fatal error message displaying

[jlpeyton]

Summary

Replacing call to kmp_msg(kmp_ms_fatal,...) with kmp_fatal(...) caused an
issue when incomplete message is displayed in case an error message is followed
by another message (e.g. by a hint messa)ge. This is because kmp_fatal()
passes incomplete list of arguments to kmp_msg().

[AndreyChurbanov]

LGTM

openmp/trunk/runtime/src/kmp_i18n.cpp

 
 #define get_section(id) ((id) >> 16)
 #define get_number(id) ((id)&0xFFFF)
 
 kmp_msg_t __kmp_msg_empty = {kmp_mt_dummy, 0, "", 0};
 kmp_msg_t __kmp_msg_null = {kmp_mt_dummy, 0, NULL, 0};
 static char const *no_message_available = "(No message available)";
 
+static void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message,
+                      va_list ap);
+
 enum kmp_i18n_cat_status {
   KMP_I18N_CLOSED, // Not yet opened or closed.
   KMP_I18N_OPENED, // Opened successfully, ready to use.
   KMP_I18N_ABSENT // Opening failed, message catalog should not be used.
 }; // enum kmp_i18n_cat_status
 typedef enum kmp_i18n_cat_status kmp_i18n_cat_status_t;
 static volatile kmp_i18n_cat_status_t status = KMP_I18N_CLOSED;
 
kmp_msg_t __kmp_msg_error_mesg(char const *mesg) {
   msg.num = 0;
   msg.str = __kmp_str_format("%s", mesg);
   msg.len = KMP_STRLEN(msg.str);
   return msg;
 
 } // __kmp_msg_error_mesg
 
 // -----------------------------------------------------------------------------
-void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, ...) {
-
-  va_list args;
+void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, va_list args) {
   kmp_i18n_id_t format; // format identifier
   kmp_msg_t fmsg; // formatted message
   kmp_str_buf_t buffer;
 
   if (severity != kmp_ms_fatal && __kmp_generate_warnings == kmp_warnings_off)
     return; // no reason to form a string in order to not print it
 
   __kmp_str_buf_init(&buffer);
void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, va_list args) {
   default: { KMP_DEBUG_ASSERT(0); }
   }
   fmsg = __kmp_msg_format(format, message.num, message.str);
   __kmp_str_free(&message.str);
   __kmp_str_buf_cat(&buffer, fmsg.str, fmsg.len);
   __kmp_str_free(&fmsg.str);
 
   // Format other messages.
-  va_start(args, message);
   for (;;) {
     message = va_arg(args, kmp_msg_t);
     if (message.type == kmp_mt_dummy && message.str == NULL) {
       break;
     }
     if (message.type == kmp_mt_dummy && message.str == __kmp_msg_empty.str) {
       continue;
     }
     switch (message.type) {
     case kmp_mt_hint: {
       format = kmp_i18n_fmt_Hint;
     } break;
     case kmp_mt_syserr: {
       format = kmp_i18n_fmt_SysErr;
     } break;
     default: { KMP_DEBUG_ASSERT(0); }
     }
     fmsg = __kmp_msg_format(format, message.num, message.str);
     __kmp_str_free(&message.str);
     __kmp_str_buf_cat(&buffer, fmsg.str, fmsg.len);
     __kmp_str_free(&fmsg.str);
   }
-  va_end(args);
 
   // Print formatted messages.
   // This lock prevents multiple fatal errors on the same problem.
   // __kmp_acquire_bootstrap_lock( & lock );    // GEH - This lock causing tests
   // to hang on OS X*.
   __kmp_printf("%s", buffer.str);
   __kmp_str_buf_free(&buffer);
 
   // __kmp_release_bootstrap_lock( & lock );  // GEH - this lock causing tests
   // to hang on OS X*.
 
 } // __kmp_msg
 
+void __kmp_msg(kmp_msg_severity_t severity, kmp_msg_t message, ...) {
+  va_list args;
+  va_start(args, message);
+  __kmp_msg(severity, message, args);
+  va_end(args);
+}
+
 void __kmp_fatal(kmp_msg_t message, ...) {
-  __kmp_msg(kmp_ms_fatal, message, __kmp_msg_null);
+  va_list args;
+  va_start(args, message);
+  __kmp_msg(kmp_ms_fatal, message, args);
+  va_end(args);
 #if KMP_OS_WINDOWS
   // Delay to give message a chance to appear before reaping
   __kmp_thread_sleep(500);
 #endif
   __kmp_abort_process();
 } // __kmp_fatal
 
 // end of file //