diff options
| author | Guy Benyei <guy.benyei@intel.com> | 2013-02-07 10:55:47 +0000 |
|---|---|---|
| committer | Guy Benyei <guy.benyei@intel.com> | 2013-02-07 10:55:47 +0000 |
| commit | 21f18c4fda167dc5f72feddbd6a7ac1b63200a0d (patch) | |
| tree | 80c1b120c64d3066fd4f5799174a16d8ed49eca0 /lib/Sema/SemaOverload.cpp | |
| parent | f5a6aefa37d73fff3c47953e2c447f074e726a0e (diff) | |
Add OpenCL samplers as Clang builtin types and check sampler related restrictions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174601 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaOverload.cpp')
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 2d4d159908..ac9dec4e6c 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1664,7 +1664,9 @@ static bool IsStandardConversion(Sema &S, Expr* From, QualType ToType, == CanonTo.getLocalUnqualifiedType() && (CanonFrom.getLocalCVRQualifiers() != CanonTo.getLocalCVRQualifiers() || CanonFrom.getObjCGCAttr() != CanonTo.getObjCGCAttr() - || CanonFrom.getObjCLifetime() != CanonTo.getObjCLifetime())) { + || CanonFrom.getObjCLifetime() != CanonTo.getObjCLifetime() + || (CanonFrom->isSamplerT() && + CanonFrom.getAddressSpace() != CanonTo.getAddressSpace()))) { FromType = ToType; CanonFrom = CanonTo; } |