Sync commit: Add OmpSs pass to clang pass builder when '-fompss-2'

Author: mikaoP

clang/lib/CodeGen/BackendUtil.cpp

@@ -58,6 +58,7 @@
 #include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
 #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
 #include "llvm/Transforms/ObjCARC.h"
+#include "llvm/Transforms/OmpSs.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Scalar/GVN.h"
 #include "llvm/Transforms/Utils.h"
@@ -165,6 +166,10 @@ class PassManagerBuilderWrapper : public PassManagerBuilder {
 };
 }
 
+static void addOmpSsPass(const PassManagerBuilder &Builder, PassManagerBase &PM) {
+  PM.add(createOmpSsPass());
+}
+
 static void addObjCARCAPElimPass(const PassManagerBuilder &Builder, PassManagerBase &PM) {
   if (Builder.OptLevel > 0)
     PM.add(createObjCARCAPElimPass());
@@ -564,6 +569,11 @@ void EmitAssemblyHelper::CreatePasses(legacy::PassManager &MPM,
   if (TM)
     TM->adjustPassManager(PMBuilder);
 
+  if (LangOpts.OmpSs) {
+    PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
+                           addOmpSsPass);
+  }
+
   if (CodeGenOpts.DebugInfoForProfiling ||
       !CodeGenOpts.SampleProfileFile.empty())
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,

clang/tools/driver/CMakeLists.txt

@@ -11,6 +11,7 @@ set( LLVM_LINK_COMPONENTS
   MCParser
   ObjCARCOpts
   Option
+  OmpSs
   ScalarOpts
   Support
   TransformUtils