https://github.com/jtb20 updated https://github.com/llvm/llvm-project/pull/194047
>From d8753519e5337efe3b2d4d5fa4f13e2235ee1ce8 Mon Sep 17 00:00:00 2001 From: Julian Brown <[email protected]> Date: Fri, 29 May 2026 08:49:22 -0500 Subject: [PATCH] fix some merge errors Created using spr 1.3.5 --- openmp/runtime/src/kmp_settings.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openmp/runtime/src/kmp_settings.cpp b/openmp/runtime/src/kmp_settings.cpp index 569bbe7aeaba3..23346ea397c65 100644 --- a/openmp/runtime/src/kmp_settings.cpp +++ b/openmp/runtime/src/kmp_settings.cpp @@ -1557,7 +1557,9 @@ KMP_STG_X_DEBUG(c) KMP_STG_X_DEBUG(d) KMP_STG_X_DEBUG(e) KMP_STG_X_DEBUG(f) +#if OMP_TASKGRAPH_EXPERIMENTAL KMP_STG_X_DEBUG(g) +#endif #undef KMP_STG_X_DEBUG @@ -1583,9 +1585,11 @@ static void __kmp_stg_parse_debug(char const *name, char const *value, if (kmp_f_debug < debug) { kmp_f_debug = debug; } +#if OMP_TASKGRAPH_EXPERIMENTAL if (kmp_g_debug < debug) { kmp_g_debug = debug; } +#endif } // __kmp_stg_parse_debug static void __kmp_stg_parse_debug_buf(char const *name, char const *value, @@ -5572,8 +5576,10 @@ static kmp_setting_t __kmp_stg_table[] = { 0}, {"KMP_F_DEBUG", __kmp_stg_parse_f_debug, __kmp_stg_print_f_debug, NULL, 0, 0}, +#if OMP_TASKGRAPH_EXPERIMENTAL {"KMP_G_DEBUG", __kmp_stg_parse_g_debug, __kmp_stg_print_g_debug, NULL, 0, 0}, +#endif {"KMP_DEBUG", __kmp_stg_parse_debug, NULL, /* no print */ NULL, 0, 0}, {"KMP_DEBUG_BUF", __kmp_stg_parse_debug_buf, __kmp_stg_print_debug_buf, NULL, 0, 0}, _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
