summaryrefslogtreecommitdiff
path: root/lib/Sema
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2015-06-19 20:00:10 +0000
committerDouglas Gregor <dgregor@apple.com>2015-06-19 20:00:10 +0000
commiteb4df0a70bd96c8fe05121a693a65b951e16047c (patch)
treeeb5d5aa7edf44d2bf3790d9d94082cb147d8704e /lib/Sema
parent340eaaf2d3843be9dbf3664b9cca6aaad0c22f2b (diff)
downloadclang-eb4df0a70bd96c8fe05121a693a65b951e16047c.tar.gz
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
Diffstat (limited to 'lib/Sema')
-rw-r--r--lib/Sema/SemaType.cpp3
1 files changed, 2 insertions, 1 deletions
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>()) {