From 610541989a524be452a5674cd3fb78304ce3fa8a Mon Sep 17 00:00:00 2001
From: Guy Benyei <guy.benyei@intel.com>
Date: Thu, 7 Feb 2013 10:55:47 +0000
Subject: Add OpenCL samplers as Clang builtin types and check sampler related
 restrictions.

llvm-svn: 174601
---
 clang/lib/Sema/SemaOverload.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Sema/SemaOverload.cpp')

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;
     }
-- 
cgit v1.2.3