Refactor common initialization code in private init() functions.

[oota-llvm.git] / lib / VMCore / Instruction.cpp

diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index 9ca2fedbf4f83afecbb21af0ace6d1820231a42c..5ddf28435406b563a55e6b4ff141d3d44eb40c08 100644 (file)
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -15,17 +15,20 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
 #include "Support/LeakDetector.h"
+using namespace llvm;
 
-namespace llvm {
+void Instruction::init()
+{
+  // Make sure that we get added to a basicblock
+  LeakDetector::addGarbageObject(this);
+}
 
 Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name,
                          Instruction *InsertBefore)
-  : User(ty, Value::InstructionVal, Name) {
-  Parent = 0;
-  iType = it;
-
-  // Make sure that we get added to a basicblock
-  LeakDetector::addGarbageObject(this);
+  : User(ty, Value::InstructionVal, Name),
+    Parent(0),
+    iType(it) {
+  init();
 
   // If requested, insert this instruction into a basic block...
   if (InsertBefore) {
@@ -35,14 +38,26 @@ Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name,
   }
 }
 
+Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name,
+                         BasicBlock *InsertAtEnd)
+  : User(ty, Value::InstructionVal, Name),
+    Parent(0),
+    iType(it) {
+  init();
+
+  // append this instruction into the basic block
+  assert(InsertAtEnd && "Basic block to append to may not be NULL!");
+  InsertAtEnd->getInstList().push_back(this);
+}
+
 void Instruction::setParent(BasicBlock *P) {
-  if (getParent())
-    LeakDetector::addGarbageObject(this);
+  if (getParent()) {
+    if (!P) LeakDetector::addGarbageObject(this);
+  } else {
+    if (P) LeakDetector::removeGarbageObject(this);
+  }
 
   Parent = P;
-
-  if (getParent())
-    LeakDetector::removeGarbageObject(this);
 }
 
 // Specialize setName to take care of symbol table majik
@@ -98,6 +113,7 @@ const char *Instruction::getOpcodeName(unsigned OpCode) {
   // Other instructions...
   case PHI:     return "phi";
   case Cast:    return "cast";
+  case Select:  return "select";
   case Call:    return "call";
   case Shl:     return "shl";
   case Shr:     return "shr";
@@ -149,6 +165,22 @@ bool Instruction::isCommutative(unsigned op) {
   }
 }
 
+/// isRelational - Return true if the instruction is a Set* instruction:
+///
+bool Instruction::isRelational(unsigned op) {
+  switch (op) {
+  case SetEQ:
+  case SetNE:
+  case SetLT:
+  case SetGT:
+  case SetLE:
+  case SetGE:
+    return true;
+  }
+  return false;
+}
+
+
 
 /// isTrappingInstruction - Return true if the instruction may trap.
 ///
@@ -165,5 +197,3 @@ bool Instruction::isTrapping(unsigned op) {
     return false;
   }
 }
-
-} // End llvm namespace