Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libomptarget] PR38704: Fix erase of ShadowPtrMap
erase() invalidates the iterator and returns a new one pointing to the following element. The code now follows the example at https://en.cppreference.com/w/cpp/container/map/erase. (The added testcase crashes without this patch.) Reported by David Binderman (https://llvm.org/PR38704)! Differential Revision: https://reviews.llvm.org/D51623 llvm-svn: 341371
- Loading branch information
Showing
2 changed files
with
45 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// RUN: %libomptarget-compile-run-and-check-aarch64-unknown-linux-gnu | ||
// RUN: %libomptarget-compile-run-and-check-powerpc64-ibm-linux-gnu | ||
// RUN: %libomptarget-compile-run-and-check-powerpc64le-ibm-linux-gnu | ||
// RUN: %libomptarget-compile-run-and-check-x86_64-pc-linux-gnu | ||
|
||
// Clang 6.0 doesn't use the new map interface, undefined behavior when | ||
// the compiler emits "old" interface code for structures. | ||
// UNSUPPORTED: clang-6 | ||
|
||
#include <stdio.h> | ||
#include <stdlib.h> | ||
|
||
typedef struct { | ||
int *ptr1; | ||
int *ptr2; | ||
} StructWithPtrs; | ||
|
||
int main(int argc, char *argv[]) { | ||
StructWithPtrs s; | ||
s.ptr1 = malloc(sizeof(int)); | ||
s.ptr2 = malloc(2 * sizeof(int)); | ||
|
||
#pragma omp target map(s.ptr1[0:1], s.ptr2[0:2]) | ||
{ | ||
s.ptr1[0] = 1; | ||
s.ptr2[0] = 2; | ||
s.ptr2[1] = 3; | ||
} | ||
|
||
// CHECK: s.ptr1[0] = 1 | ||
// CHECK: s.ptr2[0] = 2 | ||
// CHECK: s.ptr2[1] = 3 | ||
printf("s.ptr1[0] = %d\n", s.ptr1[0]); | ||
printf("s.ptr2[0] = %d\n", s.ptr2[0]); | ||
printf("s.ptr2[1] = %d\n", s.ptr2[1]); | ||
|
||
free(s.ptr1); | ||
free(s.ptr2); | ||
|
||
return 0; | ||
} |