Fix conflict resolution for clang/lib/Frontend/InitPreprocessor.cpp

Author: Artem Gindinson

clang/lib/Frontend/InitPreprocessor.cpp

@@ -1179,13 +1179,12 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
     Builder.defineMacro("__SYCL_DEVICE_ONLY__", "1");
     Builder.defineMacro("SYCL_EXTERNAL", "__attribute__((sycl_device))");
 
-    if (TI.getTriple().isNVPTX()) {
-        Builder.defineMacro("__SYCL_NVPTX__", "1");
-    }
+    const llvm::Triple &DeviceTriple = TI.getTriple();
+    if (DeviceTriple.isNVPTX())
+      Builder.defineMacro("__SYCL_NVPTX__", "1");
 
-    if (TI.getTriple().isAMDGCN()) {
+    if (DeviceTriple.isAMDGCN())
       Builder.defineMacro("__SYCL_AMDGCN__", "1");
-    }
     const llvm::Triple::SubArchType DeviceSubArch = DeviceTriple.getSubArch();
     if (DeviceTriple.isSPIR() &&
         DeviceSubArch != llvm::Triple::SPIRSubArch_fpga)