commit e54d9525ad594a0084f003244ad56982c412c4b0
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Oct 09 18:49:22 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Oct 09 18:49:22 2018 +0000
tree 6f9f9c0089d94dc180aba94f5a8f1cf142ffc4ba
parent 81abca32fba4d8eb537c4ac4445e0175309b9fc8

PR39231: fix null dereference when diagnosing deduction failure due to
conflicting values for a non-type pack.

llvm-svn: 344070

clang/lib/Sema/SemaOverload.cpp

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index f4ec04a..a5a51d5 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -9984,7 +9984,7 @@
           DeductionFailure.getFirstArg()->getNonTypeTemplateArgumentType();
       QualType T2 =
           DeductionFailure.getSecondArg()->getNonTypeTemplateArgumentType();
-      if (!S.Context.hasSameType(T1, T2)) {
+      if (!T1.isNull() && !T2.isNull() && !S.Context.hasSameType(T1, T2)) {
         S.Diag(Templated->getLocation(),
                diag::note_ovl_candidate_inconsistent_deduction_types)
           << ParamD->getDeclName() << *DeductionFailure.getFirstArg() << T1