enable stacktrace

microsoft · Sep 7, 2023 · c35b1e9 · c35b1e9
1 parent 0a3eb60
commit c35b1e9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -39,7 +39,13 @@ include(CMakeDependentOption)
 include(FetchContent)
 include(CheckFunctionExists)
 
-set(CMAKE_CXX_STANDARD 17)
+if(NOT CMAKE_CXX_STANDARD)
+  if("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+    set(CMAKE_CXX_STANDARD 20)
+  else()
+    set(CMAKE_CXX_STANDARD 17)
+  endif()
+endif()
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # NOTE: POSITION INDEPENDENT CODE hurts performance, and it only make sense on POSIX systems

diff --git a/cmake/onnxruntime_common.cmake b/cmake/onnxruntime_common.cmake
@@ -86,11 +86,8 @@ endif()
 source_group(TREE ${REPO_ROOT} FILES ${onnxruntime_common_src})
 
 onnxruntime_add_static_library(onnxruntime_common ${onnxruntime_common_src})
-if(WIN32)
-  if("cxx_std_23" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
-    set_property(TARGET onnxruntime_common PROPERTY CXX_STANDARD 23)
-    target_compile_options(onnxruntime_common PRIVATE "/Zc:char8_t-")
-  endif()
+if("cxx_std_23" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+  set_property(TARGET onnxruntime_common PROPERTY CXX_STANDARD 23)
 endif()
 if (onnxruntime_USE_TELEMETRY)
   set_target_properties(onnxruntime_common PROPERTIES COMPILE_FLAGS "/FI${ONNXRUNTIME_INCLUDE_DIR}/core/platform/windows/TraceLoggingConfigPrivate.h")

diff --git a/cmake/onnxruntime_config.h.in b/cmake/onnxruntime_config.h.in
@@ -22,5 +22,5 @@
 #cmakedefine HAS_UNUSED_BUT_SET_VARIABLE
 #cmakedefine HAS_UNUSED_VARIABLE
 #cmakedefine HAS_USELESS_CAST
-#cmakedefine ORT_BUILD_INFO u8"@ORT_BUILD_INFO@"
-#cmakedefine ORT_VERSION u8"@ORT_VERSION@"
+#cmakedefine ORT_BUILD_INFO "@ORT_BUILD_INFO@"
+#cmakedefine ORT_VERSION "@ORT_VERSION@"
diff --git a/onnxruntime/core/platform/windows/stacktrace.cc b/onnxruntime/core/platform/windows/stacktrace.cc
@@ -30,20 +30,15 @@ class CaptureStackTrace {
 
 // Get the stack trace. Currently only enabled for a DEBUG build as we require the DbgHelp library.
 std::vector<std::string> GetStackTrace() {
-#ifndef NDEBUG
 // TVM need to run with shared CRT, so won't work with debug helper now
 #if (defined __cpp_lib_stacktrace) && !(defined _OPSCHEMA_LIB_) && !(defined _GAMING_XBOX) && !(defined ONNXRUNTIME_ENABLE_MEMLEAK_CHECK)
   return detail::CaptureStackTrace().Trace();
 #else
   return {};
 #endif
-#else
-  return {};
-#endif
 }
 
 namespace detail {
-#ifndef NDEBUG
 #if (defined __cpp_lib_stacktrace) && !(defined _OPSCHEMA_LIB_) && !(defined _GAMING_XBOX) && !(defined ONNXRUNTIME_ENABLE_MEMLEAK_CHECK)
 
 std::vector<std::string> CaptureStackTrace::Trace() const {
@@ -58,7 +53,6 @@ std::vector<std::string> CaptureStackTrace::Trace() const {
   return stacktrace;
 }
 
-#endif
 #endif
 }  // namespace detail
 }  // namespace onnxruntime