diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-08-15 11:27:21 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-08-15 11:27:21 +0000 |
| commit | 10c469f2ae76868106ec8bc8fbac13e0f26552f7 (patch) | |
| tree | 6ad8fc0154f570293f293f07a106e5a91061732e /clang/lib/Serialization/ASTReaderDecl.cpp | |
| parent | 899468a0006db4146d9b229234a183f499f7bcd2 (diff) | |
Vendor import of llvm-project branch release/11.xvendor/llvm-project/llvmorg-11.0.0-rc1-47-gff47911ddfc
llvmorg-11.0.0-rc1-47-gff47911ddfc.
Notes
svn path=/vendor/llvm-project/release-11.x/; revision=364248
svn path=/vendor/llvm-project/llvmorg-11.0.0-rc1-47-gff47911ddfc/; revision=364249; tag=vendor/llvm-project/llvmorg-11.0.0-rc1-47-gff47911ddfc
Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index eef4ab16ec15..117eb598bd5e 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -2912,9 +2912,11 @@ static bool isSameTemplateParameter(const NamedDecl *X, return false; if (TX->hasTypeConstraint() != TY->hasTypeConstraint()) return false; - if (TX->hasTypeConstraint()) { - const TypeConstraint *TXTC = TX->getTypeConstraint(); - const TypeConstraint *TYTC = TY->getTypeConstraint(); + const TypeConstraint *TXTC = TX->getTypeConstraint(); + const TypeConstraint *TYTC = TY->getTypeConstraint(); + if (!TXTC != !TYTC) + return false; + if (TXTC && TYTC) { if (TXTC->getNamedConcept() != TYTC->getNamedConcept()) return false; if (TXTC->hasExplicitTemplateArgs() != TYTC->hasExplicitTemplateArgs()) |