diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-06-03 18:24:02 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-06-03 18:24:02 +0000 |
| commit | 1c9e6432487fe9edd8e731865f9b6c18b250b25c (patch) | |
| tree | a109e36411f8378e7440317130696db4579087c1 /openmp/runtime/src | |
| parent | 1ce7a11c9c9bb2d1652d21f016d64971c584796a (diff) | |
| download | bcm5719-llvm-1c9e6432487fe9edd8e731865f9b6c18b250b25c.tar.gz bcm5719-llvm-1c9e6432487fe9edd8e731865f9b6c18b250b25c.zip | |
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
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/kmp_tasking.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 ); |
