diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h index fefc1a4ff1b..54dcf603ef6 100644 --- a/include/llvm/Instruction.h +++ b/include/llvm/Instruction.h @@ -8,7 +8,6 @@ #ifndef LLVM_INSTRUCTION_H #define LLVM_INSTRUCTION_H -#include #include "llvm/User.h" class Type; @@ -48,10 +47,13 @@ public: inline const BasicBlock *getParent() const { return Parent; } inline BasicBlock *getParent() { return Parent; } virtual bool hasSideEffects() const { return false; } // Memory & Call insts - inline MachineCodeForVMInstr& - getMachineInstrVec() { return *machineInstrVec; } - const vector& - getTempValuesForMachineCode() const; + + // --------------------------------------------------------------------------- + // Machine code accessors... + // + inline MachineCodeForVMInstr &getMachineInstrVec() { + return *machineInstrVec; + } // --------------------------------------------------------------------------- // Subclass classification... getInstType() returns a member of diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp index 8b833cf4bb7..d5fe1c68e3e 100644 --- a/lib/VMCore/Instruction.cpp +++ b/lib/VMCore/Instruction.cpp @@ -38,6 +38,7 @@ 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 @@ -48,6 +49,7 @@ Instruction::getTempValuesForMachineCode() const { return machineInstrVec->getTempValues(); } +#endif void Instruction::dropAllReferences() {