maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix missing qualifier in template type diffing 

Handle SubstTemplateTypeParmType so qualifiers do not get dropped from
the diagnostic message.
This commit is contained in:
Weverything 2021-08-16 16:54:10 -07:00
parent 4c4ab673f1
commit c411c1bd7f
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/AST/ASTDiagnostic.cpp
View File

@ -1088,6 +1088,9 @@ class TemplateDiff {
Ty->getAs<TemplateSpecializationType>()) Ty->getAs<TemplateSpecializationType>())
return TST; return TST;
if (const auto* SubstType = Ty->getAs<SubstTemplateTypeParmType>())
Ty = SubstType->getReplacementType();
const RecordType *RT = Ty->getAs<RecordType>(); const RecordType *RT = Ty->getAs<RecordType>();
if (!RT) if (!RT)

37
clang/test/Misc/diag-template-diffing.cpp
View File

@ -1488,6 +1488,43 @@ void run(A_reg<float> reg, A_ptr<float> ptr, A_ref<float> ref) {
} }
} }
namespace SubstTemplateTypeParmType {
template <typename T>
class Array {
};
template <class T>
class S{};
template <class T, int num>
Array<T> Make(T (&parameter)[num]);
void Run(int, Array<S<int>>) {}
Array<const S<int>> Make();
void Call() {
const S<int> s1[5];
S<int> s2[5];
Run(0, Make(s1)); // Error
Run(0, Make(s2)); // Okay
}
// CHECK-ELIDE-NOTREE: no matching function for call to 'Run'
// CHECK-ELIDE-NOTREE: no known conversion from 'Array<const S<...>>' to 'Array<S<...>>' for 2nd argument
// CHECK-NOELIDE-NOTREE: no matching function for call to 'Run'
// CHECK-NOELIDE-NOTREE: no known conversion from 'Array<const S<int>>' to 'Array<S<int>>' for 2nd argument
// CHECK-ELIDE-TREE: no matching function for call to 'Run'
// CHECK-ELIDE-TREE: no known conversion from argument type to parameter type for 2nd argument
// CHECK-ELIDE-TREE: Array<
// CHECK-ELIDE-TREE: [const != (no qualifiers)] S<...>>
// CHECK-NOELIDE-TREE: no matching function for call to 'Run'
// CHECK-NOELIDE-TREE: no known conversion from argument type to parameter type for 2nd argument
// CHECK-NOELIDE-TREE: Array<
// CHECK-NOELIDE-TREE: [const != (no qualifiers)] S<
// CHECK-NOELIDE-TREE: int>>
}
// CHECK-ELIDE-NOTREE: {{[0-9]*}} errors generated. // CHECK-ELIDE-NOTREE: {{[0-9]*}} errors generated.
// CHECK-NOELIDE-NOTREE: {{[0-9]*}} errors generated. // CHECK-NOELIDE-NOTREE: {{[0-9]*}} errors generated.
// CHECK-ELIDE-TREE: {{[0-9]*}} errors generated. // CHECK-ELIDE-TREE: {{[0-9]*}} errors generated.