mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 06:41:04 +01:00
Add support for compiling multiple files at once. (#3182)
Rearranges driver logic into CompilationUnits in order to associate artifacts from the various stages of compilation. Note, I'm not totally sure what the right thing to do is for lower/codegen, so I'm just doing a rote change there for now that mirrors prior phases (this is all the code supports anyways, so is probably right for now regardless). SourceBuffer error output is moved local for consistency with other steps, and so that it's less ambiguous whether the error should be expected to already include a filename.
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "common/check.h"
|
||||
#include "llvm/Support/VirtualFileSystem.h"
|
||||
|
||||
namespace Carbon::Testing {
|
||||
@@ -15,8 +16,8 @@ static constexpr llvm::StringLiteral TestFileName = "test.carbon";
|
||||
|
||||
TEST(SourceBufferTest, MissingFile) {
|
||||
llvm::vfs::InMemoryFileSystem fs;
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
|
||||
EXPECT_FALSE(buffer.ok());
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
|
||||
EXPECT_FALSE(buffer);
|
||||
}
|
||||
|
||||
TEST(SourceBufferTest, SimpleFile) {
|
||||
@@ -24,8 +25,8 @@ TEST(SourceBufferTest, SimpleFile) {
|
||||
CARBON_CHECK(fs.addFile(TestFileName, /*ModificationTime=*/0,
|
||||
llvm::MemoryBuffer::getMemBuffer("Hello World")));
|
||||
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
|
||||
ASSERT_TRUE(buffer.ok()) << "Error message: " << buffer.error();
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
|
||||
ASSERT_TRUE(buffer);
|
||||
|
||||
EXPECT_EQ(TestFileName, buffer->filename());
|
||||
EXPECT_EQ("Hello World", buffer->text());
|
||||
@@ -40,8 +41,8 @@ TEST(SourceBufferTest, NoNull) {
|
||||
/*BufferName=*/"",
|
||||
/*RequiresNullTerminator=*/false)));
|
||||
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
|
||||
ASSERT_TRUE(buffer.ok()) << "Error message: " << buffer.error();
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
|
||||
ASSERT_TRUE(buffer);
|
||||
|
||||
EXPECT_EQ(TestFileName, buffer->filename());
|
||||
EXPECT_EQ("abc", buffer->text());
|
||||
@@ -52,8 +53,8 @@ TEST(SourceBufferTest, EmptyFile) {
|
||||
CARBON_CHECK(fs.addFile(TestFileName, /*ModificationTime=*/0,
|
||||
llvm::MemoryBuffer::getMemBuffer("")));
|
||||
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName);
|
||||
ASSERT_TRUE(buffer.ok()) << "Error message: " << buffer.error();
|
||||
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
|
||||
ASSERT_TRUE(buffer);
|
||||
|
||||
EXPECT_EQ(TestFileName, buffer->filename());
|
||||
EXPECT_EQ("", buffer->text());
|
||||
|
||||
Reference in New Issue
Block a user