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.
73 lines
2.3 KiB
C++
73 lines
2.3 KiB
C++
//===--- SwiftEditorDiagConsumer.h - ----------------------------*- C++ -*-===//
|
|
//
|
|
// This source file is part of the Swift.org open source project
|
|
//
|
|
// Copyright (c) 2014 - 2017 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 LLVM_SOURCEKIT_LIB_SWIFTLANG_SWIFTEDITORDIAGCONSUMER_H
|
|
#define LLVM_SOURCEKIT_LIB_SWIFTLANG_SWIFTEDITORDIAGCONSUMER_H
|
|
|
|
#include "SourceKit/Core/LangSupport.h"
|
|
#include "swift/AST/DiagnosticConsumer.h"
|
|
#include "llvm/ADT/DenseMap.h"
|
|
#include "llvm/ADT/MapVector.h"
|
|
|
|
namespace SourceKit {
|
|
|
|
class EditorDiagConsumer : public swift::DiagnosticConsumer {
|
|
typedef std::vector<DiagnosticEntryInfo> DiagnosticsTy;
|
|
/// Maps from a BufferID to the diagnostics that were emitted inside that
|
|
/// buffer.
|
|
llvm::DenseMap<unsigned, DiagnosticsTy> BufferDiagnostics;
|
|
DiagnosticsTy InvalidLocDiagnostics;
|
|
|
|
llvm::MapVector<StringRef, BufferInfoSharedPtr> BufferInfos;
|
|
|
|
int LastDiagBufferID = -1;
|
|
unsigned LastDiagIndex = 0;
|
|
|
|
bool haveLastDiag() {
|
|
return LastDiagBufferID >= 0;
|
|
}
|
|
void clearLastDiag() {
|
|
LastDiagBufferID = -1;
|
|
}
|
|
DiagnosticEntryInfo &getLastDiag() {
|
|
assert(haveLastDiag());
|
|
return BufferDiagnostics[LastDiagBufferID][LastDiagIndex];
|
|
}
|
|
|
|
bool HadAnyError = false;
|
|
|
|
BufferInfoSharedPtr getBufferInfo(StringRef FileName,
|
|
llvm::Optional<unsigned> BufferID,
|
|
swift::SourceManager &SM);
|
|
|
|
public:
|
|
/// The diagnostics are returned in source-order.
|
|
ArrayRef<DiagnosticEntryInfo> getDiagnosticsForBuffer(unsigned BufferID) const {
|
|
ArrayRef<DiagnosticEntryInfo> Diags;
|
|
auto DiagFound = BufferDiagnostics.find(BufferID);
|
|
if (DiagFound != BufferDiagnostics.end())
|
|
Diags = DiagFound->second;
|
|
return Diags;
|
|
}
|
|
|
|
void getAllDiagnostics(SmallVectorImpl<DiagnosticEntryInfo> &Result);
|
|
|
|
bool hadAnyError() const { return HadAnyError; }
|
|
|
|
void handleDiagnostic(swift::SourceManager &SM,
|
|
const swift::DiagnosticInfo &Info) override;
|
|
};
|
|
|
|
} // namespace SourceKit
|
|
|
|
#endif
|