Merge from 'sycl' to 'sycl-web' (#2)

Author: iclsrc

clang/lib/Driver/Driver.cpp

@@ -6371,6 +6371,10 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
   if (AtTopLevel && !isa<DsymutilJobAction>(JA) && !isa<VerifyJobAction>(JA)) {
     if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o))
       return C.addResultFile(FinalOutput->getValue(), &JA);
+    // Output to destination for -fsycl-device-only and Windows -o
+    if (C.getArgs().hasArg(options::OPT_fsycl_device_only))
+      if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT__SLASH_o))
+        return C.addResultFile(FinalOutput->getValue(), &JA);
   }
 
   // For /P, preprocess to file named after BaseInput.

clang/lib/Sema/SemaDeclAttr.cpp

@@ -326,7 +326,7 @@ void Sema::CheckDeprecatedSYCLAttributeSpelling(const ParsedAttr &A,
   // of a name in the intel vendor namespace. By default, assume the attribute
   // retains its original name but changes the namespace. However, some
   // attributes were renamed, so we support supplying a new name as well.
-  if (A.getScopeName()->isStr("intelfpga")) {
+  if (A.hasScope() && A.getScopeName()->isStr("intelfpga")) {
     Diag(A.getLoc(), diag::warn_attribute_spelling_deprecated)
         << "'" + A.getNormalizedFullName() + "'";
 

clang/test/Driver/sycl-device.cpp

@@ -28,3 +28,10 @@
 // RUN:   | FileCheck -check-prefix=CHECK-SYCL-AUX-TRIPLE %s
 // TODO: %clang -### -fsycl -fsycl-device-only -target aarch64-linux-gnu
 // CHECK-SYCL-AUX-TRIPLE: clang{{.*}} "-aux-triple" "aarch64-unknown-linux-gnu"
+
+/// Verify output files are properly specified given -o
+// RUN: %clang -### -fsycl -fsycl-device-only -o dummy.out %s 2>&1 \
+// RUN:  | FileCheck -check-prefix=CHECK-OUTPUT-FILE %s
+// RUN: %clang_cl -### -fsycl -fsycl-device-only -o dummy.out %s 2>&1 \
+// RUN:  | FileCheck -check-prefix=CHECK-OUTPUT-FILE %s
+// CHECK-OUTPUT-FILE: clang{{.*}} "-o" "dummy.out"