Better handle exception messages

Better handle exception messages

Author: jacek-galazka

IGC/AdaptorOCL/dllInterfaceCompute.cpp

@@ -303,6 +303,14 @@ bool CIGCTranslationBlock::Translate(
             return false;
         }
     }
+    catch (std::exception& e)
+    {
+        if (pOutputArgs->ErrorStringSize == 0 && pOutputArgs->pErrorString == nullptr)
+        {
+            SetErrorMessage(std::string("IGC: ") + e.what(), *pOutputArgs);
+        }
+        return false;
+    }
     catch (...)
     {
         if (pOutputArgs->ErrorStringSize == 0 && pOutputArgs->pErrorString == nullptr)
@@ -1320,30 +1328,13 @@ bool TranslateBuildSPMD(const STB_TranslateInputArgs *pInputArgs,
             }
             catch (std::exception &e)
             {
-                if (oclContext.HasError() && oclContext.HasWarning())
-                {
-                    SetOutputMessage(oclContext.GetErrorAndWarning(), *pOutputArgs);
-                }
-                else
-                {
-                    if (oclContext.HasError())
-                    {
-                        SetOutputMessage(oclContext.GetError(), *pOutputArgs);
-                    }
-                    if (oclContext.HasWarning())
-                    {
-                        SetOutputMessage(oclContext.GetWarning(), *pOutputArgs);
-                    }
-                }
-
-                if (e.what() != nullptr)
-                {
-                    SetErrorMessage(e.what(), *pOutputArgs);
-                }
-
                 if (pOutputArgs->ErrorStringSize == 0 && pOutputArgs->pErrorString == nullptr)
                 {
-                    SetErrorMessage("IGC: Internal Compiler Error", *pOutputArgs);
+                    std::string message = "IGC: ";
+                    message += oclContext.GetErrorAndWarning();
+                    message += '\n';
+                    message += e.what();
+                    SetErrorMessage(message.c_str(), *pOutputArgs);
                 }
                 return false;
             }

IGC/AdaptorOCL/ocl_igc_interface/impl/igc_ocl_translation_ctx_impl.h

@@ -350,6 +350,16 @@ CIF_DECLARE_INTERFACE_PIMPL(IgcOclTranslationCtx) : CIF::PimplBase
                 }
             }
         }
+        catch (std::exception& e)
+        {
+            success = false;
+            if (output.ErrorStringSize == 0 && output.pErrorString == nullptr)
+            {
+                std::string msg = "IGC: ";
+                msg += e.what();
+                outputInterface->GetImpl()->SetError(TranslationErrorType::FailedCompilation, msg.c_str());
+            }
+        }
         catch (...)
         {
             success = false;