Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/workflows/sync-main.yml

@@ -0,0 +1,48 @@
+name: automatic sync main branch from llvm-project to llvm
+
+on:
+  schedule:
+  - cron: '/10 * * * *'
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # persist-credentials: false allows us to use our own credentials for
+          # pushing to the repository.  Otherwise, the default github actions token
+          # is used.
+          persist-credentials: false
+          fetch-depth: 0
+          path: src
+      - name: Sync
+        env:
+          BRANCH: main
+          SYNC_REPO: https://github.com/llvm/llvm-project
+          LLVMBOT_TOKEN: ${{ secrets.LLVM_MAIN_SYNC_BBSYCL_TOKEN }}
+        run: |
+          cd $GITHUB_WORKSPACE/src
+          branch_exist=`git ls-remote --heads origin $BRANCH | wc -l`
+          if [ $branch_exist -ne 0 ]; then
+              git checkout $BRANCH
+              git pull --ff --ff-only $SYNC_REPO $BRANCH
+              if [ $? -ne 0 ]; then
+                  echo "failed to pull from $SYNC_REPO $BRANCH, abort"
+                  exit 1
+              fi
+              git_status=`git rev-list --count --left-right origin/$BRANCH...$BRANCH`
+              if [ "0	0" == "$git_status" ] ; then
+                  echo "no change, skip"
+              elif [[ "$git_status" =  0* ]] ; then
+                  git push https://[email protected]/${{ github.repository }} ${BRANCH}
+              else
+                  echo "$BRANCH branch invalid state"
+                  exit 1
+              fi
+          else
+              git remote add upstream $SYNC_REPO
+              git fetch upstream
+              git checkout -B $BRANCH upstream/$BRANCH
+              git push https://[email protected]/${{ github.repository }} ${BRANCH}
+          fi
+          echo "sync finished"

clang/include/clang/Sema/Sema.h

@@ -410,9 +410,6 @@ class SYCLIntegrationHeader {
   /// integration header emission time.
   llvm::SmallVector<SpecConstID, 4> SpecConsts;
 
-  /// Used for emitting diagnostics.
-  DiagnosticsEngine &Diag;
-
   /// Whether header is generated with unnamed lambda support
   bool UnnamedLambdaSupport;
 

clang/lib/Driver/Driver.cpp

@@ -716,7 +716,6 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
     C.addOffloadDeviceToolChain(CudaTC, OFK);
   } else if (IsHIP) {
     const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
-    const llvm::Triple &HostTriple = HostTC->getTriple();
     auto OFK = Action::OFK_HIP;
     llvm::Triple HIPTriple = getHIPOffloadTargetTriple();
     // Use the HIP and host triples as the key into
@@ -5116,7 +5115,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
     OffloadBuilder.addDeviceDependencesToHostAction(
         Current, InputArg, phases::Link, PL.back(), PL);
   };
-  for (const StringRef &LA : LinkArgs) {
+  for (StringRef LA : LinkArgs) {
     // At this point, we will process the archives for FPGA AOCO and individual
     // archive unbundling for Windows.
     if (!isStaticArchiveFile(LA))

clang/lib/Sema/SemaSYCL.cpp

@@ -3988,7 +3988,7 @@ void SYCLIntegrationHeader::setCallsThisItem(bool B) {
 SYCLIntegrationHeader::SYCLIntegrationHeader(DiagnosticsEngine &_Diag,
                                              bool _UnnamedLambdaSupport,
                                              Sema &_S)
-    : Diag(_Diag), UnnamedLambdaSupport(_UnnamedLambdaSupport), S(_S) {}
+    : UnnamedLambdaSupport(_UnnamedLambdaSupport), S(_S) {}
 
 // -----------------------------------------------------------------------------
 // Utility class methods