mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-PerkinsandChandler Carruth
7befe2ce9f
This switches most error printing to use diagnostics instead of direct stream writes, even when not a specific file diagnostic. I'm allowing empty filenames for this use-case. This allows a little more specific testing to validate coverage of output using the diagnostic coverage test. I'm adding a few tests to cover things that weren't previously tested. Separately, this also forces a little more standardization in format... considering how changes like #4568 show effort being spent to _mirror_ diagnostic style, my thought is now to just use diagnostic code where possible. Note this also allows incrementally better testing of the language server; I'm changing the crash fix from #4847 in favor of diagnostic testing. --------- Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
79 lines
2.9 KiB
C++
79 lines
2.9 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/source/source_buffer.h"
|
|
|
|
#include <limits>
|
|
|
|
#include "llvm/Support/ErrorOr.h"
|
|
#include "toolchain/diagnostics/file_diagnostics.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto SourceBuffer::MakeFromStdin(DiagnosticConsumer& consumer)
|
|
-> std::optional<SourceBuffer> {
|
|
return MakeFromMemoryBuffer(llvm::MemoryBuffer::getSTDIN(), "<stdin>",
|
|
/*is_regular_file=*/false, consumer);
|
|
}
|
|
|
|
auto SourceBuffer::MakeFromFile(llvm::vfs::FileSystem& fs,
|
|
llvm::StringRef filename,
|
|
DiagnosticConsumer& consumer)
|
|
-> std::optional<SourceBuffer> {
|
|
FileDiagnosticEmitter emitter(&consumer);
|
|
|
|
llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>> file =
|
|
fs.openFileForRead(filename);
|
|
if (file.getError()) {
|
|
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()) {
|
|
CARBON_DIAGNOSTIC(ErrorStattingFile, Error, "error statting file: {0}",
|
|
std::string);
|
|
emitter.Emit(filename, ErrorStattingFile, file.getError().message());
|
|
return std::nullopt;
|
|
}
|
|
|
|
// `stat` on a file without a known size gives a size of 0, which causes
|
|
// `llvm::vfs::File::getBuffer` to produce an empty buffer. Use a size of -1
|
|
// in this case so we get the complete file contents.
|
|
bool is_regular_file = status->isRegularFile();
|
|
int64_t size = is_regular_file ? status->getSize() : -1;
|
|
|
|
return MakeFromMemoryBuffer(
|
|
(*file)->getBuffer(filename, size, /*RequiresNullTerminator=*/false),
|
|
filename, is_regular_file, consumer);
|
|
}
|
|
|
|
auto SourceBuffer::MakeFromMemoryBuffer(
|
|
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> buffer,
|
|
llvm::StringRef filename, bool is_regular_file,
|
|
DiagnosticConsumer& consumer) -> std::optional<SourceBuffer> {
|
|
FileDiagnosticEmitter emitter(&consumer);
|
|
|
|
if (buffer.getError()) {
|
|
CARBON_DIAGNOSTIC(ErrorReadingFile, Error, "error reading file: {0}",
|
|
std::string);
|
|
emitter.Emit(filename, ErrorReadingFile, buffer.getError().message());
|
|
return std::nullopt;
|
|
}
|
|
|
|
if (buffer.get()->getBufferSize() >= std::numeric_limits<int32_t>::max()) {
|
|
CARBON_DIAGNOSTIC(FileTooLarge, Error,
|
|
"file is over the 2GiB input limit; size is {0} bytes",
|
|
int64_t);
|
|
emitter.Emit(filename, FileTooLarge, buffer.get()->getBufferSize());
|
|
return std::nullopt;
|
|
}
|
|
|
|
return SourceBuffer(filename.str(), std::move(buffer.get()), is_regular_file);
|
|
}
|
|
|
|
} // namespace Carbon
|