[llvm-commits] CVS: llvm/lib/Target/IA64/IA64TargetMachine.cpp IA64TargetMachine.h

[Jim Laskey]

Changes in directory llvm/lib/Target/IA64:

IA64TargetMachine.cpp updated: 1.20 -> 1.21
IA64TargetMachine.h updated: 1.14 -> 1.15
---
Log message:

1. Remove condition on delete.

2. Protect and outline createTargetAsmInfo.

3. Misc. kruft.


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

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


Index: llvm/lib/Target/IA64/IA64TargetMachine.cpp
diff -u llvm/lib/Target/IA64/IA64TargetMachine.cpp:1.20 llvm/lib/Target/IA64/IA64TargetMachine.cpp:1.21
--- llvm/lib/Target/IA64/IA64TargetMachine.cpp:1.20	Sun Sep  3 23:14:57 2006
+++ llvm/lib/Target/IA64/IA64TargetMachine.cpp	Thu Sep  7 18:39:26 2006
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "IA64TargetAsmInfo.h"
 #include "IA64TargetMachine.h"
 #include "IA64.h"
 #include "llvm/Module.h"
@@ -29,6 +30,10 @@
   RegisterTarget<IA64TargetMachine> X("ia64", "  IA-64 (Itanium)");
 }
 
+const TargetAsmInfo *IA64TargetMachine::createTargetAsmInfo() const {
+  return new IA64TargetAsmInfo(*this);
+}
+
 unsigned IA64TargetMachine::getModuleMatchQuality(const Module &M) {
   // we match [iI][aA]*64
   bool seenIA64=false;


Index: llvm/lib/Target/IA64/IA64TargetMachine.h
diff -u llvm/lib/Target/IA64/IA64TargetMachine.h:1.14 llvm/lib/Target/IA64/IA64TargetMachine.h:1.15
--- llvm/lib/Target/IA64/IA64TargetMachine.h:1.14	Thu Sep  7 17:06:40 2006
+++ llvm/lib/Target/IA64/IA64TargetMachine.h	Thu Sep  7 18:39:26 2006
@@ -19,7 +19,6 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "IA64InstrInfo.h"
 #include "IA64ISelLowering.h"
-#include "IA64TargetAsmInfo.h"
 
 namespace llvm {
 
@@ -29,6 +28,10 @@
   TargetFrameInfo    FrameInfo;
   //IA64JITInfo      JITInfo;
   IA64TargetLowering TLInfo;
+  
+protected:
+  virtual const TargetAsmInfo *createTargetAsmInfo() const;
+
 public:
   IA64TargetMachine(const Module &M, const std::string &FS);
 
@@ -42,10 +45,6 @@
   }
   virtual const TargetData       *getTargetData() const { return &DataLayout; }
   
-  virtual const TargetAsmInfo *createTargetAsmInfo() const {
-    return static_cast<const TargetAsmInfo *>(new IA64TargetAsmInfo(*this));
-  }
-
   static unsigned getModuleMatchQuality(const Module &M);
 
   // Pass Pipeline Configuration