replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a crash in diagnostic printing when a template class type is diff'ed 

against itself. PR14489.

llvm-svn: 170474
This commit is contained in:
Eli Friedman 2012-12-18 23:32:47 +00:00
parent d742533dbc
commit 40ea264c25
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1125,7 +1125,12 @@ class TemplateDiff {
TemplateDecl *FromTD, *ToTD; TemplateDecl *FromTD, *ToTD;
Tree.GetNode(FromTD, ToTD); Tree.GetNode(FromTD, ToTD);
assert(Tree.HasChildren() && "Template difference not found in diff tree."); if (!Tree.HasChildren()) {
// If we're dealing with a template specialization with zero
// arguments, there are no children; special-case this.
OS << FromTD->getNameAsString() << "<>";
return;
}
Qualifiers FromQual, ToQual; Qualifiers FromQual, ToQual;
Tree.GetNode(FromQual, ToQual); Tree.GetNode(FromQual, ToQual);

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

@ -800,6 +800,18 @@ namespace PR14342 {
// CHECK-ELIDE-NOTREE: error: no viable conversion from 'X<[...], 2>' to 'X<[...], 3UL>' // CHECK-ELIDE-NOTREE: error: no viable conversion from 'X<[...], 2>' to 'X<[...], 3UL>'
} }
namespace PR14489 {
// The important thing here is that the diagnostic diffs a template specialization
// with no arguments against itself. (We might need a different test if this
// diagnostic changes).
template<class ...V>
struct VariableList {
void ConnectAllToAll(VariableList<>& params = VariableList<>()) {
}
};
// CHECK-ELIDE-NOTREE: non-const lvalue reference to type 'VariableList<>' cannot bind to a temporary of type 'VariableList<>'
}
// 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.