Revert an unneeded interface change to Instruction.h

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

diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index 1d863483e0c13c75a19c657d5bb1cd16a37fd2b5..86f2a056cb975df4055ed6213d559536375f174a 100644 (file)
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -95,8 +95,6 @@ public:
     return isTerminator(iType);
   }
 
-  static inline bool isPhiNode(unsigned OpCode) { return OpCode == PHI; }
-
   inline bool isBinaryOp() const {
     return iType >= BinaryOpsBegin && iType < BinaryOpsEnd;
   }

diff --git a/lib/Bytecode/Analyzer/Analyzer.cpp b/lib/Bytecode/Analyzer/Analyzer.cpp
index 3500ed09ea04bfa0ef752fcd0c2fbf6edae09c8e..d8e75957bbefcce27c863b7101277098b331fcc1 100644 (file)
--- a/lib/Bytecode/Analyzer/Analyzer.cpp
+++ b/lib/Bytecode/Analyzer/Analyzer.cpp
@@ -191,7 +191,7 @@ public:
     bca.numOperands += Operands.size();
     if ( currFunc ) {
       currFunc->numInstructions++;
-      if ( Instruction::isPhiNode(Opcode) ) currFunc->numPhis++;
+      if ( Opcode == Instruction::PHI ) currFunc->numPhis++;
     }
     return Instruction::isTerminator(Opcode); 
   }

diff --git a/lib/Bytecode/Reader/Analyzer.cpp b/lib/Bytecode/Reader/Analyzer.cpp
index 3500ed09ea04bfa0ef752fcd0c2fbf6edae09c8e..d8e75957bbefcce27c863b7101277098b331fcc1 100644 (file)
--- a/lib/Bytecode/Reader/Analyzer.cpp
+++ b/lib/Bytecode/Reader/Analyzer.cpp
@@ -191,7 +191,7 @@ public:
     bca.numOperands += Operands.size();
     if ( currFunc ) {
       currFunc->numInstructions++;
-      if ( Instruction::isPhiNode(Opcode) ) currFunc->numPhis++;
+      if ( Opcode == Instruction::PHI ) currFunc->numPhis++;
     }
     return Instruction::isTerminator(Opcode); 
   }