From 8aef3b580f840d3036225bdaab600570e1a7561a Mon Sep 17 00:00:00 2001
From: Zahira Ammarguellat <zahira.ammarguellat@intel.com>
Date: Fri, 18 Dec 2020 08:11:15 -0800
Subject: [PATCH] SYCL][NFC] Code clean up (phase 5) revealed by self build.

---
 clang/include/clang/Sema/Sema.h | 3 ---
 clang/lib/Driver/Driver.cpp     | 2 +-
 clang/lib/Sema/SemaSYCL.cpp     | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index d0a82c982c521..4528044881604 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/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;
 
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index d7f7abe93101d..b57dde93b0fe6 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -5117,7 +5117,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))
diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index 5c66ceee82128..9ad45432935e1 100644
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/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