Fix previous commit. Introduce _OMPSS_NANOS6 only if we define _OMPSS_2

Author: Raúl Peñacoba Veigas

clang/lib/Frontend/InitPreprocessor.cpp

@@ -1263,13 +1263,13 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
   }
 
   // OmpSs-2
-  if (LangOpts.OmpSs)
+  if (LangOpts.OmpSs) {
     Builder.defineMacro("_OMPSS_2", "1");
-  if (LangOpts.OmpSsRuntimeName == std::string("libnodes"))
-    Builder.defineMacro("_OMPSS_2_NODES", "1");
-  else
-    Builder.defineMacro("_OMPSS_2_NANOS6", "1");
-
+    if (LangOpts.OmpSsRuntimeName == std::string("libnodes"))
+      Builder.defineMacro("_OMPSS_2_NODES", "1");
+    else
+      Builder.defineMacro("_OMPSS_2_NANOS6", "1");
+  }
 
   // CUDA device path compilaton
   if (LangOpts.CUDAIsDevice && !LangOpts.HIP) {

clang/test/OmpSs/Driver/driver.c

@@ -4,9 +4,13 @@
 // RUN: %clang %s -c -E -dM -fompss-2=libnodes | FileCheck --check-prefix=USING-OMPSS-2-NODES %s
 // RUN: %clang %s -c -E -dM | FileCheck --check-prefix=NO-USING-OMPSS-2-NODES %s
 
-// RUN: %clang %s -c -E -dM -fompss-2=libnodes | FileCheck --check-prefix=USING-OMPSS-2-NANOS6 %s
+// RUN: %clang %s -c -E -dM -fompss-2=libnanos6 | FileCheck --check-prefix=USING-OMPSS-2-NANOS6 %s
 // RUN: %clang %s -c -E -dM | FileCheck --check-prefix=NO-USING-OMPSS-2-NANOS6 %s
 
+
+// USING-OMPSS-2: #define _OMPSS_2 1
+// NO-USING-OMPSS-2-NOT: #define _OMPSS_2
+
 // USING-OMPSS-2-NODES: #define _OMPSS_2
 // USING-OMPSS-2-NODES: #define _OMPSS_2_NODES 1
 // NO-USING-OMPSS-2-NODES-NOT: #define _OMPSS_2