aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-12-11 21:23:13 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-12-11 21:23:13 +0000
commit1f7711d1131f147a2317be0a860041c6e25c69a1 (patch)
tree2e7372aceb1d9293b3fbe9c32478ecaa1edec0b4
parent20e098b7e7fda6bed1d67441b56cce77cd3aa918 (diff)
Consider conversion of objective-c pointer to 'bool' a
valid standard conversion to match g++'s behaviour. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91157 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Sema/SemaOverload.cpp2
-rw-r--r--test/SemaObjCXX/standard-conversion-to-bool.mm12
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index 522272ee7c..e498c71b9b 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -674,7 +674,7 @@ Sema::IsStandardConversion(Expr* From, QualType ToType,
} else if (ToType->isBooleanType() &&
(FromType->isArithmeticType() ||
FromType->isEnumeralType() ||
- FromType->isPointerType() ||
+ FromType->isAnyPointerType() ||
FromType->isBlockPointerType() ||
FromType->isMemberPointerType() ||
FromType->isNullPtrType())) {
diff --git a/test/SemaObjCXX/standard-conversion-to-bool.mm b/test/SemaObjCXX/standard-conversion-to-bool.mm
new file mode 100644
index 0000000000..d1e212cf6d
--- /dev/null
+++ b/test/SemaObjCXX/standard-conversion-to-bool.mm
@@ -0,0 +1,12 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+@class NSString;
+id a;
+NSString *b;
+
+void f() {
+ bool b1 = a;
+ bool b2 = b;
+}
+
+