[llvm] r320684 - [CodeGen] Move printing MO_Metadata operands to MachineOperand::print

[Francis Visoiu Mistrih via llvm-commits]

Author: thegameg
Date: Thu Dec 14 02:03:18 2017
New Revision: 320684

URL: http://llvm.org/viewvc/llvm-project?rev=320684&view=rev
Log:
[CodeGen] Move printing MO_Metadata operands to MachineOperand::print

Work towards the unification of MIR and debug output by refactoring the
interfaces.

Modified:
    llvm/trunk/lib/CodeGen/MIRPrinter.cpp
    llvm/trunk/lib/CodeGen/MachineOperand.cpp
    llvm/trunk/unittests/CodeGen/MachineOperandTest.cpp

Modified: llvm/trunk/lib/CodeGen/MIRPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MIRPrinter.cpp?rev=320684&r1=320683&r2=320684&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MIRPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/MIRPrinter.cpp Thu Dec 14 02:03:18 2017
@@ -798,7 +798,8 @@ void MIPrinter::print(const MachineInstr
   case MachineOperand::MO_JumpTableIndex:
   case MachineOperand::MO_ExternalSymbol:
   case MachineOperand::MO_GlobalAddress:
-  case MachineOperand::MO_RegisterLiveOut: {
+  case MachineOperand::MO_RegisterLiveOut:
+  case MachineOperand::MO_Metadata: {
     unsigned TiedOperandIdx = 0;
     if (ShouldPrintRegisterTies && Op.isReg() && Op.isTied() && !Op.isDef())
       TiedOperandIdx = Op.getParent()->findTiedOperandIdx(OpIdx);
@@ -830,9 +831,6 @@ void MIPrinter::print(const MachineInstr
       printCustomRegMask(Op.getRegMask(), OS, TRI);
     break;
   }
-  case MachineOperand::MO_Metadata:
-    Op.getMetadata()->printAsOperand(OS, MST);
-    break;
   case MachineOperand::MO_MCSymbol:
     OS << "<mcsymbol " << *Op.getMCSymbol() << ">";
     break;

Modified: llvm/trunk/lib/CodeGen/MachineOperand.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineOperand.cpp?rev=320684&r1=320683&r2=320684&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineOperand.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineOperand.cpp Thu Dec 14 02:03:18 2017
@@ -657,9 +657,7 @@ void MachineOperand::print(raw_ostream &
     break;
   }
   case MachineOperand::MO_Metadata:
-    OS << '<';
     getMetadata()->printAsOperand(OS, MST);
-    OS << '>';
     break;
   case MachineOperand::MO_MCSymbol:
     OS << "<MCSym=" << *getMCSymbol() << '>';

Modified: llvm/trunk/unittests/CodeGen/MachineOperandTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/CodeGen/MachineOperandTest.cpp?rev=320684&r1=320683&r2=320684&view=diff
==============================================================================
--- llvm/trunk/unittests/CodeGen/MachineOperandTest.cpp (original)
+++ llvm/trunk/unittests/CodeGen/MachineOperandTest.cpp Thu Dec 14 02:03:18 2017
@@ -289,4 +289,29 @@ TEST(MachineOperandTest, PrintRegisterLi
   ASSERT_TRUE(OS.str() == "liveout(<unknown>)");
 }
 
+TEST(MachineOperandTest, PrintMetadata) {
+  LLVMContext Ctx;
+  Module M("MachineOperandMDNodeTest", Ctx);
+  NamedMDNode *MD = M.getOrInsertNamedMetadata("namedmd");
+  ModuleSlotTracker DummyMST(&M);
+  Metadata *MDS = MDString::get(Ctx, "foo");
+  MDNode *Node = MDNode::get(Ctx, MDS);
+  MD->addOperand(Node);
+
+  // Create a MachineOperand with a metadata and print it.
+  MachineOperand MO = MachineOperand::CreateMetadata(Node);
+
+  // Checking some preconditions on the newly created
+  // MachineOperand.
+  ASSERT_TRUE(MO.isMetadata());
+  ASSERT_TRUE(MO.getMetadata() == Node);
+
+  std::string str;
+  // Print a MachineOperand containing a metadata node.
+  raw_string_ostream OS(str);
+  MO.print(OS, DummyMST, LLT{}, false, false, 0, /*TRI=*/nullptr,
+           /*IntrinsicInfo=*/nullptr);
+  ASSERT_TRUE(OS.str() == "!0");
+}
+
 } // end namespace