Merge branch 'master' of https://github.com/Microsoft/vcpkg

1 files changed, 21 insertions, 9 deletions

diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg_Checks.cpp
index 02d3480a2..81e7d3825 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg_Checks.cpp
@@ -1,12 +1,22 @@
 #include "pch.h"
 #include "vcpkg_Checks.h"
 #include "vcpkg_System.h"
+#include "vcpkglib.h"
 
 namespace vcpkg::Checks
 {
-    __declspec(noreturn) void unreachable()
+    static void print_line_info_if_debug(const LineInfo& line_info)
+    {
+        if (g_debugging)
+        {
+            System::println(System::color::error, line_info.toString());
+        }
+    }
+
+    __declspec(noreturn) void unreachable(const LineInfo& line_info)
     {
         System::println(System::color::error, "Error: Unreachable code was reached");
+        System::println(System::color::error, line_info.toString()); // Always print line_info here
 #ifndef NDEBUG
         std::abort();
 #else
@@ -14,38 +24,40 @@ namespace vcpkg::Checks
 #endif
     }
 
-    __declspec(noreturn) void exit_with_message(const char* errorMessage)
+    __declspec(noreturn) void exit_with_message(const LineInfo& line_info, const char* errorMessage)
     {
         System::println(System::color::error, errorMessage);
+        print_line_info_if_debug(line_info);
         exit(EXIT_FAILURE);
     }
 
-    __declspec(noreturn) void throw_with_message(const char* errorMessage)
+    __declspec(noreturn) void throw_with_message(const LineInfo& line_info, const char* errorMessage)
     {
+        print_line_info_if_debug(line_info);
         throw std::runtime_error(errorMessage);
     }
 
-    void check_throw(bool expression, const char* errorMessage)
+    void check_throw(const LineInfo& line_info, bool expression, const char* errorMessage)
     {
         if (!expression)
         {
-            throw_with_message(errorMessage);
+            throw_with_message(line_info, errorMessage);
         }
     }
 
-    void check_exit(bool expression)
+    void check_exit(const LineInfo& line_info, bool expression)
     {
         if (!expression)
         {
-            exit(EXIT_FAILURE);
+            exit_with_message(line_info, "");
         }
     }
 
-    void check_exit(bool expression, const char* errorMessage)
+    void check_exit(const LineInfo& line_info, bool expression, const char* errorMessage)
     {
         if (!expression)
         {
-            exit_with_message(errorMessage);
+            exit_with_message(line_info, errorMessage);
         }
     }
 }