Skip to content
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

Refactoring around vector type recognition #694

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactoring around vector type recognition #694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0feb8f3
ast-exporter: Refactor recognition of vector types
chrysn Sep 28, 2022
dfb2b10
ast-exporter: Work around failing type inference in old LLVM versions
chrysn Sep 28, 2022
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: 17 additions & 6 deletions c2rust-ast-exporter/src/AstExporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,21 @@ class TypeEncoder final : public TypeVisitor<TypeEncoder> {
auto kind = T->getKind();

#if CLANG_VERSION_MAJOR >= 10
// Handle built-in vector types as if they're normal vector types
if (kind >= BuiltinType::SveInt8 && kind <= BuiltinType::SveBool
// Recognize ARM vector types
const bool is_sve = kind >= BuiltinType::SveInt8 && kind <= BuiltinType::SveBool;
#else
const bool is_sve = false;
#endif // CLANG_VERSION_MAJOR >= 10

#if CLANG_VERSION_MAJOR >= 13
/* RISC-V vector types */
|| kind >= BuiltinType::RvvInt8mf8 && kind <= BuiltinType::RvvBool64
// Recognize RISC-V vector types
const bool is_rvv = kind >= BuiltinType::RvvInt8mf8 && kind <= BuiltinType::RvvBool64;
#else
const bool is_rvv = false;
#endif // CLANG_VERSION_MAJOR >= 13
) {

// Handle built-in vector types as if they're normal vector types
if (is_sve || is_rvv) {
// Declare ElemType and ElemCount as needed by various Clang versions
#if CLANG_VERSION_MAJOR >= 11
auto Info = Context->getBuiltinVectorTypeInfo(T);
Expand All @@ -345,6 +353,7 @@ class TypeEncoder final : public TypeVisitor<TypeEncoder> {
// Copy-pasted from Type::getSveEltType introduced after Clang 10:
// (Not extended for RISCV types
// as they are not available in that version anyway).
#if CLANG_VERSION_MAJOR >= 10
auto ElemType = [&] {
switch (kind) {
default: llvm_unreachable("Unknown builtin SVE type!");
Expand All @@ -366,6 +375,9 @@ class TypeEncoder final : public TypeVisitor<TypeEncoder> {
// (see `AArch64SVEACLETypes.def`), so we can divide 128
// by their element size to get element count.
auto ElemCount = 128 / Context->getTypeSize(ElemType);
#else
llvm_unreachable("LLVM version does not have any vector types");
#endif // CLANG_VERSION_MAJOR >= 10
#endif // CLANG_VERSION_MAJOR >= 11
auto ElemTypeTag = encodeQualType(ElemType);
encodeType(T, TagVectorType,
Expand All @@ -377,7 +389,6 @@ class TypeEncoder final : public TypeVisitor<TypeEncoder> {
VisitQualType(ElemType);
return;
}
#endif // CLANG_VERSION_MAJOR >= 10

const TypeTag tag = [&] {
switch (kind) {
Expand Down