caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check against subst failure ouside of imm context (#206)

Browse Source 
Signed-off-by: zebullax <zebullax@gmail.com>
This commit is contained in:
zebullax
2025-11-11 11:24:11 +09:00
committed by GitHub
parent d34e5cd278
commit 4fd4f57ef9
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clang/lib/AST/ExprConstantMeta.cpp
View File

@@ -2985,17 +2985,21 @@ bool substitute(APValue &Result, ASTContext &C, MetaActions &Meta,
const_cast<Type *>(TSpecDecl->getTypeForDecl())); const_cast<Type *>(TSpecDecl->getTypeForDecl()));
//C.recordCachedSubstitution(SubstitutionHash, RV); //C.recordCachedSubstitution(SubstitutionHash, RV);
return SetAndSucceed(Result, RV); return SetAndSucceed(Result, RV);
} else if (auto *TATD = dyn_cast<TypeAliasTemplateDecl>(TDecl)) { }
if (auto *TATD = dyn_cast<TypeAliasTemplateDecl>(TDecl)) {
TArgs.clear(); TArgs.clear();
expandTemplateArgPacks(ExpandedTArgs, TArgs); expandTemplateArgPacks(ExpandedTArgs, TArgs);
QualType QT = Meta.Substitute(TATD, TArgs, Range.getBegin()); QualType QT = Meta.Substitute(TATD, TArgs, Range.getBegin());
assert(!QT.isNull() && "substitution failed after validating arguments?"); if(QT.isNull()) {
// substitution failed after validating arguments
return true;
}
APValue RV = makeReflection(QT); APValue RV = makeReflection(QT);
//C.recordCachedSubstitution(SubstitutionHash, RV); //C.recordCachedSubstitution(SubstitutionHash, RV);
return SetAndSucceed(Result, makeReflection(QT)); return SetAndSucceed(Result, makeReflection(QT));
} else if (auto *FTD = dyn_cast<FunctionTemplateDecl>(TDecl)) { }
if (auto *FTD = dyn_cast<FunctionTemplateDecl>(TDecl)) {
FunctionDecl *Spec = Meta.Substitute(FTD, ExpandedTArgs, Range.getBegin()); FunctionDecl *Spec = Meta.Substitute(FTD, ExpandedTArgs, Range.getBegin());
assert(Spec && "substitution failed after validating arguments?"); assert(Spec && "substitution failed after validating arguments?");
@@ -3007,7 +3011,8 @@ bool substitute(APValue &Result, ASTContext &C, MetaActions &Meta,
APValue RV = makeReflection(Spec); APValue RV = makeReflection(Spec);
//C.recordCachedSubstitution(SubstitutionHash, RV); //C.recordCachedSubstitution(SubstitutionHash, RV);
return SetAndSucceed(Result, RV); return SetAndSucceed(Result, RV);
} else if (auto *VTD = dyn_cast<VarTemplateDecl>(TDecl)) { }
if (auto *VTD = dyn_cast<VarTemplateDecl>(TDecl)) {
TArgs.clear(); TArgs.clear();
expandTemplateArgPacks(ExpandedTArgs, TArgs); expandTemplateArgPacks(ExpandedTArgs, TArgs);
@@ -3017,7 +3022,8 @@ bool substitute(APValue &Result, ASTContext &C, MetaActions &Meta,
APValue RV = makeReflection(Spec); APValue RV = makeReflection(Spec);
//C.recordCachedSubstitution(SubstitutionHash, RV); //C.recordCachedSubstitution(SubstitutionHash, RV);
return SetAndSucceed(Result, makeReflection(Spec)); return SetAndSucceed(Result, makeReflection(Spec));
} else if (auto *CD = dyn_cast<ConceptDecl>(TDecl)) { }
if (auto *CD = dyn_cast<ConceptDecl>(TDecl)) {
TArgs.clear(); TArgs.clear();
expandTemplateArgPacks(ExpandedTArgs, TArgs); expandTemplateArgPacks(ExpandedTArgs, TArgs);