]> granicus.if.org Git - clang/commitdiff
Fix a use of err_nullability_conflicting that's triggering an assertion.
authorDouglas Gregor <dgregor@apple.com>
Fri, 19 Jun 2015 20:00:10 +0000 (20:00 +0000)
committerDouglas Gregor <dgregor@apple.com>
Fri, 19 Jun 2015 20:00:10 +0000 (20:00 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@240171 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaType.cpp

index 234e72244f54f3c21f8005037345199a854b880e..d3b773e53500229b0b6179e66a5a1709852f25b3 100644 (file)
@@ -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>()) {