diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2013-12-16 22:54:37 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2013-12-16 22:54:37 +0000 |
| commit | 381edf5759d163eb1fb0517891b60379543ec4f0 (patch) | |
| tree | 924e0d88e335be090d6c704da1c43e2c88ea4dfd /clang/lib/Sema/SemaOverload.cpp | |
| parent | 04c685b5e4da7c86d8336a41f9e4cf1ab9a96795 (diff) | |
| download | bcm5719-llvm-381edf5759d163eb1fb0517891b60379543ec4f0.tar.gz bcm5719-llvm-381edf5759d163eb1fb0517891b60379543ec4f0.zip | |
ObjectiveC. Further improvements of use
of objc_bridge_related attribute; eliminate
unnecessary diagnostics which is issued elsewhere,
fixit now produces a valid AST tree per convention.
This results in some simplification in handling of
this attribute as well. // rdar://15499111
llvm-svn: 197436
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 3c5caa5b98f..13337480b0a 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -1298,7 +1298,9 @@ Sema::PerformImplicitConversion(Expr *From, QualType ToType, bool AllowObjCWritebackConversion = getLangOpts().ObjCAutoRefCount && (Action == AA_Passing || Action == AA_Sending); - + if (getLangOpts().ObjC1) + CheckObjCBridgeRelatedConversions(From->getLocStart(), + ToType, From->getType(), From); ICS = clang::TryImplicitConversion(*this, From, ToType, /*SuppressUserConversions=*/false, AllowExplicit, |
