[llvm-commits] CVS: llvm/lib/Target/Sparc/SparcTargetMachine.cpp SparcTargetMachine.h

[Jim Laskey]

Changes in directory llvm/lib/Target/Sparc:

SparcTargetMachine.cpp updated: 1.50 -> 1.51
SparcTargetMachine.h updated: 1.16 -> 1.17
---
Log message:

1. Remove condition on delete.

2. Protect and outline createTargetAsmInfo.

3. Misc. kruft.


---
Diffs of the changes:  (+9 -5)

 SparcTargetMachine.cpp |    5 +++++
 SparcTargetMachine.h   |    9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


Index: llvm/lib/Target/Sparc/SparcTargetMachine.cpp
diff -u llvm/lib/Target/Sparc/SparcTargetMachine.cpp:1.50 llvm/lib/Target/Sparc/SparcTargetMachine.cpp:1.51
--- llvm/lib/Target/Sparc/SparcTargetMachine.cpp:1.50	Sun Sep  3 23:14:57 2006
+++ llvm/lib/Target/Sparc/SparcTargetMachine.cpp	Thu Sep  7 18:39:26 2006
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "SparcTargetAsmInfo.h"
 #include "SparcTargetMachine.h"
 #include "Sparc.h"
 #include "llvm/Module.h"
@@ -23,6 +24,10 @@
   RegisterTarget<SparcTargetMachine> X("sparc", "  SPARC");
 }
 
+const TargetAsmInfo *SparcTargetMachine::createTargetAsmInfo() const {
+  return new SparcTargetAsmInfo(*this);
+}
+
 /// SparcTargetMachine ctor - Create an ILP32 architecture model
 ///
 SparcTargetMachine::SparcTargetMachine(const Module &M, const std::string &FS)


Index: llvm/lib/Target/Sparc/SparcTargetMachine.h
diff -u llvm/lib/Target/Sparc/SparcTargetMachine.h:1.16 llvm/lib/Target/Sparc/SparcTargetMachine.h:1.17
--- llvm/lib/Target/Sparc/SparcTargetMachine.h:1.16	Thu Sep  7 17:06:40 2006
+++ llvm/lib/Target/Sparc/SparcTargetMachine.h	Thu Sep  7 18:39:26 2006
@@ -19,7 +19,6 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "SparcInstrInfo.h"
 #include "SparcSubtarget.h"
-#include "SparcTargetAsmInfo.h"
 
 namespace llvm {
 
@@ -30,6 +29,10 @@
   SparcSubtarget Subtarget;
   SparcInstrInfo InstrInfo;
   TargetFrameInfo FrameInfo;
+  
+protected:
+  virtual const TargetAsmInfo *createTargetAsmInfo() const;
+  
 public:
   SparcTargetMachine(const Module &M, const std::string &FS);
 
@@ -42,10 +45,6 @@
   virtual const TargetData       *getTargetData() const { return &DataLayout; }
   static unsigned getModuleMatchQuality(const Module &M);
 
-  virtual const TargetAsmInfo *createTargetAsmInfo() const {
-    return static_cast<const TargetAsmInfo *>(new SparcTargetAsmInfo(*this));
-  }
-  
   // Pass Pipeline Configuration
   virtual bool addInstSelector(FunctionPassManager &PM, bool Fast);
   virtual bool addPreEmitPass(FunctionPassManager &PM, bool Fast);