Switch from MachineCodeForVMInstr model that is built into the VMCore library to an annotation based MAchineCodeForInstruction model

Instruction.cpp now has 0 lines of code generation related code in it.


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

1 files changed, 1 insertions, 28 deletions

diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index aa3beb3..50fdd44 100644
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -7,20 +7,13 @@
 #include "llvm/Instruction.h"
 #include "llvm/Method.h"
 #include "llvm/SymbolTable.h"
-#include "llvm/CodeGen/MachineInstr.h"
 
 Instruction::Instruction(const Type *ty, unsigned it, const std::string &Name) 
-  : User(ty, Value::InstructionVal, Name), 
-    machineInstrVec(new MachineCodeForVMInstr) {
+  : User(ty, Value::InstructionVal, Name) {
   Parent = 0;
   iType = it;
 }
 
-Instruction::~Instruction() {
-  assert(getParent() == 0 && "Instruction still embedded in basic block!");
-  delete machineInstrVec;
-}
-
 // Specialize setName to take care of symbol table majik
 void Instruction::setName(const std::string &name, SymbolTable *ST) {
   BasicBlock *P = 0; Method *PP = 0;
@@ -32,23 +25,3 @@ void Instruction::setName(const std::string &name, SymbolTable *ST) {
   Value::setName(name);
   if (PP && hasName()) PP->getSymbolTableSure()->insert(this);
 }
-
-void Instruction::addMachineInstruction(MachineInstr* minstr) {
-  machineInstrVec->push_back(minstr);
-}
-
-#if 0
-// Dont make this inline because you would need to include
-// MachineInstr.h in Instruction.h, which creates a circular
-// sequence of forward declarations.  Trying to fix that will
-// cause a serious circularity in link order.
-// 
-const std::vector<Value*> &Instruction::getTempValuesForMachineCode() const {
-  return machineInstrVec->getTempValues();
-}
-#endif
-
-void Instruction::dropAllReferences() {
-  machineInstrVec->dropAllReferences();
-  User::dropAllReferences();
-}