Change the Opcode enum for PHI nodes from "Instruction::PHINode" to "Instruction::PHI" to be more consistent with the other instructions.

llvm-svn: 9269

4 files changed, 7 insertions, 7 deletions

diff --git a/llvm/lib/Transforms/ExprTypeConvert.cpp b/llvm/lib/Transforms/ExprTypeConvert.cpp
index abf6e90a290..8408a297ab3 100644
--- a/llvm/lib/Transforms/ExprTypeConvert.cpp
+++ b/llvm/lib/Transforms/ExprTypeConvert.cpp
@@ -196,7 +196,7 @@ bool ExpressionConvertibleToType(Value *V, const Type *Ty,
       return false;
     break;                                     
   }
-  case Instruction::PHINode: {
+  case Instruction::PHI: {
     PHINode *PN = cast<PHINode>(I);
     for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
       if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD))
@@ -402,7 +402,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
     break;
   }
 
-  case Instruction::PHINode: {
+  case Instruction::PHI: {
     PHINode *OldPN = cast<PHINode>(I);
     PHINode *NewPN = new PHINode(Ty, Name);
 
@@ -808,7 +808,7 @@ static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
     }
     return false;
 
-  case Instruction::PHINode: {
+  case Instruction::PHI: {
     PHINode *PN = cast<PHINode>(I);
     for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
       if (!ExpressionConvertibleToType(PN->getIncomingValue(i), Ty, CTMap, TD))
@@ -1141,7 +1141,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
 #endif
     break;
 
-  case Instruction::PHINode: {
+  case Instruction::PHI: {
     PHINode *OldPN = cast<PHINode>(I);
     PHINode *NewPN = new PHINode(NewTy, Name);
     VMC.ExprMap[I] = NewPN;
diff --git a/llvm/lib/Transforms/IPO/MutateStructTypes.cpp b/llvm/lib/Transforms/IPO/MutateStructTypes.cpp
index 91302afbefc..736da63bebe 100644
--- a/llvm/lib/Transforms/IPO/MutateStructTypes.cpp
+++ b/llvm/lib/Transforms/IPO/MutateStructTypes.cpp
@@ -425,7 +425,7 @@ void MutateStructTypes::transformFunction(Function *m) {
       }
 
         // Miscellaneous Instructions
-      case Instruction::PHINode: {
+      case Instruction::PHI: {
         const PHINode &OldPN = cast<PHINode>(I);
         PHINode *PN = new PHINode(ConvertType(OldPN.getType()));
         for (unsigned i = 0; i < OldPN.getNumIncomingValues(); ++i)
diff --git a/llvm/lib/Transforms/Instrumentation/TraceValues.cpp b/llvm/lib/Transforms/Instrumentation/TraceValues.cpp
index f6bc4ceaac2..d4fa79c88fd 100644
--- a/llvm/lib/Transforms/Instrumentation/TraceValues.cpp
+++ b/llvm/lib/Transforms/Instrumentation/TraceValues.cpp
@@ -180,7 +180,7 @@ static inline bool TraceThisOpCode(unsigned opCode) {
   // 
   return (opCode  < Instruction::OtherOpsBegin &&
           opCode != Instruction::Alloca &&
-          opCode != Instruction::PHINode &&
+          opCode != Instruction::PHI &&
           opCode != Instruction::Cast);
 }
 
diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp
index c837f0bb6e9..7d34df48eb4 100644
--- a/llvm/lib/Transforms/Scalar/Reassociate.cpp
+++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp
@@ -75,7 +75,7 @@ unsigned Reassociate::getRank(Value *V) {
     // for PHI nodes, we cannot have infinite recursion here, because there
     // cannot be loops in the value graph that do not go through PHI nodes.
     //
-    if (I->getOpcode() == Instruction::PHINode ||
+    if (I->getOpcode() == Instruction::PHI ||
         I->getOpcode() == Instruction::Alloca ||
         I->getOpcode() == Instruction::Malloc || isa<TerminatorInst>(I) ||
         I->mayWriteToMemory())  // Cannot move inst if it writes to memory!