summaryrefslogtreecommitdiffstats
path: root/clang/lib
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
commitc62e0433555208062010ce698610c41160bcd5f0 (patch)
treeb0b7422595bbb98bfe8c29f96de09b800b45019c /clang/lib
parent907880edd917ea32524c7cc91b03495b6beb2ba3 (diff)
downloadbcm5719-llvm-c62e0433555208062010ce698610c41160bcd5f0.tar.gz
bcm5719-llvm-c62e0433555208062010ce698610c41160bcd5f0.zip
Fix a use of err_nullability_conflicting that's triggering an assertion.
llvm-svn: 240171
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaType.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp
index 234e72244f5..d3b773e5350 100644
--- a/clang/lib/Sema/SemaType.cpp
+++ b/clang/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>()) {
OpenPOWER on IntegriCloud