From 1c9e6432487fe9edd8e731865f9b6c18b250b25c Mon Sep 17 00:00:00 2001 From: Jonathan Peyton Date: Wed, 3 Jun 2015 18:24:02 +0000 Subject: Remove conditional parameters from KA_TRACE macro. It's undefined behavior to have arguments to macros be conditionally preprocessed. http://lists.cs.uiuc.edu/pipermail/openmp-dev/2015-June/000669.html Patch by Jack Howarth and Jonathan Peyton llvm-svn: 238950 --- openmp/runtime/src/kmp_tasking.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openmp') diff --git a/openmp/runtime/src/kmp_tasking.c b/openmp/runtime/src/kmp_tasking.c index 028ffcbd5b3..e6f72a1000a 100644 --- a/openmp/runtime/src/kmp_tasking.c +++ b/openmp/runtime/src/kmp_tasking.c @@ -1055,15 +1055,18 @@ __kmpc_omp_task_alloc( ident_t *loc_ref, kmp_int32 gtid, kmp_int32 flags, input_flags->native = FALSE; // __kmp_task_alloc() sets up all other runtime flags +#if OMP_41_ENABLED KA_TRACE(10, ("__kmpc_omp_task_alloc(enter): T#%d loc=%p, flags=(%s %s) " "sizeof_task=%ld sizeof_shared=%ld entry=%p\n", gtid, loc_ref, input_flags->tiedness ? "tied " : "untied", -#if OMP_41_ENABLED input_flags->proxy ? "proxy" : "", + sizeof_kmp_task_t, sizeof_shareds, task_entry) ); #else - "", -#endif + KA_TRACE(10, ("__kmpc_omp_task_alloc(enter): T#%d loc=%p, flags=(%s) " + "sizeof_task=%ld sizeof_shared=%ld entry=%p\n", + gtid, loc_ref, input_flags->tiedness ? "tied " : "untied", sizeof_kmp_task_t, sizeof_shareds, task_entry) ); +#endif retval = __kmp_task_alloc( loc_ref, gtid, input_flags, sizeof_kmp_task_t, sizeof_shareds, task_entry ); -- cgit v1.2.3