summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaInit.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-12-07 22:54:16 +0000
committerJohn McCall <rjmccall@apple.com>2010-12-07 22:54:16 +0000
commited75c094019c2f01f3be8e659b97773c4cce1d0c (patch)
treec36b446d9f609813d7fc7778136b34ffb9f50d18 /clang/lib/Sema/SemaInit.cpp
parent210f6ddeccbd3ad2bd3a0754e115e444cdec7c41 (diff)
downloadbcm5719-llvm-ed75c094019c2f01f3be8e659b97773c4cce1d0c.tar.gz
bcm5719-llvm-ed75c094019c2f01f3be8e659b97773c4cce1d0c.zip
Bump up property conversion earlier in the initialization process. Fixes
the failed compile in PR8751. llvm-svn: 121192
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
-rw-r--r--clang/lib/Sema/SemaInit.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 6595927caf8..555166076de 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -3100,6 +3100,10 @@ InitializationSequence::InitializationSequence(Sema &S,
return;
}
+ for (unsigned I = 0; I != NumArgs; ++I)
+ if (Args[I]->getObjectKind() == OK_ObjCProperty)
+ S.ConvertPropertyForRValue(Args[I]);
+
QualType SourceType;
Expr *Initializer = 0;
if (NumArgs == 1) {
@@ -3214,7 +3218,7 @@ InitializationSequence::InitializationSequence(Sema &S,
/*AllowExplicitConversions*/ false,
/*InOverloadResolution*/ false))
{
- if (Initializer->getType() == Context.OverloadTy )
+ if (Initializer->getType() == Context.OverloadTy)
SetFailed(InitializationSequence::FK_AddressOfOverloadFailed);
else
SetFailed(InitializationSequence::FK_ConversionFailed);
OpenPOWER on IntegriCloud