mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 17:21:04 +01:00
Generate Cpp namespace when import Cpp is used (#4873)
Also defined a dedicated `ImportCppDecl` `InstKind`. Part of #4666
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include "toolchain/check/import_cpp.h"
|
||||
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
|
||||
#include "clang/Frontend/TextDiagnosticPrinter.h"
|
||||
@@ -15,35 +16,39 @@
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "toolchain/check/context.h"
|
||||
#include "toolchain/check/diagnostic_helpers.h"
|
||||
#include "toolchain/check/import.h"
|
||||
#include "toolchain/diagnostics/diagnostic.h"
|
||||
#include "toolchain/diagnostics/format_providers.h"
|
||||
#include "toolchain/sem_ir/name_scope.h"
|
||||
|
||||
namespace Carbon::Check {
|
||||
|
||||
// Generates C++ file contents to #include all requested imports.
|
||||
static auto GenerateCppIncludesHeaderCode(
|
||||
llvm::ArrayRef<std::pair<llvm::StringRef, SemIRLoc>> imports)
|
||||
Context& context, llvm::ArrayRef<Parse::Tree::PackagingNames> imports)
|
||||
-> std::string {
|
||||
std::string code;
|
||||
llvm::raw_string_ostream code_stream(code);
|
||||
for (const auto& [path, _] : imports) {
|
||||
code_stream << "#include \"" << FormatEscaped(path) << "\"\n";
|
||||
for (const Parse::Tree::PackagingNames& import : imports) {
|
||||
code_stream << "#include \""
|
||||
<< FormatEscaped(
|
||||
context.string_literal_values().Get(import.library_id))
|
||||
<< "\"\n";
|
||||
}
|
||||
return code;
|
||||
}
|
||||
|
||||
auto ImportCppFiles(
|
||||
Context& context, llvm::StringRef importing_file_path,
|
||||
llvm::ArrayRef<std::pair<llvm::StringRef, SemIRLoc>> imports,
|
||||
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> fs) -> void {
|
||||
size_t num_imports = imports.size();
|
||||
if (num_imports == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Returns an AST for the C++ imports and a bool that represents whether
|
||||
// compilation errors where encountered or the generated AST is null due to an
|
||||
// error.
|
||||
// TODO: Consider to always have a (non-null) AST.
|
||||
static auto GenerateAst(Context& context, llvm::StringRef importing_file_path,
|
||||
llvm::ArrayRef<Parse::Tree::PackagingNames> imports,
|
||||
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> fs)
|
||||
-> std::pair<std::unique_ptr<clang::ASTUnit>, bool> {
|
||||
// TODO: Use all import locations by referring each Clang diagnostic to the
|
||||
// relevant import.
|
||||
SemIRLoc loc = imports.back().second;
|
||||
SemIRLoc loc = imports.back().node_id;
|
||||
|
||||
std::string diagnostics_str;
|
||||
llvm::raw_string_ostream diagnostics_stream(diagnostics_str);
|
||||
@@ -54,7 +59,7 @@ auto ImportCppFiles(
|
||||
diagnostic_options.get());
|
||||
// TODO: Share compilation flags with ClangRunner.
|
||||
auto ast = clang::tooling::buildASTFromCodeWithArgs(
|
||||
GenerateCppIncludesHeaderCode(imports), {},
|
||||
GenerateCppIncludesHeaderCode(context, imports), {},
|
||||
(importing_file_path + ".generated.cpp_imports.h").str(), "clang-tool",
|
||||
std::make_shared<clang::PCHContainerOperations>(),
|
||||
clang::tooling::getClangStripDependencyFileAdjuster(),
|
||||
@@ -62,6 +67,7 @@ auto ImportCppFiles(
|
||||
// TODO: Implement and use a DynamicRecursiveASTVisitor to traverse the AST.
|
||||
int num_errors = diagnostics_consumer.getNumErrors();
|
||||
int num_warnings = diagnostics_consumer.getNumWarnings();
|
||||
int num_imports = imports.size();
|
||||
if (num_errors > 0) {
|
||||
// TODO: Remove the warnings part when there are no warnings.
|
||||
CARBON_DIAGNOSTIC(
|
||||
@@ -77,6 +83,56 @@ auto ImportCppFiles(
|
||||
context.emitter().Emit(loc, CppInteropParseWarning, num_warnings,
|
||||
num_imports, diagnostics_str);
|
||||
}
|
||||
return {std::move(ast), !ast || num_errors > 0};
|
||||
}
|
||||
|
||||
// Adds a namespace for the `Cpp` import and returns its `NameScopeId`.
|
||||
static auto AddNamespace(Context& context, PackageNameId cpp_package_id,
|
||||
llvm::ArrayRef<Parse::Tree::PackagingNames> imports)
|
||||
-> SemIR::NameScopeId {
|
||||
auto& import_cpps = context.sem_ir().import_cpps();
|
||||
import_cpps.Reserve(imports.size());
|
||||
for (const Parse::Tree::PackagingNames& import : imports) {
|
||||
import_cpps.Add(
|
||||
{.node_id = import.node_id, .library_id = import.library_id});
|
||||
}
|
||||
|
||||
return AddImportNamespace(
|
||||
context,
|
||||
context.GetSingletonType(SemIR::NamespaceType::SingletonInstId),
|
||||
SemIR::NameId::ForPackageName(cpp_package_id),
|
||||
SemIR::NameScopeId::Package,
|
||||
/*diagnose_duplicate_namespace=*/false,
|
||||
[&]() {
|
||||
return context.AddInst<SemIR::ImportCppDecl>(
|
||||
imports.front().node_id, {});
|
||||
})
|
||||
.name_scope_id;
|
||||
}
|
||||
|
||||
auto ImportCppFiles(Context& context, llvm::StringRef importing_file_path,
|
||||
llvm::ArrayRef<Parse::Tree::PackagingNames> imports,
|
||||
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> fs)
|
||||
-> void {
|
||||
if (imports.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto [ast, ast_has_error] =
|
||||
GenerateAst(context, importing_file_path, imports, fs);
|
||||
|
||||
PackageNameId package_id = imports.front().package_id;
|
||||
CARBON_CHECK(
|
||||
llvm::all_of(imports, [&](const Parse::Tree::PackagingNames& import) {
|
||||
return import.package_id == package_id;
|
||||
}));
|
||||
auto name_scope_id = AddNamespace(context, package_id, imports);
|
||||
SemIR::NameScope& name_scope = context.name_scopes().Get(name_scope_id);
|
||||
name_scope.set_is_closed_import(true);
|
||||
|
||||
if (ast_has_error) {
|
||||
name_scope.set_has_error();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Carbon::Check
|
||||
|
||||
Reference in New Issue
Block a user