diff --git a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp index cd312537551ea..9dfdbd8337ae9 100644 --- a/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp +++ b/flang/lib/Lower/OpenMP/DataSharingProcessor.cpp @@ -126,7 +126,8 @@ void DataSharingProcessor::cloneSymbol(const semantics::Symbol *sym) { assert(sb); mlir::Value addr = sb.getAddr(); assert(addr); - return hlfir::mayHaveAllocatableComponent(addr.getType()); + return !fir::isPointerType(addr.getType()) && + hlfir::mayHaveAllocatableComponent(addr.getType()); }; if (needInitClone()) { diff --git a/flang/runtime/derived.cpp b/flang/runtime/derived.cpp index 7c164ff890452..10813c62e5da1 100644 --- a/flang/runtime/derived.cpp +++ b/flang/runtime/derived.cpp @@ -129,6 +129,10 @@ RT_API_ATTRS int InitializeClone(const Descriptor &clone, std::size_t elements{orig.Elements()}; int stat{StatOk}; + // Skip pointers and unallocated variables. + if (orig.IsPointer() || !orig.IsAllocated()) { + return stat; + } // Initialize each data component. std::size_t components{componentDesc.Elements()}; for (std::size_t i{0}; i < components; ++i) { diff --git a/flang/test/Lower/OpenMP/derived-type-allocatable.f90 b/flang/test/Lower/OpenMP/derived-type-allocatable.f90 index d265954ef1ce1..2dc4e20f27af2 100644 --- a/flang/test/Lower/OpenMP/derived-type-allocatable.f90 +++ b/flang/test/Lower/OpenMP/derived-type-allocatable.f90 @@ -13,6 +13,10 @@ module m1 contains +!CHECK-LABEL: omp.private {type = private} @_QMm1Ftest_pointer +!CHECK-NOT: fir.call @_FortranAInitializeClone +!CHECK: omp.yield + !CHECK-LABEL: omp.private {type = private} @_QMm1Ftest_nested !CHECK: fir.call @_FortranAInitializeClone !CHECK-NEXT: omp.yield @@ -91,4 +95,11 @@ subroutine test_nested() !$omp parallel private(d2) !$omp end parallel end subroutine + + subroutine test_pointer() + type(x), pointer :: ptr + + !$omp parallel private(ptr) + !$omp end parallel + end subroutine end module