Skip to content

[Carbon/C++ interop] Add support for C++ type short #5393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 9, 2025
Merged

[Carbon/C++ interop] Add support for C++ type short #5393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
446e0f4
Add support for C++ type short
ivanaivanovska Apr 30, 2025
72045c0
Apply review comments
ivanaivanovska May 5, 2025
c49d2fe
Address new review comments, add more tests
ivanaivanovska May 6, 2025
acf0d7f
Address nit comments
ivanaivanovska May 7, 2025
8220d6c
Fix link to int16_t definition
ivanaivanovska May 8, 2025
e081c1d
Merge remote-tracking branch 'origin/trunk' into add_short_support
ivanaivanovska May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions toolchain/check/import_cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,28 @@ static auto MakeIntType(Context& context, IntId size_id) -> TypeExpr {
return ExprAsType(context, Parse::NodeId::None, type_inst_id);
}

// Maps a C++ type to a Carbon type. Currently only 32-bit `int` is supported.
// Maps a C++ type to a Carbon type.
// TODO: Support more types.
static auto MapType(Context& context, clang::QualType type) -> TypeExpr {
const auto* builtin_type = dyn_cast<clang::BuiltinType>(type);
if (builtin_type && builtin_type->getKind() == clang::BuiltinType::Int &&
context.ast_context().getTypeSize(type) == 32) {
return MakeIntType(context, context.ints().Add(32));
if (!builtin_type) {
return {.inst_id = SemIR::ErrorInst::TypeInstId,
.type_id = SemIR::ErrorInst::TypeId};
}
// TODO: Refactor to avoid duplication.
switch (builtin_type->getKind()) {
case clang::BuiltinType::Short:
if (context.ast_context().getTypeSize(type) == 16) {
return MakeIntType(context, context.ints().Add(16));
}
break;
case clang::BuiltinType::Int:
if (context.ast_context().getTypeSize(type) == 32) {
return MakeIntType(context, context.ints().Add(32));
}
break;
default:
break;
}
return {.inst_id = SemIR::ErrorInst::TypeInstId,
.type_id = SemIR::ErrorInst::TypeId};
Expand Down
Loading
Loading