Make OSSCheckShadow to skip our fake FunctionScopeInfo

Closes llvm#117

Author: mikaoP

clang/lib/Sema/SemaDecl.cpp

@@ -7706,17 +7706,23 @@ void Sema::OSSCheckShadow(NamedDecl *D, NamedDecl *ShadowedDecl,
       isa<CXXMethodDecl>(NewDC)) {
     if (const auto *RD = dyn_cast<CXXRecordDecl>(NewDC->getParent())) {
       if (RD->isLambda() && OldDC->Encloses(NewDC->getLexicalParent())) {
+
+        FunctionScopeInfo *FSI = getCurFunction();
+        // He are in a ompss-2 directive scope, get the next one.
+        if (FSI->HasOSSExecutableDirective)
+          FSI = FunctionScopes[FunctionScopes.size() - 2];
+
         if (RD->getLambdaCaptureDefault() == LCD_None) {
           // Try to avoid warnings for lambdas with an explicit capture list.
-          const auto *LSI = cast<LambdaScopeInfo>(getCurFunction());
+          const auto *LSI = cast<LambdaScopeInfo>(FSI);
           // Warn only when the lambda captures the shadowed decl explicitly.
           CaptureLoc = getCaptureLocation(LSI, cast<VarDecl>(ShadowedDecl));
           if (CaptureLoc.isInvalid())
             WarningDiag = diag::warn_oss_decl_shadow_uncaptured_local;
         } else {
           // Remember that this was shadowed so we can avoid the warning if the
           // shadowed decl isn't captured and the warning settings allow it.
-          cast<LambdaScopeInfo>(getCurFunction())
+          cast<LambdaScopeInfo>(FSI)
               ->ShadowingDecls.push_back(
                   {cast<VarDecl>(D), cast<VarDecl>(ShadowedDecl)});
           return;

clang/test/OmpSs/Sema/multideps_shadowing.cpp

@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -verify -fompss-2 -ferror-limit 100 -o - -std=c++11 %s
+
+int main() {
+    int v[10];
+    int i; // expected-note {{previous declaration is here}}
+    auto l = [i]() { // expected-note {{variable 'i' is explicitly captured here}}
+        #pragma oss taskloop in( { v[i], i = 0; 10 } ) // expected-warning {{declaration shadows a local variable}}
+        for (int j = 0; j < 10; ++j) {}
+    };
+}