Skip to content

Commit 506ff54

Browse files
authored
[flang][Semantics] Fix updating flags of threadprivate symbols in presence of default clause (#78283)
Current semantic checks of default clause incorrectly update symbol flags related to threadprivate symbols. This patch adds an additional check to skip such updation should a symbol be already declared threadprivate. Fixes #78282
1 parent f21ead0 commit 506ff54

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

flang/lib/Semantics/resolve-directives.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,6 +2021,11 @@ void OmpAttributeVisitor::Post(const parser::Name &name) {
20212021
}
20222022
}
20232023
}
2024+
2025+
if (Symbol * found{currScope().FindSymbol(name.source)}) {
2026+
if (found->test(semantics::Symbol::Flag::OmpThreadprivate))
2027+
return;
2028+
}
20242029
std::vector<Symbol *> defaultDSASymbols;
20252030
for (int dirDepth{0}; dirDepth < (int)dirContext_.size(); ++dirDepth) {
20262031
DirContext &dirContext = dirContext_[dirDepth];

flang/test/Lower/OpenMP/default-clause.f90

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,3 +383,32 @@ subroutine skipped_default_clause_checks()
383383
iii=it(11)
384384
!$omp end parallel
385385
end subroutine
386+
387+
!CHECK: func.func @_QPthreadprivate_with_default() {
388+
!CHECK: %[[VAR_I:.*]] = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFthreadprivate_with_defaultEi"}
389+
!CHECK: %[[VAR_I_DECLARE:.*]] = hlfir.declare %[[VAR_I]] {uniq_name = "_QFthreadprivate_with_defaultEi"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
390+
!CHECK: %[[BLK_ADDR:.*]] = fir.address_of(@blk_) : !fir.ref<!fir.array<4xi8>>
391+
!CHECK: %[[BLK_THREADPRIVATE_OUTER:.*]] = omp.threadprivate %[[BLK_ADDR]] : !fir.ref<!fir.array<4xi8>> -> !fir.ref<!fir.array<4xi8>>
392+
!CHECK: %[[CONVERT:.*]] = fir.convert %[[BLK_THREADPRIVATE_OUTER]] : (!fir.ref<!fir.array<4xi8>>) -> !fir.ref<!fir.array<?xi8>>
393+
!CHECK: %[[VAR_C:.*]] = arith.constant 0 : index
394+
!CHECK: %[[BLK_REF:.*]] = fir.coordinate_of %[[CONVERT]], %[[VAR_C]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
395+
!CHECK: %[[CONVERT:.*]] = fir.convert %[[BLK_REF]] : (!fir.ref<i8>) -> !fir.ref<i32>
396+
!CHECK: %[[VAR_X_DECLARE:.*]] = hlfir.declare %[[CONVERT]] {uniq_name = "_QFthreadprivate_with_defaultEx"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
397+
!CHECK: omp.parallel {
398+
!CHECK: %[[BLK_THREADPRIVATE_INNER:.*]] = omp.threadprivate %[[BLK_ADDR]] : !fir.ref<!fir.array<4xi8>> -> !fir.ref<!fir.array<4xi8>>
399+
!CHECK: %[[CONVERT_INNER:.*]] = fir.convert %[[BLK_THREADPRIVATE_INNER]] : (!fir.ref<!fir.array<4xi8>>) -> !fir.ref<!fir.array<?xi8>>
400+
!CHECK: %[[VAR_C_INNER:.*]] = arith.constant 0 : index
401+
!CHECK: %[[BLK_REF_INNER:.*]] = fir.coordinate_of %[[CONVERT_INNER]], %[[VAR_C_INNER]] : (!fir.ref<!fir.array<?xi8>>, index) -> !fir.ref<i8>
402+
!CHECK: %[[CONVERT_INNER:.*]] = fir.convert %[[BLK_REF_INNER]] : (!fir.ref<i8>) -> !fir.ref<i32>
403+
!CHECK: %[[VAR_X_DECLARE_INNER:.*]] = hlfir.declare %[[CONVERT_INNER]] {uniq_name = "_QFthreadprivate_with_defaultEx"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
404+
subroutine threadprivate_with_default
405+
integer :: x
406+
common /blk/ x
407+
!$omp threadprivate (/blk/)
408+
409+
!$omp parallel do default(private)
410+
do i = 1, 4
411+
x = 4
412+
end do
413+
!$omp end parallel do
414+
end subroutine

0 commit comments

Comments
 (0)