diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-09 17:50:40 +0900 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2025-01-09 17:50:40 +0900 |
| commit | fea7da1b00cc97d742faede2df96c7d327950f49 (patch) | |
| tree | 4de1d6b4ddc69f4f32daabb11ad5c71ab0cf895e /flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp | |
| parent | 9b99dde0d47102625d93c5d1cbbc04951025a6c9 (diff) | |
| parent | 0aa930a41f2d1ebf1fa90ec42da8f96d15a4dcbb (diff) | |
| download | llvm-users/chapuni/cov/single/nextcount.zip llvm-users/chapuni/cov/single/nextcount.tar.gz llvm-users/chapuni/cov/single/nextcount.tar.bz2 | |
Merge branch 'users/chapuni/cov/single/nextcount-base' into users/chapuni/cov/single/nextcountusers/chapuni/cov/single/nextcount
Diffstat (limited to 'flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp')
| -rw-r--r-- | flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp b/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp index ad7b806..e823443 100644 --- a/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp +++ b/flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp @@ -162,13 +162,19 @@ class MapInfoFinalizationPass mlir::Value baseAddrAddr = builder.create<fir::BoxOffsetOp>( loc, descriptor, fir::BoxFieldAttr::base_addr); + mlir::Type underlyingVarType = + llvm::cast<mlir::omp::PointerLikeType>( + fir::unwrapRefType(baseAddrAddr.getType())) + .getElementType(); + if (auto seqType = llvm::dyn_cast<fir::SequenceType>(underlyingVarType)) + if (seqType.hasDynamicExtents()) + underlyingVarType = seqType.getEleTy(); + // Member of the descriptor pointing at the allocated data return builder.create<mlir::omp::MapInfoOp>( loc, baseAddrAddr.getType(), descriptor, - mlir::TypeAttr::get(llvm::cast<mlir::omp::PointerLikeType>( - fir::unwrapRefType(baseAddrAddr.getType())) - .getElementType()), - baseAddrAddr, /*members=*/mlir::SmallVector<mlir::Value>{}, + mlir::TypeAttr::get(underlyingVarType), baseAddrAddr, + /*members=*/mlir::SmallVector<mlir::Value>{}, /*membersIndex=*/mlir::ArrayAttr{}, bounds, builder.getIntegerAttr(builder.getIntegerType(64, false), mapType), builder.getAttr<mlir::omp::VariableCaptureKindAttr>( |