2 files changed, 8 insertions, 4 deletions
diff --git a/llvm/lib/Target/TargetAsmInfo.cpp b/llvm/lib/Target/TargetAsmInfo.cpp
index 6d2f6437bb0..35099f58548 100644
--- a/llvm/lib/Target/TargetAsmInfo.cpp
+++ b/llvm/lib/Target/TargetAsmInfo.cpp
@@ -167,7 +167,6 @@ TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
   bool isThreadLocal = GVar->isThreadLocal();
   assert(GVar && "Invalid global value for section selection");
 
-  SectionKind::Kind kind;
   if (isSuitableForBSS(GVar)) {
     // Variable can be easily put to BSS section.
     return (isThreadLocal ? SectionKind::ThreadBSS : SectionKind::BSS);
@@ -177,14 +176,14 @@ TargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
     // note, there is no thread-local r/o section.
     Constant *C = GVar->getInitializer();
     if (C->ContainsRelocations())
-      kind = SectionKind::ROData;
+      return SectionKind::ROData;
     else {
       const ConstantArray *CVA = dyn_cast<ConstantArray>(C);
       // Check, if initializer is a null-terminated string
       if (CVA && CVA->isCString())
-        kind = SectionKind::RODataMergeStr;
+        return SectionKind::RODataMergeStr;
       else
-        kind = SectionKind::RODataMergeConst;
+        return SectionKind::RODataMergeConst;
     }
   }
 
diff --git a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
index a61bb2261d6..4a9002c13b4 100644
--- a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
@@ -32,6 +32,8 @@
 #include "llvm/Target/TargetOptions.h"
 using namespace llvm;
 
+#include <iostream>
+
 STATISTIC(EmittedInsts, "Number of machine instrs printed");
 
 static std::string getPICLabelString(unsigned FnNum,
@@ -772,6 +774,9 @@ void X86ATTAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) {
   if (!GVar->hasInitializer())
     return;   // External global require no code
 
+  GVar->dump();
+  std::cout << TAI->SectionForGlobal(GVar) << std::endl;
+
   // Check to see if this is a special global used by LLVM, if so, emit it.
   if (EmitSpecialLLVMGlobal(GVar)) {
     if (Subtarget->isTargetDarwin() &&