Merge `TypeMapper` back into `Importer` - part 4/N: `ConvertQualType`.
This CL is one of steps toward merging `TypeMapper` back into
`Importer`. The merge is:
- possible (after https://github.com/google/crubit/commit/16a5610d96eda5720bb57b5f927b00f00635ddf0 which means that there is only 1 instance
of `TypeMapper`, because `ImportFields` doesn't anymore need to
temporarily assume that the containing record can be imported),
- desirable (to support b/228868369 we need to let `ConvertType` call
into `Importer::ConvertTemplateSpecializationType`).
This CL moves the `TypeMapper::ConvertQualType` method into a method of
`Importer`. This requires also moving `ConvertType` and
`ConvertTypeDecl` methods.
PiperOrigin-RevId: 451510529
diff --git a/rs_bindings_from_cc/importer.h b/rs_bindings_from_cc/importer.h
index 0cb2365..d4a182a 100644
--- a/rs_bindings_from_cc/importer.h
+++ b/rs_bindings_from_cc/importer.h
@@ -73,6 +73,10 @@
llvm::Optional<std::string> GetComment(
const clang::Decl* decl) const override;
SourceLoc ConvertSourceLocation(clang::SourceLocation loc) const override;
+ absl::StatusOr<MappedType> ConvertQualType(
+ clang::QualType qual_type,
+ std::optional<clang::tidy::lifetimes::ValueLifetimes>& lifetimes,
+ bool nullable = true) const override;
absl::StatusOr<MappedType> ConvertTemplateSpecializationType(
const clang::TemplateSpecializationType* type) override;
void MarkAsSuccessfullyImported(const clang::TypeDecl* decl) override;
@@ -95,6 +99,12 @@
// Stores the comments of this target in source order.
void ImportFreeComments();
+ absl::StatusOr<MappedType> ConvertType(
+ const clang::Type* type,
+ std::optional<clang::tidy::lifetimes::ValueLifetimes>& lifetimes,
+ bool nullable) const;
+ absl::StatusOr<MappedType> ConvertTypeDecl(const clang::TypeDecl* decl) const;
+
std::vector<std::unique_ptr<DeclImporter>> decl_importers_;
std::unique_ptr<clang::MangleContext> mangler_;
absl::flat_hash_map<const clang::Decl*, std::optional<IR::Item>>
