From: Douglas Gregor <dgregor@apple.com>
Date: Fri, 19 Jun 2015 20:00:10 +0000 (+0000)
Subject: Fix a use of err_nullability_conflicting that's triggering an assertion.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb4df0a70bd96c8fe05121a693a65b951e16047c;p=clang

Fix a use of err_nullability_conflicting that's triggering an assertion.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@240171 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 234e72244f..d3b773e535 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -5072,7 +5072,8 @@ bool Sema::checkNullabilityTypeSpecifier(QualType &type,
       Diag(nullabilityLoc, diag::err_nullability_conflicting)
         << static_cast<unsigned>(nullability)
         << isContextSensitive
-        << static_cast<unsigned>(*existingNullability);
+        << static_cast<unsigned>(*existingNullability)
+        << false;
 
       // Try to find the typedef with the existing nullability specifier.
       if (auto typedefType = desugared->getAs<TypedefType>()) {