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 | 610541989a524be452a5674cd3fb78304ce3fa8a (patch) | |
| tree | 531d41128c330184f827fe19a030d2f8387f35dd /clang/lib/Sema/SemaOverload.cpp | |
| parent | 4ea6816247a211e731b7929ca08d682c781e3348 (diff) | |
| download | bcm5719-llvm-610541989a524be452a5674cd3fb78304ce3fa8a.tar.gz bcm5719-llvm-610541989a524be452a5674cd3fb78304ce3fa8a.zip | |
Add OpenCL samplers as Clang builtin types and check sampler related restrictions.
llvm-svn: 174601
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 2d4d1599080..ac9dec4e6c9 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/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; } |
