Skip to content

Commit f7a6224

Browse files
committed
[flang] use set_union instead of merge in added DerivedTypeCache
1 parent 8f6a964 commit f7a6224

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

flang/lib/Optimizer/Transforms/DebugTypeGenerator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ void DerivedTypeCache::postComponentVisitUpdate(
303303
return;
304304
ActiveLevels oldLevels;
305305
oldLevels.swap(activeRecursionLevels);
306-
std::merge(componentActiveRecursionLevels.begin(),
307-
componentActiveRecursionLevels.end(), oldLevels.begin(),
308-
oldLevels.end(), std::back_inserter(activeRecursionLevels));
306+
std::set_union(componentActiveRecursionLevels.begin(),
307+
componentActiveRecursionLevels.end(), oldLevels.begin(),
308+
oldLevels.end(), std::back_inserter(activeRecursionLevels));
309309
}
310310

311311
void DerivedTypeCache::finalize(mlir::Type ty, mlir::LLVM::DITypeAttr attr,

0 commit comments

Comments
 (0)