Skip to content

Commit 40db6c7

Browse files
Fix clang format issues
1 parent 97a0180 commit 40db6c7

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

flang/include/flang/Optimizer/Builder/DirectivesCommon.h

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ genBoundsOpFromBoxChar(fir::FirOpBuilder &builder, mlir::Location loc,
160160
if (info.isPresent) {
161161
llvm::SmallVector<mlir::Type> resTypes = {idxTy, idxTy};
162162
mlir::Operation::result_range ifRes =
163-
builder.genIfOp(loc, resTypes, info.isPresent, /*withElseRegion=*/true)
163+
builder
164+
.genIfOp(loc, resTypes, info.isPresent, /*withElseRegion=*/true)
164165
.genThen([&]() {
165166
mlir::Value boxChar =
166167
fir::isa_ref_type(info.addr.getType())
@@ -171,13 +172,15 @@ genBoundsOpFromBoxChar(fir::FirOpBuilder &builder, mlir::Location loc,
171172
mlir::Type refType = builder.getRefType(boxCharType.getEleTy());
172173
auto unboxed = builder.create<fir::UnboxCharOp>(
173174
loc, refType, lenType, boxChar);
174-
mlir::SmallVector<mlir::Value> results = {unboxed.getResult(1), one };
175+
mlir::SmallVector<mlir::Value> results = {unboxed.getResult(1),
176+
one};
175177
builder.create<fir::ResultOp>(loc, results);
176178
})
177-
.genElse([&]() {
178-
mlir::SmallVector<mlir::Value> results = {zero, zero };
179-
builder.create<fir::ResultOp>(loc, results); })
180-
.getResults();
179+
.genElse([&]() {
180+
mlir::SmallVector<mlir::Value> results = {zero, zero};
181+
builder.create<fir::ResultOp>(loc, results);
182+
})
183+
.getResults();
181184
return {ifRes[0], ifRes[1]};
182185
}
183186
// We have already established that info.addr.getType() is a boxchar

flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,17 @@ class MapInfoFinalizationPass
295295
if (mlir::isa<fir::ReferenceType>(op.getVarPtr().getType()))
296296
boxChar = builder.create<fir::LoadOp>(loc, op.getVarPtr());
297297

298-
fir::BoxCharType boxCharType = mlir::dyn_cast<fir::BoxCharType>(boxChar.getType());
299-
mlir::Value boxAddr = builder.create<fir::BoxOffsetOp>(loc, op.getVarPtr(), fir::BoxFieldAttr::base_addr);
298+
fir::BoxCharType boxCharType =
299+
mlir::dyn_cast<fir::BoxCharType>(boxChar.getType());
300+
mlir::Value boxAddr = builder.create<fir::BoxOffsetOp>(
301+
loc, op.getVarPtr(), fir::BoxFieldAttr::base_addr);
300302

301303
uint64_t mapTypeToImplicit = static_cast<
302304
std::underlying_type_t<llvm::omp::OpenMPOffloadMappingFlags>>(
303305
llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO |
304306
llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_IMPLICIT);
305307

306-
mlir::ArrayAttr newMembersAttr;
308+
mlir::ArrayAttr newMembersAttr;
307309
llvm::SmallVector<llvm::SmallVector<int64_t>> memberIdx = {{0}};
308310
newMembersAttr = builder.create2DI64ArrayAttr(memberIdx);
309311

@@ -324,10 +326,10 @@ class MapInfoFinalizationPass
324326

325327
mlir::omp::MapInfoOp newMapInfoOp = builder.create<mlir::omp::MapInfoOp>(
326328
op.getLoc(), op.getResult().getType(), varPtr,
327-
mlir::TypeAttr::get(llvm::cast<mlir::omp::PointerLikeType>(varPtr.getType())
328-
.getElementType()),
329-
op.getMapTypeAttr(),
330-
op.getMapCaptureTypeAttr(),
329+
mlir::TypeAttr::get(
330+
llvm::cast<mlir::omp::PointerLikeType>(varPtr.getType())
331+
.getElementType()),
332+
op.getMapTypeAttr(), op.getMapCaptureTypeAttr(),
331333
/*varPtrPtr=*/mlir::Value{},
332334
/*members=*/llvm::SmallVector<mlir::Value>{memberMapInfoOp},
333335
/*member_index=*/newMembersAttr,

flang/lib/Optimizer/OpenMP/MapsForPrivatizedSymbols.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,19 @@ class MapsForPrivatizedSymbolsPass
217217
}
218218
} else {
219219
mlir::Location loc = var.getLoc();
220-
fir::factory::AddrAndBoundsInfo info = fir::factory::getDataOperandBaseAddr(builder, var, /*isOptional=*/false, loc);
220+
fir::factory::AddrAndBoundsInfo info =
221+
fir::factory::getDataOperandBaseAddr(builder, var,
222+
/*isOptional=*/false, loc);
221223
fir::ExtendedValue extendedValue =
222224
hlfir::translateToExtendedValue(loc, builder,
223225
hlfir::Entity{info.addr},
224-
/*continguousHint=*/true).first;
226+
/*continguousHint=*/true)
227+
.first;
225228
llvm::SmallVector<mlir::Value> boundsOpsVec =
226229
fir::factory::genImplicitBoundsOps<mlir::omp::MapBoundsOp,
227230
mlir::omp::MapBoundsType>(
228-
builder, info, extendedValue,
229-
/*dataExvIsAssumedSize=*/false, loc);
231+
builder, info, extendedValue,
232+
/*dataExvIsAssumedSize=*/false, loc);
230233
for (auto bounds : boundsOpsVec)
231234
boundsOps.push_back(bounds);
232235
}

0 commit comments

Comments
 (0)