Updated assert_fatal

coder137 · coder137 · commit 2f16a694cb33 · 2022-04-22T01:21:24.000-07:00
diff --git a/buildcc/lib/env/include/env/assert_fatal.h b/buildcc/lib/env/include/env/assert_fatal.h
@@ -31,7 +31,7 @@ namespace buildcc::env {
  * exit)
  * During Unit Test -> throw std::exception
  */
-void assert_handle_fatal();
+[[noreturn]] void assert_handle_fatal();
 
 /**
  * @brief Compile time expr asserts fatally when false
diff --git a/buildcc/lib/env/mock/assert_fatal.cpp b/buildcc/lib/env/mock/assert_fatal.cpp
@@ -4,6 +4,6 @@
 
 namespace buildcc::env {
 
-void assert_handle_fatal() { throw std::exception(); }
+[[noreturn]] void assert_handle_fatal() { throw std::exception(); }
 
 } // namespace buildcc::env
diff --git a/buildcc/lib/env/src/assert_fatal.cpp b/buildcc/lib/env/src/assert_fatal.cpp
@@ -35,12 +35,12 @@ bool IsRunningOnThread() {
 
 namespace buildcc::env {
 
-void assert_handle_fatal() {
+[[noreturn]] void assert_handle_fatal() {
   if (!IsRunningOnThread()) {
     std::exit(1);
+  } else {
+    throw std::exception();
   }
-
-  throw std::exception();
 }
 
 } // namespace buildcc::env

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ bool IsRunningOnThread() {`
`35`	`35`
`36`	`36`	`namespace buildcc::env {`
`37`	`37`
`38`		`-void assert_handle_fatal() {`
	`38`	`+[[noreturn]] void assert_handle_fatal() {`
`39`	`39`	`if (!IsRunningOnThread()) {`
`40`	`40`	`std::exit(1);`
	`41`	`+ } else {`
	`42`	`+ throw std::exception();`
`41`	`43`	`}`
`42`		`-`
`43`		`- throw std::exception();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`} // namespace buildcc::env`