From cfd910ebc459776c326b1bdb47e25ae056a6c734 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Tue, 19 Jan 2010 04:53:18 +0000
Subject: [PATCH] some cleanups

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@93853 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp |  6 ++--
 lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp | 35 +++++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index 4485ad75efc..3272c7b7722 100644
--- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -1173,11 +1173,9 @@ void ARMAsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
   const Type *Type = C->getType();
   unsigned Size = TD->getTypeAllocSize(Type);
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
-  bool isDarwin = Subtarget->isTargetDarwin();
-
   printVisibility(GVarSym, GVar->getVisibility());
 
-  if (Subtarget->isTargetELF())
+  if (MAI->hasDotTypeDotSizeDirective())
     O << "\t.type " << *GVarSym << ",%object\n";
 
   SectionKind GVKind = TargetLoweringObjectFile::getKindForGlobal(GVar, TM);
@@ -1243,7 +1241,7 @@ void ARMAsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
   case GlobalValue::WeakAnyLinkage:
   case GlobalValue::WeakODRLinkage:
   case GlobalValue::LinkerPrivateLinkage:
-    if (isDarwin) {
+    if (Subtarget->isTargetDarwin()) {
       O << "\t.globl " << *GVarSym
         << "\n\t.weak_definition " << *GVarSym << "\n";
     } else {
diff --git a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index 14deafe65a4..bb7647a5eea 100644
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -647,29 +647,32 @@ void X86AsmPrinter::printMachineInstruction(const MachineInstr *MI) {
 }
 
 void X86AsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
-
   MCSymbol *GVarSym = GetGlobalValueSymbol(GVar);
-  Constant *C = GVar->getInitializer();
-  const Type *Type = C->getType();
-  
-  const TargetData *TD = TM.getTargetData();
-  unsigned Size = TD->getTypeAllocSize(Type);
-  unsigned Align = TD->getPreferredAlignmentLog(GVar);
-
   printVisibility(GVarSym, GVar->getVisibility());
 
-  if (MAI->hasDotTypeDotSizeDirective())
-    O << "\t.type\t" << *GVarSym << ",@object\n";
+  if (MAI->hasDotTypeDotSizeDirective()) {
+    O << "\t.type\t" << *GVarSym;
+    if (MAI->getCommentString()[0] != '@')
+      O << ",@object\n";
+    else
+      O << ",%object\n";
+  }
   
   SectionKind GVKind = TargetLoweringObjectFile::getKindForGlobal(GVar, TM);
 
+  const Type *Type = GVar->getType()->getElementType();
+  
+  const TargetData *TD = TM.getTargetData();
+  unsigned Size = TD->getTypeAllocSize(Type);
+  unsigned AlignLog = TD->getPreferredAlignmentLog(GVar);
+  
   // Handle normal common symbols.
   if (GVKind.isCommon()) {
     if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
     
     O << ".comm " << *GVarSym << ',' << Size;
     if (MAI->getCOMMDirectiveTakesAlignment())
-      O << ',' << (MAI->getAlignmentIsInBytes() ? (1 << Align) : Align);
+      O << ',' << (MAI->getAlignmentIsInBytes() ? (1 << AlignLog) : AlignLog);
     
     if (VerboseAsm) {
       O << "\t\t" << MAI->getCommentString() << " '";
@@ -687,14 +690,14 @@ void X86AsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
       if (GVar->hasLocalLinkage()) {
         O << LComm << *GVarSym << ',' << Size;
         if (MAI->getLCOMMDirectiveTakesAlignment())
-          O << ',' << Align;
+          O << ',' << AlignLog;
       }
     } else {
       if (!Subtarget->isTargetCygMing())
         O << "\t.local\t" << *GVarSym << '\n';
       O << MAI->getCOMMDirective() << *GVarSym << ',' << Size;
       if (MAI->getCOMMDirectiveTakesAlignment())
-        O << ',' << (MAI->getAlignmentIsInBytes() ? (1 << Align) : Align);
+        O << ',' << (MAI->getAlignmentIsInBytes() ? (1 << AlignLog) : AlignLog);
     }
     if (VerboseAsm) {
       O.PadToColumn(MAI->getCommentColumn());
@@ -714,7 +717,7 @@ void X86AsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
     // .globl _foo
     OutStreamer.EmitSymbolAttribute(GVarSym, MCStreamer::Global);
     // .zerofill __DATA, __common, _foo, 400, 5
-    OutStreamer.EmitZerofill(TheSection, GVarSym, Size, 1 << Align);
+    OutStreamer.EmitZerofill(TheSection, GVarSym, Size, 1 << AlignLog);
     return;
   }
 
@@ -751,7 +754,7 @@ void X86AsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
     llvm_unreachable("Unknown linkage type!");
   }
 
-  EmitAlignment(Align, GVar);
+  EmitAlignment(AlignLog, GVar);
   O << *GVarSym << ":";
   if (VerboseAsm){
     O.PadToColumn(MAI->getCommentColumn());
@@ -760,7 +763,7 @@ void X86AsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
   }
   O << '\n';
 
-  EmitGlobalConstant(C);
+  EmitGlobalConstant(GVar->getInitializer());
 
   if (MAI->hasDotTypeDotSizeDirective())
     O << "\t.size\t" << *GVarSym << ", " << Size << '\n';