TreeTransform: If/final/default instatiation

Author: mikaoP

clang/lib/Sema/TreeTransform.h

@@ -1540,6 +1540,41 @@ class TreeTransform {
         Kind, AStmt, StartLoc, EndLoc);
   }
 
+  /// Build a new OmpSs 'if' clause.
+  ///
+  /// By default, performs semantic analysis to build the new OmpSs clause.
+  /// Subclasses may override this routine to provide different behavior.
+  OSSClause *RebuildOSSIfClause(Expr *Condition, SourceLocation StartLoc,
+                                SourceLocation LParenLoc,
+                                SourceLocation EndLoc) {
+    return getSema().ActOnOmpSsIfClause(Condition, StartLoc, LParenLoc,
+                                        EndLoc);
+  }
+
+  /// Build a new OmpSs 'final' clause.
+  ///
+  /// By default, performs semantic analysis to build the new OmpSs clause.
+  /// Subclasses may override this routine to provide different behavior.
+  OSSClause *RebuildOSSFinalClause(Expr *Condition, SourceLocation StartLoc,
+                                   SourceLocation LParenLoc,
+                                   SourceLocation EndLoc) {
+    return getSema().ActOnOmpSsFinalClause(Condition, StartLoc, LParenLoc,
+                                           EndLoc);
+  }
+
+  /// Build a new OmpSs 'depend' pseudo clause.
+  ///
+  /// By default, performs semantic analysis to build the new OmpSs clause.
+  /// Subclasses may override this routine to provide different behavior.
+  OSSClause *
+  RebuildOSSDependClause(ArrayRef<OmpSsDependClauseKind> DepKinds, SourceLocation DepLoc,
+                         SourceLocation ColonLoc, ArrayRef<Expr *> VarList,
+                         SourceLocation StartLoc, SourceLocation LParenLoc,
+                         SourceLocation EndLoc) {
+    return getSema().ActOnOmpSsDependClause(DepKinds, DepLoc, ColonLoc, VarList,
+                                            StartLoc, LParenLoc, EndLoc);
+  }
+
   /// Build a new OmpSs 'shared' clause.
   ///
   /// By default, performs semantic analysis to build the new OmpSs clause.
@@ -1576,19 +1611,6 @@ class TreeTransform {
                                                   EndLoc);
   }
 
-  /// Build a new OmpSs 'depend' pseudo clause.
-  ///
-  /// By default, performs semantic analysis to build the new OmpSs clause.
-  /// Subclasses may override this routine to provide different behavior.
-  OSSClause *
-  RebuildOSSDependClause(ArrayRef<OmpSsDependClauseKind> DepKinds, SourceLocation DepLoc,
-                         SourceLocation ColonLoc, ArrayRef<Expr *> VarList,
-                         SourceLocation StartLoc, SourceLocation LParenLoc,
-                         SourceLocation EndLoc) {
-    return getSema().ActOnOmpSsDependClause(DepKinds, DepLoc, ColonLoc, VarList,
-                                            StartLoc, LParenLoc, EndLoc);
-  }
-
   /// Build a new OpenMP executable directive.
   ///
   /// By default, performs semantic analysis to build the new statement.
@@ -9359,24 +9381,20 @@ TreeTransform<Derived>::TransformOSSLastprivateClause(OSSLastprivateClause *C) {
 
 template <typename Derived>
 OSSClause *TreeTransform<Derived>::TransformOSSIfClause(OSSIfClause *C) {
-  // ExprResult Cond = getDerived().TransformExpr(C->getCondition());
-  // if (Cond.isInvalid())
-  //   return nullptr;
-  // return getDerived().RebuildOSSIfClause(Cond.get(), C->getBeginLoc(),
-  //                                        C->getLParenLoc(), C->getEndLoc());
-  llvm_unreachable("unsupported yet");
-  return nullptr;
+  ExprResult Cond = getDerived().TransformExpr(C->getCondition());
+  if (Cond.isInvalid())
+    return nullptr;
+  return getDerived().RebuildOSSIfClause(Cond.get(), C->getBeginLoc(),
+                                         C->getLParenLoc(), C->getEndLoc());
 }
 
 template <typename Derived>
 OSSClause *TreeTransform<Derived>::TransformOSSFinalClause(OSSFinalClause *C) {
-  // ExprResult Cond = getDerived().TransformExpr(C->getCondition());
-  // if (Cond.isInvalid())
-  //   return nullptr;
-  // return getDerived().RebuildOSSFinalClause(Cond.get(), C->getBeginLoc(),
-  //                                           C->getLParenLoc(), C->getEndLoc());
-  llvm_unreachable("unsupported yet");
-  return nullptr;
+  ExprResult Cond = getDerived().TransformExpr(C->getCondition());
+  if (Cond.isInvalid())
+    return nullptr;
+  return getDerived().RebuildOSSFinalClause(Cond.get(), C->getBeginLoc(),
+                                            C->getLParenLoc(), C->getEndLoc());
 }
 
 template <typename Derived>
@@ -9410,11 +9428,8 @@ TreeTransform<Derived>::TransformOSSCollapseClause(OSSCollapseClause *C) {
 template <typename Derived>
 OSSClause *
 TreeTransform<Derived>::TransformOSSDefaultClause(OSSDefaultClause *C) {
-  // return getDerived().RebuildOSSDefaultClause(
-  //     C->getDefaultKind(), C->getDefaultKindKwLoc(), C->getBeginLoc(),
-  //     C->getLParenLoc(), C->getEndLoc());
-  llvm_unreachable("unsupported yet");
-  return nullptr;
+  // No need to rebuild this clause, no template-dependent parameters.
+  return C;
 }
 
 template <typename Derived>

clang/test/OmpSs/AST/task_final.cpp

@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -x c++ -verify -fompss-2 -ast-dump -ferror-limit 100 %s | FileCheck %s
+// expected-no-diagnostics
+
+template<typename T>
+T *foo(T *t) {
+  #pragma oss task final(*t)
+  {}
+  return t;
+}
+
+void bar() {
+  float *p;
+  float *j = foo(p);
+}
+
+// CHECK: OSSTaskDirective {{[a-z0-9]+}} <line:6:11, col:29>
+// CHECK-NEXT: OSSFinalClause {{[a-z0-9]+}} <col:20, col:28>
+// CHECK-NEXT: UnaryOperator {{[a-z0-9]+}} <col:26, col:27> '<dependent type>' prefix '*' cannot overflow
+// CHECK-NEXT: DeclRefExpr {{[a-z0-9]+}} <col:27> 'T *' lvalue ParmVar {{[a-z0-9]+}} 't' 'T *'
+
+// CHECK: OSSTaskDirective {{[a-z0-9]+}} <line:6:11, col:29>
+// CHECK-NEXT: OSSFinalClause {{[a-z0-9]+}} <col:20, col:28>
+// CHECK-NEXT: ImplicitCastExpr {{[a-z0-9]+}} <col:26, col:27> 'bool' <FloatingToBoolean>
+// CHECK-NEXT: ImplicitCastExpr {{[a-z0-9]+}} <col:26, col:27> 'float':'float' <LValueToRValue>
+// CHECK-NEXT: UnaryOperator {{[a-z0-9]+}} <col:26, col:27> 'float':'float' lvalue prefix '*' cannot overflow
+// CHECK-NEXT: ImplicitCastExpr {{[a-z0-9]+}} <col:27> 'float *' <LValueToRValue>
+// CHECK-NEXT: DeclRefExpr {{[a-z0-9]+}} <col:27> 'float *' lvalue ParmVar {{[a-z0-9]+}} 't' 'float *'
+

clang/test/OmpSs/AST/task_if.cpp

@@ -0,0 +1,28 @@
+// RUN: %clang_cc1 -x c++ -verify -fompss-2 -ast-dump -ferror-limit 100 %s | FileCheck %s
+// expected-no-diagnostics
+
+template<typename T>
+T *foo(T *t) {
+  #pragma oss task if(*t)
+  {}
+  return t;
+}
+
+void bar() {
+  float *p;
+  float *j = foo(p);
+}
+
+// CHECK: OSSTaskDirective {{[a-z0-9]+}} <line:6:11, col:26>
+// CHECK-NEXT: OSSIfClause {{[a-z0-9]+}} <col:20, col:25>
+// CHECK-NEXT: UnaryOperator {{[a-z0-9]+}} <col:23, col:24> '<dependent type>' prefix '*' cannot overflow
+// CHECK-NEXT: DeclRefExpr {{[a-z0-9]+}} <col:24> 'T *' lvalue ParmVar {{[a-z0-9]+}} 't' 'T *'
+
+// CHECK: OSSTaskDirective {{[a-z0-9]+}} <line:6:11, col:26>
+// CHECK-NEXT: OSSIfClause {{[a-z0-9]+}} <col:20, col:25>
+// CHECK-NEXT: ImplicitCastExpr {{[a-z0-9]+}} <col:23, col:24> 'bool' <FloatingToBoolean>
+// CHECK-NEXT: ImplicitCastExpr {{[a-z0-9]+}} <col:23, col:24> 'float':'float' <LValueToRValue>
+// CHECK-NEXT: UnaryOperator {{[a-z0-9]+}} <col:23, col:24> 'float':'float' lvalue prefix '*' cannot overflow
+// CHECK-NEXT: ImplicitCastExpr {{[a-z0-9]+}} <col:24> 'float *' <LValueToRValue>
+// CHECK-NEXT: DeclRefExpr {{[a-z0-9]+}} <col:24> 'float *' lvalue ParmVar {{[a-z0-9]+}} 't' 'float *'
+