Dang, I screwed up the merge. This should be better

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@785 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index b2074726a3d6b13b329263bd7ef140235a1fb125..2c5a337b2ccc1afde1cd2ad009276c0e69db42ec 100644 (file)
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -261,12 +261,12 @@ public:
                                         unsigned       numOperands,
                                         OpCodeMask    _opCodeMask = 0x0);
   inline               ~MachineInstr   () {}
-  const MachineOpCode  getOpCode       () const;
+  const MachineOpCode  getOpCode       () const { return opCode; }
 
   //
   // Information about explicit operands of the instruction
   // 
-  unsigned int         getNumOperands  () const;
+  unsigned int         getNumOperands  () const { return operands.size(); }
   
   bool                 operandIsDefined(unsigned int i) const;