CodeGen: Support 'this'

Author: mikaoP

clang/lib/CodeGen/CGOmpSsRuntime.cpp

@@ -311,11 +311,12 @@ static void EmitDSA(StringRef Name, CodeGenFunction &CGF, const Expr *E,
     }
     if (!FirstTime) // We have seen a vla, save dimensions
       DsaData.append(TmpDsaData.begin(), TmpDsaData.end());
-    TaskInfo.emplace_back(Basename, DsaData);
-  }
-  else {
+  } else if (const CXXThisExpr *ThisE = dyn_cast<CXXThisExpr>(E)) {
+    DsaData.push_back(CGF.EmitScalarExpr(ThisE));
+  } else {
     llvm_unreachable("Unhandled expression");
   }
+  TaskInfo.emplace_back(Basename, DsaData);
 }
 
 static void EmitDependency(StringRef Name, CodeGenFunction &CGF, const Expr *E,

clang/lib/CodeGen/CGStmtOmpSs.cpp

@@ -36,6 +36,9 @@ static void AddDSAData(const OSSTaskDirective &S, SmallVectorImpl<const Expr *>
           const ValueDecl *VD = DRE->getDecl();
           if (DeclExpr.insert(VD).second)
             Data.push_back(Ref);
+        } else if (const CXXThisExpr *ThisE = dyn_cast<CXXThisExpr>(Ref)) {
+          // 'this' expression is only allowed when it's generated by the compiler
+          Data.push_back(ThisE);
         }
       }
   }

clang/test/OmpSs/AST/this.cpp

@@ -0,0 +1,40 @@
+// RUN: %clang_cc1 -x c++ -verify -fompss-2 -ast-dump -ferror-limit 100 %s | FileCheck %s
+// expected-no-diagnostics
+
+struct S {
+  int x;
+  int y;
+  void f(int _x) {
+    #pragma oss task depend(out : x)
+    {}
+    #pragma oss task depend(in : this->x)
+    {}
+    #pragma oss task
+    { x = 1; }
+    #pragma oss task
+    { this->x = 2; }
+  }
+};
+
+// CHECK: OSSTaskDirective 0x{{[^ ]*}} <line:8:13, col:37>
+// CHECK-NEXT: OSSDependClause 0x{{[^ ]*}} <col:22, col:36>
+// CHECK-NEXT: MemberExpr 0x{{[^ ]*}} <col:35> 'int' lvalue ->x 0x{{[^ ]*}}
+// CHECK-NEXT: CXXThisExpr 0x{{[^ ]*}} <col:35> 'S *' implicit this
+// CHECK-NEXT: OSSSharedClause 0x{{[^ ]*}} <<invalid sloc>> <implicit>
+// CHECK-NEXT: CXXThisExpr 0x{{[^ ]*}} <col:35> 'S *' implicit this
+
+// CHECK: OSSTaskDirective 0x{{[^ ]*}} <line:10:13, col:42>
+// CHECK-NEXT: OSSDependClause 0x{{[^ ]*}} <col:22, col:41>
+// CHECK-NEXT: MemberExpr 0x{{[^ ]*}} <col:34, col:40> 'int' lvalue ->x 0x{{[^ ]*}}
+// CHECK-NEXT: CXXThisExpr 0x{{[^ ]*}} <col:34> 'S *' this
+// CHECK-NEXT: OSSSharedClause 0x{{[^ ]*}} <<invalid sloc>> <implicit>
+// CHECK-NEXT: CXXThisExpr 0x{{[^ ]*}} <col:34> 'S *' this
+
+// CHECK: OSSTaskDirective 0x{{[^ ]*}} <line:12:13, col:21>
+// CHECK-NEXT: OSSSharedClause 0x{{[^ ]*}} <<invalid sloc>> <implicit>
+// CHECK-NEXT: CXXThisExpr 0x{{[^ ]*}} <line:13:7> 'S *' implicit this
+
+// CHECK: OSSTaskDirective 0x{{[^ ]*}} <line:14:13, col:21>
+// CHECK-NEXT: OSSSharedClause 0x{{[^ ]*}} <<invalid sloc>> <implicit>
+// CHECK-NEXT: CXXThisExpr 0x{{[^ ]*}} <line:15:7> 'S *' this
+

clang/test/OmpSs/IR/this.cpp

@@ -0,0 +1,36 @@
+// RUN: %clang_cc1 -x c++ -verify -fompss-2 -disable-llvm-passes -ferror-limit 100 %s -S -emit-llvm -o - | FileCheck %s
+// expected-no-diagnostics
+
+struct S {
+  int x = 43;
+  int y;
+  void f();
+};
+
+void S::f() {
+  #pragma oss task depend(out : x)
+  {}
+  #pragma oss task depend(in : this->x)
+  {}
+  #pragma oss task
+  { x = 3; }
+  #pragma oss task
+  { this->x = 3; }
+}
+
+// CHECK: %this1 = load %struct.S*, %struct.S** %this.addr, align 8
+// CHECK-NEXT: %x = getelementptr inbounds %struct.S, %struct.S* %this1, i32 0, i32 0
+// CHECK-NEXT: %0 = call token @llvm.directive.region.entry() [ "DIR.OSS"([5 x i8] c"TASK\00"), "QUAL.OSS.SHARED"(%struct.S* %this1), "QUAL.OSS.DEP.OUT"(i32* %x, i64 4, i64 0, i64 4) ]
+// CHECK-NEXT: call void @llvm.directive.region.exit(token %0)
+// CHECK-NEXT: %x2 = getelementptr inbounds %struct.S, %struct.S* %this1, i32 0, i32 0
+// CHECK-NEXT: %1 = call token @llvm.directive.region.entry() [ "DIR.OSS"([5 x i8] c"TASK\00"), "QUAL.OSS.SHARED"(%struct.S* %this1), "QUAL.OSS.DEP.IN"(i32* %x2, i64 4, i64 0, i64 4) ]
+// CHECK-NEXT: call void @llvm.directive.region.exit(token %1)
+// CHECK-NEXT: %2 = call token @llvm.directive.region.entry() [ "DIR.OSS"([5 x i8] c"TASK\00"), "QUAL.OSS.SHARED"(%struct.S* %this1) ]
+// CHECK-NEXT: %x3 = getelementptr inbounds %struct.S, %struct.S* %this1, i32 0, i32 0
+// CHECK-NEXT: store i32 3, i32* %x3, align 4
+// CHECK-NEXT: call void @llvm.directive.region.exit(token %2)
+// CHECK-NEXT: %3 = call token @llvm.directive.region.entry() [ "DIR.OSS"([5 x i8] c"TASK\00"), "QUAL.OSS.SHARED"(%struct.S* %this1) ]
+// CHECK-NEXT: %x4 = getelementptr inbounds %struct.S, %struct.S* %this1, i32 0, i32 0
+// CHECK-NEXT: store i32 3, i32* %x4, align 4
+// CHECK-NEXT: call void @llvm.directive.region.exit(token %3)
+