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

[Douglas Gregor]

Author: dgregor
Date: Fri Jun 19 15:00:10 2015
New Revision: 240171

URL: http://llvm.org/viewvc/llvm-project?rev=240171&view=rev
Log:
Fix a use of err_nullability_conflicting that's triggering an assertion.

Modified:
    cfe/trunk/lib/Sema/SemaType.cpp

Modified: cfe/trunk/lib/Sema/SemaType.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=240171&r1=240170&r2=240171&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaType.cpp (original)
+++ cfe/trunk/lib/Sema/SemaType.cpp Fri Jun 19 15:00:10 2015
@@ -5072,7 +5072,8 @@ bool Sema::checkNullabilityTypeSpecifier
       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>()) {