carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-27 16:00:10 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch SourceBuffer to diagnostics. (#3197)

Browse Source 
This updates SourceBuffer to diagnostics. Some additional edits to
diagnostics were necessary due to issues moving arguments around, which
seems to stem from a compile error with clang 14 (fixed in later
versions).

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2023-09-07 23:02:10 +00:00
committed by GitHub
co-authored by Richard Smith
parent 71e9fb7511
commit bc63e6ae0a
15 changed files with 104 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/source/source_buffer.cpp
+27 -11
View File
@@ -10,36 +10,52 @@
namespace Carbon {
namespace {
struct FilenameTranslator : DiagnosticLocationTranslator<llvm::StringRef> {
auto GetLocation(llvm::StringRef filename) -> DiagnosticLocation override {
return {.file_name = filename};
}
};
} // namespace
auto SourceBuffer::CreateFromFile(llvm::vfs::FileSystem& fs,
llvm::raw_ostream& error_stream,
llvm::StringRef filename)
llvm::StringRef filename,
DiagnosticConsumer& consumer)
-> std::optional<SourceBuffer> {
FilenameTranslator translator;
DiagnosticEmitter<llvm::StringRef> emitter(translator, consumer);
llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>> file =
fs.openFileForRead(filename);
if (file.getError()) {
error_stream << "Error opening `" << filename
<< "`: " << file.getError().message();
CARBON_DIAGNOSTIC(ErrorOpeningFile, Error,
"Error opening file for read: {0}", std::string);
emitter.Emit(filename, ErrorOpeningFile, file.getError().message());
return std::nullopt;
}
llvm::ErrorOr<llvm::vfs::Status> status = (*file)->status();
if (status.getError()) {
error_stream << "Error getting status for `" << filename
<< "`: " << file.getError().message();
CARBON_DIAGNOSTIC(ErrorStattingFile, Error, "Error statting file: {0}",
std::string);
emitter.Emit(filename, ErrorStattingFile, file.getError().message());
return std::nullopt;
}
auto size = status->getSize();
int64_t size = status->getSize();
if (size >= std::numeric_limits<int32_t>::max()) {
error_stream << "Cannot load `" << filename
<< "`: file is over the 2GiB input limit.";
CARBON_DIAGNOSTIC(FileTooLarge, Error,
"File is over the 2GiB input limit; size is {0} bytes.",
int64_t);
emitter.Emit(filename, FileTooLarge, size);
return std::nullopt;
}
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> buffer =
(*file)->getBuffer(filename, size, /*RequiresNullTerminator=*/false);
if (buffer.getError()) {
error_stream << "Error reading `" << filename
<< "`: " << file.getError().message();
CARBON_DIAGNOSTIC(ErrorReadingFile, Error, "Error reading file: {0}",
std::string);
emitter.Emit(filename, ErrorReadingFile, file.getError().message());
return std::nullopt;
}