From 5099aef86964c4b845d9165b9328e6e8e30fc8a3 Mon Sep 17 00:00:00 2001 From: Anastasia Stulova Date: Mon, 3 Jun 2019 15:42:36 +0000 Subject: [PATCH] [PR41567][Sema] Fixed cast kind in addr space conversions This change sets missing cast kind correctly in the address space conversion case. Differential Revision: https://reviews.llvm.org/D62299 llvm-svn: 362409 --- clang/lib/Sema/SemaCast.cpp | 4 ++++ clang/test/CodeGenOpenCLCXX/addrspace-conversion.cl | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 clang/test/CodeGenOpenCLCXX/addrspace-conversion.cl diff --git a/clang/lib/Sema/SemaCast.cpp b/clang/lib/Sema/SemaCast.cpp index 0958943..46d0f57 100644 --- a/clang/lib/Sema/SemaCast.cpp +++ b/clang/lib/Sema/SemaCast.cpp @@ -2450,6 +2450,10 @@ void CastOperation::CheckCXXCStyleCast(bool FunctionalStyle, 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, diff --git a/clang/test/CodeGenOpenCLCXX/addrspace-conversion.cl b/clang/test/CodeGenOpenCLCXX/addrspace-conversion.cl new file mode 100644 index 0000000..38422c2 --- /dev/null +++ b/clang/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; +} -- 2.7.4