Author: Alexey Bataev Date: 2020-07-13T10:52:24-04:00 New Revision: 7075c056e91bf95b111716a9722d10e1a61253bb
URL: https://github.com/llvm/llvm-project/commit/7075c056e91bf95b111716a9722d10e1a61253bb DIFF: https://github.com/llvm/llvm-project/commit/7075c056e91bf95b111716a9722d10e1a61253bb.diff LOG: [OPENMP]Fix compiler crash for target data directive without actual target codegen. Summary: Need to privatize addresses of the captured variables when trying to emit the body of the target data directive in no target codegen mode. Reviewers: jdoerfert Subscribers: yaxunl, guansong, cfe-commits, sstefan1, caomhin Tags: #clang Differential Revision: https://reviews.llvm.org/D83478 Added: Modified: clang/lib/CodeGen/CGStmtOpenMP.cpp clang/test/OpenMP/target_data_codegen.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGStmtOpenMP.cpp b/clang/lib/CodeGen/CGStmtOpenMP.cpp index 7135135d2a41..cfd5eda8cc80 100644 --- a/clang/lib/CodeGen/CGStmtOpenMP.cpp +++ b/clang/lib/CodeGen/CGStmtOpenMP.cpp @@ -6077,6 +6077,7 @@ void CodeGenFunction::EmitOMPTargetDataDirective( (void)PrivateScope.Privatize(); RCG(CGF); } else { + OMPLexicalScope Scope(CGF, S, OMPD_unknown); RCG(CGF); } }; diff --git a/clang/test/OpenMP/target_data_codegen.cpp b/clang/test/OpenMP/target_data_codegen.cpp index f1c9f621bf74..f9257615ce40 100644 --- a/clang/test/OpenMP/target_data_codegen.cpp +++ b/clang/test/OpenMP/target_data_codegen.cpp @@ -491,4 +491,23 @@ void test_close_modifier(int arg) { {++arg;} } #endif +///==========================================================================/// +// RUN: %clang_cc1 -DCK7 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck %s --check-prefix CK7 --check-prefix CK7-64 +// RUN: %clang_cc1 -DCK7 -fopenmp -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s +// RUN: %clang_cc1 -fopenmp -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck %s --check-prefix CK7 --check-prefix CK7-64 + +// RUN: %clang_cc1 -DCK7 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY7 %s +// RUN: %clang_cc1 -DCK7 -fopenmp-simd -x c++ -std=c++11 -triple powerpc64le-unknown-unknown -emit-pch -o %t %s +// RUN: %clang_cc1 -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -std=c++11 -include-pch %t -verify %s -emit-llvm -o - | FileCheck --check-prefix SIMD-ONLY7 %s +// SIMD-ONLY7-NOT: {{__kmpc|__tgt}} +#ifdef CK7 +// CK7: test_device_ptr_addr +void test_device_ptr_addr(int arg) { + int *p; + // CK7: add nsw i32 + // CK7: add nsw i32 + #pragma omp target data use_device_ptr(p) use_device_addr(arg) + { ++arg, ++(*p); } +} +#endif #endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
