mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
f3ff561c6f
This is phase-1 of switching from llvm::Optional to std::optional in the
next rebranch. llvm::Optional was removed from upstream LLVM, so we need
to migrate off rather soon. On Darwin, std::optional, and llvm::Optional
have the same layout, so we don't need to be as concerned about ABI
beyond the name mangling. `llvm::Optional` is only returned from one
function in
```
getStandardTypeSubst(StringRef TypeName,
bool allowConcurrencyManglings);
```
It's the return value, so it should not impact the mangling of the
function, and the layout is the same as `std::optional`, so it should be
mostly okay. This function doesn't appear to have users, and the ABI was
already broken 2 years ago for concurrency and no one seemed to notice
so this should be "okay".
I'm doing the migration incrementally so that folks working on main can
cherry-pick back to the release/5.9 branch. Once 5.9 is done and locked
away, then we can go through and finish the replacement. Since `None`
and `Optional` show up in contexts where they are not `llvm::None` and
`llvm::Optional`, I'm preparing the work now by going through and
removing the namespace unwrapping and making the `llvm` namespace
explicit. This should make it fairly mechanical to go through and
replace llvm::Optional with std::optional, and llvm::None with
std::nullopt. It's also a change that can be brought onto the
release/5.9 with minimal impact. This should be an NFC change.
91 lines
2.5 KiB
C++
91 lines
2.5 KiB
C++
//===--- MoveOnlyBorrowToDestructure.h ------------------------------------===//
|
|
//
|
|
// This source file is part of the Swift.org open source project
|
|
//
|
|
// Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
|
|
// Licensed under Apache License v2.0 with Runtime Library Exception
|
|
//
|
|
// See https://swift.org/LICENSE.txt for license information
|
|
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SWIFT_SILOPTIMIZER_MANDATORY_MOVEONLYBORROWTODESTRUCTURE_H
|
|
#define SWIFT_SILOPTIMIZER_MANDATORY_MOVEONLYBORROWTODESTRUCTURE_H
|
|
|
|
#include "swift/Basic/FrozenMultiMap.h"
|
|
#include "swift/SIL/FieldSensitivePrunedLiveness.h"
|
|
#include "swift/SIL/StackList.h"
|
|
#include "swift/SILOptimizer/Analysis/PostOrderAnalysis.h"
|
|
|
|
#include "llvm/ADT/IntervalMap.h"
|
|
|
|
namespace swift {
|
|
namespace siloptimizer {
|
|
|
|
class DiagnosticEmitter;
|
|
|
|
namespace borrowtodestructure {
|
|
|
|
class IntervalMapAllocator {
|
|
public:
|
|
using Map = llvm::IntervalMap<
|
|
unsigned, SILValue,
|
|
llvm::IntervalMapImpl::NodeSizer<unsigned, SILValue>::LeafSize,
|
|
llvm::IntervalMapHalfOpenInfo<unsigned>>;
|
|
|
|
using Allocator = Map::Allocator;
|
|
|
|
private:
|
|
/// Lazily initialized allocator.
|
|
llvm::Optional<Allocator> allocator;
|
|
|
|
public:
|
|
Allocator &get() {
|
|
if (!allocator)
|
|
allocator.emplace();
|
|
return *allocator;
|
|
}
|
|
};
|
|
|
|
struct Implementation;
|
|
|
|
} // namespace borrowtodestructure
|
|
|
|
class BorrowToDestructureTransform {
|
|
friend borrowtodestructure::Implementation;
|
|
|
|
using IntervalMapAllocator = borrowtodestructure::IntervalMapAllocator;
|
|
|
|
IntervalMapAllocator &allocator;
|
|
MarkMustCheckInst *mmci;
|
|
SILValue rootValue;
|
|
DiagnosticEmitter &diagnosticEmitter;
|
|
PostOrderAnalysis *poa;
|
|
PostOrderFunctionInfo *pofi = nullptr;
|
|
SmallVector<SILInstruction *, 8> createdDestructures;
|
|
SmallVector<SILPhiArgument *, 8> createdPhiArguments;
|
|
|
|
public:
|
|
BorrowToDestructureTransform(IntervalMapAllocator &allocator,
|
|
MarkMustCheckInst *mmci, SILValue rootValue,
|
|
DiagnosticEmitter &diagnosticEmitter,
|
|
PostOrderAnalysis *poa)
|
|
: allocator(allocator), mmci(mmci), rootValue(rootValue),
|
|
diagnosticEmitter(diagnosticEmitter), poa(poa) {}
|
|
|
|
bool transform();
|
|
|
|
private:
|
|
PostOrderFunctionInfo *getPostOrderFunctionInfo() {
|
|
if (!pofi)
|
|
pofi = poa->get(mmci->getFunction());
|
|
return pofi;
|
|
}
|
|
};
|
|
|
|
} // namespace siloptimizer
|
|
} // namespace swift
|
|
|
|
#endif
|