Index: lib/Sema/SemaCast.cpp =================================================================== --- lib/Sema/SemaCast.cpp +++ lib/Sema/SemaCast.cpp @@ -2428,6 +2428,10 @@ tcr = TryAddressSpaceCast(Self, SrcExpr, DestType, /*CStyle*/ true, msg); if (SrcExpr.isInvalid()) return; + + if (isValidCast(tcr)) + Kind = CK_AddressSpaceConversion; + if (tcr == TC_NotApplicable) { // ... or if that is not possible, a static_cast, ignoring const, ... tcr = TryStaticCast(Self, SrcExpr, DestType, CCK, OpRange, msg, Kind, Index: test/CodeGenOpenCLCXX/addrspace-conversion.cl =================================================================== --- /dev/null +++ test/CodeGenOpenCLCXX/addrspace-conversion.cl @@ -0,0 +1,7 @@ +// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -emit-llvm -O0 -o - | FileCheck %s + +void bar(__generic volatile unsigned int* ptr) +{ + //CHECK: addrspacecast i32 addrspace(4)* %{{.+}} to i32 addrspace(1)* + auto gptr = (__global volatile unsigned int*)ptr; +}