Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-08-17 20:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt llvmorg-22-init-3166-g91cdd35008e9: getOriginalDecl

Browse Source
This commit is contained in:
Fangrui Song 2025-08-14 21:57:26 -07:00
parent 2b6d3753f7
commit 536033c204
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/indexer.cc
View File

@ -333,7 +333,11 @@ try_again:
break; break;
case Type::Record: case Type::Record:
case Type::Enum: case Type::Enum:
#if LLVM_VERSION_MAJOR >= 22 // llvmorg-22-init-3166-g91cdd35008e9
d = cast<TagType>(tp)->getOriginalDecl();
#else
d = cast<TagType>(tp)->getDecl(); d = cast<TagType>(tp)->getDecl();
#endif
break; break;
case Type::TemplateTypeParm: case Type::TemplateTypeParm:
d = cast<TemplateTypeParmType>(tp)->getDecl(); d = cast<TemplateTypeParmType>(tp)->getDecl();
@ -341,10 +345,15 @@ try_again:
case Type::TemplateSpecialization: case Type::TemplateSpecialization:
if (specialization) if (specialization)
*specialization = true; *specialization = true;
if (const RecordType *record = tp->getAs<RecordType>()) if (const RecordType *record = tp->getAs<RecordType>()) {
#if LLVM_VERSION_MAJOR >= 22 // llvmorg-22-init-3166-g91cdd35008e9
d = record->getOriginalDecl();
#else
d = record->getDecl(); d = record->getDecl();
else #endif
} else {
d = cast<TemplateSpecializationType>(tp)->getTemplateName().getAsTemplateDecl(); d = cast<TemplateSpecializationType>(tp)->getTemplateName().getAsTemplateDecl();
}
break; break;
case Type::Auto: case Type::Auto:
@ -355,14 +364,20 @@ try_again:
break; break;
case Type::InjectedClassName: case Type::InjectedClassName:
#if LLVM_VERSION_MAJOR >= 22 // llvmorg-22-init-3166-g91cdd35008e9
d = cast<InjectedClassNameType>(tp)->getOriginalDecl();
#else
d = cast<InjectedClassNameType>(tp)->getDecl(); d = cast<InjectedClassNameType>(tp)->getDecl();
#endif
break; break;
// FIXME: Template type parameters! // FIXME: Template type parameters!
#if LLVM_VERSION_MAJOR < 22 // llvmorg-22-init-3166-g91cdd35008e9
case Type::Elaborated: case Type::Elaborated:
tp = cast<ElaboratedType>(tp)->getNamedType().getTypePtrOrNull(); tp = cast<ElaboratedType>(tp)->getNamedType().getTypePtrOrNull();
goto try_again; goto try_again;
#endif
default: default:
break; break;
@ -411,7 +426,11 @@ bool validateRecord(const RecordDecl *rd) {
if (fqt->isIncompleteType() || fqt->isDependentType()) if (fqt->isIncompleteType() || fqt->isDependentType())
return false; return false;
if (const RecordType *childType = i->getType()->getAs<RecordType>()) if (const RecordType *childType = i->getType()->getAs<RecordType>())
#if LLVM_VERSION_MAJOR >= 22 // llvmorg-22-init-3166-g91cdd35008e9
if (const RecordDecl *child = childType->getOriginalDecl())
#else
if (const RecordDecl *child = childType->getDecl()) if (const RecordDecl *child = childType->getDecl())
#endif
if (!validateRecord(child)) if (!validateRecord(child))
return false; return false;
} }
@ -685,7 +704,11 @@ public:
if (fd->getIdentifier()) if (fd->getIdentifier())
type.def.vars.emplace_back(getUsr(fd), offset1); type.def.vars.emplace_back(getUsr(fd), offset1);
else if (const auto *rt1 = fd->getType()->getAs<RecordType>()) { else if (const auto *rt1 = fd->getType()->getAs<RecordType>()) {
#if LLVM_VERSION_MAJOR >= 22 // llvmorg-22-init-3166-g91cdd35008e9
if (const RecordDecl *rd1 = rt1->getOriginalDecl())
#else
if (const RecordDecl *rd1 = rt1->getDecl()) if (const RecordDecl *rd1 = rt1->getDecl())
#endif
if (seen.insert(rd1).second) if (seen.insert(rd1).second)
stack.push_back({rd1, offset1}); stack.push_back({rd1, offset1});
} }