Author: ahatanak
Date: Thu Jul 26 10:51:13 2018
New Revision: 338048
URL: http://llvm.org/viewvc/llvm-project?rev=338048&view=rev
Log:
[Sema][ObjC] Do not propagate the nullability specifier on the receiver
to the result type of a message send if the result type cannot have a
nullability specifier.
Previously, clang would print the following message when the code in
nullability.m was compiled:
"incompatible integer to pointer conversion initializing 'int *' with
an expression of type 'int _Nullable'"
This is wrong as 'int' isn't supposed to have any nullability
specifiers.
rdar://problem/40830514
Modified:
cfe/trunk/lib/Sema/SemaExprObjC.cpp
cfe/trunk/test/SemaObjC/nullability.m
Modified: cfe/trunk/lib/Sema/SemaExprObjC.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprObjC.cpp?rev=338048&r1=338047&r2=338048&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprObjC.cpp Thu Jul 26 10:51:13 2018
@@ -1357,6 +1357,11 @@ QualType Sema::getMessageSendResultType(
if (isClassMessage)
return resultType;
+ // There is nothing left to do if the result type cannot have a nullability
+ // specifier.
+ if (!resultType->canHaveNullability())
+ return resultType;
+
// Map the nullability of the result into a table index.
unsigned receiverNullabilityIdx = 0;
if (auto nullability = ReceiverType->getNullability(Context))
Modified: cfe/trunk/test/SemaObjC/nullability.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/nullability.m?rev=338048&r1=338047&r2=338048&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/nullability.m (original)
+++ cfe/trunk/test/SemaObjC/nullability.m Thu Jul 26 10:51:13 2018
@@ -279,3 +279,14 @@ void test(ArraysInMethods *obj) {
[obj simpleSugar:0]; // expected-warning {{null passed to a callee that
requires a non-null argument}}
[obj sugarWithTypedef:0]; // expected-warning {{null passed to a callee that
requires a non-null argument}}
}
+
+// Check that we don't propagate the nullability specifier on the receiver to
+// the result type of a message send if the result type cannot have a
+// nullability specifier.
+@interface C0
+-(int) count;
+@end
+
+void testMessageSendResultType(C0 * _Nullable c0) {
+ int *p = [c0 count]; // expected-warning {{incompatible integer to pointer
conversion initializing 'int *' with an expression of type 'int'}}
+}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
