[PR41674] [OpenCL] Fix initialisation of this via pointer

[kpet]

Summary

When the expression used to initialise this has a pointer type,
check the address space of the pointee type instead of the pointer
type to decide whether an address space cast is required.
It is the pointee type that carries the address space qualifier.

[Anastasia]

I would suggest an IR test, especially since what you want to achieve is addrspacecast in IR output. We use AST dump only if there is no other good way to test something. In fact we already have a test with similar logic that tests various OpenCL address spaces: test/CodeGenOpenCLCXX/addrspace-of-this.cl. I think it should be reasonable enough to extend it.

[kpet]

Ok, I'll replace the test with an IR-level test.

[kpet]

Replaced the AST dump test with an IR test.

[Anastasia]

test/CodeGenOpenCLCXX/addrspace-of-this.cl

94 ↗

(On Diff #197617)

Ok I think we should regex name of call registers or may be even prevent checking it if it's not required. The same applies to other places btw.

136 ↗

(On Diff #197617)

Shouldn't %call5 just be [[CALL]]? If not I see little value in checking the name...

[kpet]

Most of these are pre-existing issues with the tests but I agree they're worth fixing. I'll update the tests.

[kpet]

Clean up the tests.

[Anastasia]

LGTM! Thanks!

lib/Sema/SemaOverload.cpp

if (ICS.Standard.Second == ICK_Derived_To_Base) {
     ExprResult FromRes =
       PerformObjectMemberConversion(From, Qualifier, FoundDecl, Method);
     if (FromRes.isInvalid())
       return ExprError();
     From = FromRes.get();
   }
 
   if (!Context.hasSameType(From->getType(), DestType)) {
-    if (From->getType().getAddressSpace() != DestType.getAddressSpace())
-      From = ImpCastExprToType(From, DestType, CK_AddressSpaceConversion,
-                             From->getValueKind()).get();
+    CastKind CK;
+    if (FromRecordType.getAddressSpace() != DestType.getAddressSpace())
+      CK = CK_AddressSpaceConversion;
     else
-      From = ImpCastExprToType(From, DestType, CK_NoOp,
-                             From->getValueKind()).get();
+      CK = CK_NoOp;
+    From = ImpCastExprToType(From, DestType, CK, From->getValueKind()).get();
   }
   return From;
 }
 
 /// TryContextuallyConvertToBool - Attempt to contextually convert the
 /// expression From to bool (C++0x [conv]p3).
 static ImplicitConversionSequence
 TryContextuallyConvertToBool(Sema &S, Expr *From) {

test/SemaOpenCLCXX/this-initialisation-from-pointer.cl

+// RUN: %clang_cc1 -cl-std=c++ -triple spir -fsyntax-only -verify -ast-dump %s | FileCheck %s
+// expected-no-diagnostics
+
+struct foo {
+    void init() {
+        m_data = 1;
+    }
+private:
+    int m_data;
+};
+
+kernel void test(global struct foo* afoo) {
+    afoo->init();
+    // CHECK: CXXMemberCallExpr {{.*}} <line:{{[0-9]+}}:{{[0-9]+}}, col:{{[0-9]+}}> 'void'
+    // CHECK-NEXT: MemberExpr {{.*}} <col:{{[0-9]+}}, col:{{[0-9]+}}> '<bound member function type>' ->init {{.*}}
+    // CHECK-NEXT: ImplicitCastExpr {{.*}} <col:{{[0-9]+}}> '__generic foo *' <AddressSpaceConversion>
+}