summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/llvm/Instruction.h12
-rw-r--r--lib/VMCore/Instruction.cpp2
2 files changed, 9 insertions, 5 deletions
diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h
index fefc1a4..54dcf60 100644
--- a/include/llvm/Instruction.h
+++ b/include/llvm/Instruction.h
@@ -8,7 +8,6 @@
#ifndef LLVM_INSTRUCTION_H
#define LLVM_INSTRUCTION_H
-#include <vector>
#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<Value*>&
- 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 8b833cf..d5fe1c6 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() {