From 4e7244e68e617f6ba23e547fdf2593eeee2af8f2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 27 Jun 2004 18:52:17 +0000 Subject: [PATCH] Do not find these ugly sparc-specific objects by using the annotation API on instructions. Instead, keep a map of instructions -> MCFI objects in the already sparc-specific class MachineFunctionInfo. This will slow down the sparc backend a bit, but it does not penalize the rest of LLVM! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14438 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/MachineCodeForInstruction.cpp | 28 ++++++----------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/lib/CodeGen/MachineCodeForInstruction.cpp b/lib/CodeGen/MachineCodeForInstruction.cpp index d6094cef409..c50c8b8c6ae 100644 --- a/lib/CodeGen/MachineCodeForInstruction.cpp +++ b/lib/CodeGen/MachineCodeForInstruction.cpp @@ -23,36 +23,22 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "llvm/Function.h" #include "llvm/CodeGen/MachineInstr.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineFunctionInfo.h" #include "../Target/SparcV9/MachineInstrAnnot.h" -#include "llvm/Instruction.h" using namespace llvm; MachineCodeForInstruction &MachineCodeForInstruction::get(const Instruction *I){ - return *(MachineCodeForInstruction*)I->getOrCreateAnnotation(MCFI_AID); + MachineFunction &MF = MachineFunction::get(I->getParent()->getParent()); + return MF.getInfo()->MCFIEntries[I]; } void MachineCodeForInstruction::destroy(const Instruction *I) { - I->deleteAnnotation(MCFI_AID); + MachineFunction &MF = MachineFunction::get(I->getParent()->getParent()); + MF.getInfo()->MCFIEntries.erase(I); } - - -AnnotationID llvm::MCFI_AID( - AnnotationManager::getID("CodeGen::MachineCodeForInstruction")); - -static Annotation *CreateMCFI(AnnotationID AID, const Annotable *, void *) { - assert(AID == MCFI_AID); - return new MachineCodeForInstruction(); // Invoke constructor! -} - -// Register the annotation with the annotation factory -static struct MCFIInitializer { - MCFIInitializer() { - AnnotationManager::registerAnnotationFactory(MCFI_AID, &CreateMCFI); - } -} RegisterCreateMCFI; - - void MachineCodeForInstruction::dropAllReferences() {