projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
907880e
)
Fix a use of err_nullability_conflicting that's triggering an assertion.
author
Douglas Gregor
<dgregor@apple.com>
Fri, 19 Jun 2015 20:00:10 +0000
(20:00 +0000)
committer
Douglas Gregor
<dgregor@apple.com>
Fri, 19 Jun 2015 20:00:10 +0000
(20:00 +0000)
llvm-svn: 240171
clang/lib/Sema/SemaType.cpp
patch
|
blob
|
history
diff --git
a/clang/lib/Sema/SemaType.cpp
b/clang/lib/Sema/SemaType.cpp
index
234e722
..
d3b773e
100644
(file)
--- 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>()) {