Fix dependencies over arrays of pointers. See more.

What it happens is that we stop walking up de subexprs
when we find a pointer in consecutive array section expr. and
subscript exprs, but we don't in between array section exprs.
and subscript exprs.

This case is:
int *array[10]:
in(array[2][3])

Closes llvm#160

Author: Raúl Peñacoba Veigas

clang/lib/CodeGen/CGOmpSsRuntime.cpp

@@ -411,22 +411,26 @@ class OSSExprInfoGathering
       // Get the inner expr
       const Expr *TmpE = E;
       // First come OSSArraySection
+      bool FoundPointer = false;
       while (const OSSArraySectionExpr *ASE = dyn_cast<OSSArraySectionExpr>(TmpE->IgnoreParenImpCasts())) {
         // Stop in the innermost ArrayToPointerDecay
         TmpE = ASE->getBase();
-        // If we see a Pointer we must to add one dimension and done
+        // If we see a Pointer we must add one dimension and done
         if (TmpE->IgnoreParenImpCasts()->getType()->isPointerType()) {
           AddDimStartEnd();
+          FoundPointer = true;
           break;
         }
       }
-      while (const ArraySubscriptExpr *ASE = dyn_cast<ArraySubscriptExpr>(TmpE->IgnoreParenImpCasts())) {
-        // Stop in the innermost ArrayToPointerDecay
-        TmpE = ASE->getBase();
-        // If we see a Pointer we must to add one dimension and done
-        if (TmpE->IgnoreParenImpCasts()->getType()->isPointerType()) {
-          AddDimStartEnd();
-          break;
+      if (!FoundPointer) {
+        while (const ArraySubscriptExpr *ASE = dyn_cast<ArraySubscriptExpr>(TmpE->IgnoreParenImpCasts())) {
+          // Stop in the innermost ArrayToPointerDecay
+          TmpE = ASE->getBase();
+          // If we see a Pointer we must add one dimension and done
+          if (TmpE->IgnoreParenImpCasts()->getType()->isPointerType()) {
+            AddDimStartEnd();
+            break;
+          }
         }
       }
       RetTypes.insert(RetTypes.begin(), TmpE->getType());
@@ -645,6 +649,7 @@ class OSSDependVisitor
     // Get the inner expr
     const Expr *TmpE = E;
     // First come OSSArraySection
+    bool FoundPointer = false;
     while (const OSSArraySectionExpr *ASE = dyn_cast<OSSArraySectionExpr>(TmpE->IgnoreParenImpCasts())) {
       // Stop in the innermost ArrayToPointerDecay
       TmpE = ASE->getBase();
@@ -709,22 +714,25 @@ class OSSDependVisitor
       if (TmpE->IgnoreParenImpCasts()->getType()->isPointerType()) {
         assert(LengthUpper && "Sema should have forbidden unspecified sizes in pointers");
         Dims.push_back(CGF.Builder.CreateSExt(CGF.EmitScalarExpr(LengthUpper), OSSArgTy));
+        FoundPointer = true;
         break;
       }
     }
-    while (const ArraySubscriptExpr *ASE = dyn_cast<ArraySubscriptExpr>(TmpE->IgnoreParenImpCasts())) {
-      // Stop in the innermost ArrayToPointerDecay
-      TmpE = ASE->getBase();
-      // Add indexes
-      llvm::Value *Idx = CGF.EmitScalarExpr(ASE->getIdx());
-      Idx = CGF.Builder.CreateSExt(Idx, OSSArgTy);
-      llvm::Value *IdxEnd = CGF.Builder.CreateAdd(Idx, llvm::ConstantInt::getSigned(OSSArgTy, 1));
-      Starts.push_back(Idx);
-      Ends.push_back(IdxEnd);
-      // If we see a Pointer we must to add one dimension and done
-      if (TmpE->IgnoreParenImpCasts()->getType()->isPointerType()) {
-        Dims.push_back(llvm::ConstantInt::getSigned(OSSArgTy, 1));
-        break;
+    if (!FoundPointer) {
+      while (const ArraySubscriptExpr *ASE = dyn_cast<ArraySubscriptExpr>(TmpE->IgnoreParenImpCasts())) {
+        // Stop in the innermost ArrayToPointerDecay
+        TmpE = ASE->getBase();
+        // Add indexes
+        llvm::Value *Idx = CGF.EmitScalarExpr(ASE->getIdx());
+        Idx = CGF.Builder.CreateSExt(Idx, OSSArgTy);
+        llvm::Value *IdxEnd = CGF.Builder.CreateAdd(Idx, llvm::ConstantInt::getSigned(OSSArgTy, 1));
+        Starts.push_back(Idx);
+        Ends.push_back(IdxEnd);
+        // If we see a Pointer we must to add one dimension and done
+        if (TmpE->IgnoreParenImpCasts()->getType()->isPointerType()) {
+          Dims.push_back(llvm::ConstantInt::getSigned(OSSArgTy, 1));
+          break;
+        }
       }
     }
 

clang/test/OmpSs/IR/task_depend_array_section.c

@@ -623,3 +623,28 @@ void bar() {
 // CHECK-NEXT:   %7 = load %struct._depend_unpack_t.24, %struct._depend_unpack_t.24* %retval, align 8
 // CHECK-NEXT:   ret %struct._depend_unpack_t.24 %7
 // CHECK-NEXT: }
+
+void foo1() {
+    int *array[10];
+    #pragma oss task in(array[2][3])
+    {}
+}
+
+// CHECK: define internal %struct._depend_unpack_t.25 @compute_dep.26([10 x i32*]* %array)
+// CHECK: entry:
+// CHECK-NEXT:   %retval = alloca %struct._depend_unpack_t.25, align 8
+// CHECK-NEXT:   %array.addr = alloca [10 x i32*]*, align 8
+// CHECK-NEXT:   store [10 x i32*]* %array, [10 x i32*]** %array.addr, align 8
+// CHECK-NEXT:   %arrayidx = getelementptr inbounds [10 x i32*], [10 x i32*]* %array, i64 0, i64 2
+// CHECK-NEXT:   %0 = load i32*, i32** %arrayidx, align 16
+// CHECK-NEXT:   %1 = getelementptr inbounds %struct._depend_unpack_t.25, %struct._depend_unpack_t.25* %retval, i32 0, i32 0
+// CHECK-NEXT:   store i32* %0, i32** %1, align 8
+// CHECK-NEXT:   %2 = getelementptr inbounds %struct._depend_unpack_t.25, %struct._depend_unpack_t.25* %retval, i32 0, i32 1
+// CHECK-NEXT:   store i64 4, i64* %2, align 8
+// CHECK-NEXT:   %3 = getelementptr inbounds %struct._depend_unpack_t.25, %struct._depend_unpack_t.25* %retval, i32 0, i32 2
+// CHECK-NEXT:   store i64 12, i64* %3, align 8
+// CHECK-NEXT:   %4 = getelementptr inbounds %struct._depend_unpack_t.25, %struct._depend_unpack_t.25* %retval, i32 0, i32 3
+// CHECK-NEXT:   store i64 16, i64* %4, align 8
+// CHECK-NEXT:   %5 = load %struct._depend_unpack_t.25, %struct._depend_unpack_t.25* %retval, align 8
+// CHECK-NEXT:   ret %struct._depend_unpack_t.25 %5
+// CHECK-NEXT: }