diff options
| author | Jonas Hahnfeld <hahnjo@hahnjo.de> | 2017-11-03 18:28:19 +0000 |
|---|---|---|
| committer | Jonas Hahnfeld <hahnjo@hahnjo.de> | 2017-11-03 18:28:19 +0000 |
| commit | f0a1c65fb007d727ff93bd8ff9c438f689cde77d (patch) | |
| tree | 15f4808dd4e47ef7dd31bf66465d9c9b976a830d /openmp/runtime/src/kmp_lock.cpp | |
| parent | 8fe9fb0ae57b7da25bceb154f4a798d347def42f (diff) | |
| download | bcm5719-llvm-f0a1c65fb007d727ff93bd8ff9c438f689cde77d.tar.gz bcm5719-llvm-f0a1c65fb007d727ff93bd8ff9c438f689cde77d.zip | |
Revert "Updating implementation of OMPT as specified in OpenMP 5.0 Preview 2 (TR6)"
This reverts commit r317339 which discarded some recent commits.
llvm-svn: 317346
Diffstat (limited to 'openmp/runtime/src/kmp_lock.cpp')
| -rw-r--r-- | openmp/runtime/src/kmp_lock.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp index bb18a6d196e..9c7dcaff74a 100644 --- a/openmp/runtime/src/kmp_lock.cpp +++ b/openmp/runtime/src/kmp_lock.cpp @@ -3058,11 +3058,12 @@ kmp_indirect_lock_t *__kmp_allocate_indirect_lock(void **user_lock, if (idx == __kmp_i_lock_table.size) { // Double up the space for block pointers int row = __kmp_i_lock_table.size / KMP_I_LOCK_CHUNK; - kmp_indirect_lock_t **old_table = __kmp_i_lock_table.table; - __kmp_i_lock_table.table = (kmp_indirect_lock_t **)__kmp_allocate( + kmp_indirect_lock_t **new_table = (kmp_indirect_lock_t **)__kmp_allocate( 2 * row * sizeof(kmp_indirect_lock_t *)); - KMP_MEMCPY(__kmp_i_lock_table.table, old_table, + KMP_MEMCPY(new_table, __kmp_i_lock_table.table, row * sizeof(kmp_indirect_lock_t *)); + kmp_indirect_lock_t **old_table = __kmp_i_lock_table.table; + __kmp_i_lock_table.table = new_table; __kmp_free(old_table); // Allocate new objects in the new blocks for (int i = row; i < 2 * row; ++i) |
