[SandboxVec][PassManager][NFC] Fix PM printing

It currently prints '(' instead of '<'. This patch fixes it.

Author: Vasileios Porpodas

llvm/include/llvm/SandboxIR/PassManager.h

@@ -58,6 +58,11 @@ class PassManager : public ParentPass {
     Passes.push_back(std::move(Pass));
   }
 
+  static constexpr const char EndToken = '\0';
+  static constexpr const char BeginArgsToken = '<';
+  static constexpr const char EndArgsToken = '>';
+  static constexpr const char PassDelimToken = ',';
+
   /// Parses \p Pipeline as a comma-separated sequence of pass names and sets
   /// the pass pipeline, using \p CreatePass to instantiate passes by name.
   ///
@@ -74,11 +79,6 @@ class PassManager : public ParentPass {
   /// An empty args string is treated the same as no args, so "pass" and
   /// "pass<>" are equivalent.
   void setPassPipeline(StringRef Pipeline, CreatePassFunc CreatePass) {
-    static constexpr const char EndToken = '\0';
-    static constexpr const char BeginArgsToken = '<';
-    static constexpr const char EndArgsToken = '>';
-    static constexpr const char PassDelimToken = ',';
-
     assert(Passes.empty() &&
            "setPassPipeline called on a non-empty sandboxir::PassManager");
 
@@ -183,10 +183,10 @@ class PassManager : public ParentPass {
 #ifndef NDEBUG
   void print(raw_ostream &OS) const override {
     OS << this->getName();
-    OS << "(";
-    // TODO: This should call Pass->print(OS) because Pass may be a PM.
-    interleave(Passes, OS, [&OS](auto &Pass) { OS << Pass->getName(); }, ",");
-    OS << ")";
+    OS << BeginArgsToken;
+    std::string Delim(1, PassDelimToken);
+    interleave(Passes, OS, [&OS](auto &Pass) { Pass->print(OS); }, Delim);
+    OS << EndArgsToken;
   }
   LLVM_DUMP_METHOD void dump() const override {
     print(dbgs());

llvm/unittests/SandboxIR/PassTest.cpp

@@ -197,7 +197,7 @@ define void @foo() {
   std::string Buff;
   llvm::raw_string_ostream SS(Buff);
   FPM.print(SS);
-  EXPECT_EQ(Buff, "test-fpm(test-pass1,test-pass2)");
+  EXPECT_EQ(Buff, "test-fpm<test-pass1,test-pass2>");
 #endif // NDEBUG
 }
 
@@ -256,7 +256,7 @@ define i8 @foo(i8 %v0, i8 %v1) {
   std::string Buff;
   llvm::raw_string_ostream SS(Buff);
   RPM.print(SS);
-  EXPECT_EQ(Buff, "test-rpm(test-pass1,test-pass2)");
+  EXPECT_EQ(Buff, "test-rpm<test-pass1,test-pass2>");
 #endif // NDEBUG
 }