Skip to content

Commit cae69a0

Browse files
committed
try fix flang
1 parent 12edbe6 commit cae69a0

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

flang/lib/Optimizer/CodeGen/TypeConverter.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,6 @@ mlir::Type LLVMTypeConverter::indexType() const {
136136
std::optional<llvm::LogicalResult> LLVMTypeConverter::convertRecordType(
137137
fir::RecordType derived, llvm::SmallVectorImpl<mlir::Type> &results) {
138138
auto name = fir::NameUniquer::dropTypeConversionMarkers(derived.getName());
139-
auto st = mlir::LLVM::LLVMStructType::getIdentified(&getContext(), name);
140-
141-
auto &callStack = getCurrentThreadRecursiveStack();
142-
if (llvm::count(callStack, derived)) {
143-
results.push_back(st);
144-
return mlir::success();
145-
}
146-
callStack.push_back(derived);
147-
auto popConversionCallStack =
148-
llvm::make_scope_exit([&callStack]() { callStack.pop_back(); });
149139

150140
llvm::SmallVector<mlir::Type> members;
151141
for (auto mem : derived.getTypeList()) {
@@ -156,8 +146,8 @@ std::optional<llvm::LogicalResult> LLVMTypeConverter::convertRecordType(
156146
else
157147
members.push_back(mlir::cast<mlir::Type>(convertType(mem.second)));
158148
}
159-
if (mlir::failed(st.setBody(members, /*isPacked=*/false)))
160-
return mlir::failure();
149+
auto st = mlir::LLVM::LLVMStructType::get(&getContext(), name, members,
150+
/*isPacked=*/false);
161151
results.push_back(st);
162152
return mlir::success();
163153
}

0 commit comments

Comments
 (0)