[PM] Actually nest pass managers correctly when parsing the pass

pipeline string. Add tests that cover this now that we have execution
dumping in the pass managers.

llvm-svn: 199005

1 files changed, 7 insertions, 1 deletions

diff --git a/llvm/tools/opt/Passes.cpp b/llvm/tools/opt/Passes.cpp
index d58acaf1f6d..44b3acee593 100644
--- a/llvm/tools/opt/Passes.cpp
+++ b/llvm/tools/opt/Passes.cpp
@@ -51,11 +51,17 @@ static bool parseModulePassPipeline(ModulePassManager &MPM,
   for (;;) {
     // Parse nested pass managers by recursing.
     if (PipelineText.startswith("module(")) {
+      ModulePassManager NestedMPM;
+
+      // Parse the inner pipeline into the nested manager.
       PipelineText = PipelineText.substr(strlen("module("));
-      if (!parseModulePassPipeline(MPM, PipelineText))
+      if (!parseModulePassPipeline(NestedMPM, PipelineText))
         return false;
       assert(!PipelineText.empty() && PipelineText[0] == ')');
       PipelineText = PipelineText.substr(1);
+
+      // Now add the nested manager as a module pass.
+      MPM.addPass(NestedMPM);
     } else {
       // Otherwise try to parse a pass name.
       size_t End = PipelineText.find_first_of(",)");