some fixes

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

clang/lib/CodeGen/TargetInfo.cpp

@@ -117,7 +117,7 @@ unsigned TargetCodeGenInfo::getDeviceKernelCallingConv() const {
     // to multiple function arguments etc.
     return llvm::CallingConv::SPIR_KERNEL;
   }
-  if (getABIInfo().getContext().getLangOpts().SYCLIsNativeCPU) {
+  if (getABIInfo().getContext().getTargetInfo().getTriple().isNativeCPU()) {
     return llvm::CallingConv::SPIR_KERNEL;
   }
   llvm_unreachable("Unknown kernel calling convention");

clang/test/Frontend/sycl-propagate-aspect-warning.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -internal-isystem %S/Inputs -fsycl-is-device -mconstructor-aliases -emit-codegen-only -verify %s
+// RUN: %clang_cc1 -internal-isystem %S/Inputs -triple native_cpu -fsycl-is-device -mconstructor-aliases -emit-llvm %s -o /dev/null
 // Tests for warnings when propagated aspects do not match the aspects available
 // in a function, as specified through the 'sycl::device_has' attribute.