This class is no longer an annotation

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

diff --git a/include/llvm/CodeGen/MachineCodeForInstruction.h b/include/llvm/CodeGen/MachineCodeForInstruction.h
index 213a736ff5e2a0d93a44ff34b2ed5047e3336aa0..32935bba280e0c01d1b4ea37582af2834dfd64a3 100644 (file)
--- a/include/llvm/CodeGen/MachineCodeForInstruction.h
+++ b/include/llvm/CodeGen/MachineCodeForInstruction.h
@@ -28,7 +28,6 @@
 #ifndef LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 #define LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 
-#include "Support/Annotation.h"
 #include <vector>
 
 namespace llvm {
@@ -38,14 +37,12 @@ class Instruction;
 class Value;
 class CallArgsDescriptor;
 
-extern AnnotationID MCFI_AID;
-
-class MachineCodeForInstruction : public Annotation {
+  class MachineCodeForInstruction {
   std::vector<Value*> tempVec;          // used by m/c instr but not VM instr
   std::vector<MachineInstr*> Contents;  // the machine instr for this VM instr
   CallArgsDescriptor* callArgsDesc;     // only used for CALL instructions
 public:
-  MachineCodeForInstruction() : Annotation(MCFI_AID), callArgsDesc(NULL) {}
+  MachineCodeForInstruction() : callArgsDesc(NULL) {}
   ~MachineCodeForInstruction();
   
   static MachineCodeForInstruction &get(const Instruction *I);

diff --git a/lib/Target/SparcV9/MachineCodeForInstruction.h b/lib/Target/SparcV9/MachineCodeForInstruction.h
index 213a736ff5e2a0d93a44ff34b2ed5047e3336aa0..32935bba280e0c01d1b4ea37582af2834dfd64a3 100644 (file)
--- a/lib/Target/SparcV9/MachineCodeForInstruction.h
+++ b/lib/Target/SparcV9/MachineCodeForInstruction.h
@@ -28,7 +28,6 @@
 #ifndef LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 #define LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H
 
-#include "Support/Annotation.h"
 #include <vector>
 
 namespace llvm {
@@ -38,14 +37,12 @@ class Instruction;
 class Value;
 class CallArgsDescriptor;
 
-extern AnnotationID MCFI_AID;
-
-class MachineCodeForInstruction : public Annotation {
+  class MachineCodeForInstruction {
   std::vector<Value*> tempVec;          // used by m/c instr but not VM instr
   std::vector<MachineInstr*> Contents;  // the machine instr for this VM instr
   CallArgsDescriptor* callArgsDesc;     // only used for CALL instructions
 public:
-  MachineCodeForInstruction() : Annotation(MCFI_AID), callArgsDesc(NULL) {}
+  MachineCodeForInstruction() : callArgsDesc(NULL) {}
   ~MachineCodeForInstruction();
   
   static MachineCodeForInstruction &get(const Instruction *I);