From: Eric Christopher <echristo@gmail.com>
Date: Sat, 11 Jan 2014 00:28:12 +0000 (+0000)
Subject: Revert r198979 - accidental commit.
X-Git-Tag: android-x86-7.1-r4~66176
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=babad8b46e5cc841592d8bb26552b0683d41cd6d;p=android-x86%2Fexternal-llvm.git

Revert r198979 - accidental commit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198981 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 9a21595a435..f2cc172efa7 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -168,9 +168,8 @@ DIType DbgVariable::getType() const {
 
 } // end llvm namespace
 
-/// Return Dwarf Version by checking module flags and returning
-/// the default version otherwise.
-static unsigned getDwarfVersion(const Module *M) {
+/// Return Dwarf Version by checking module flags.
+static unsigned getDwarfVersionFromModule(const Module *M) {
   Value *Val = M->getModuleFlag("Dwarf Version");
   if (!Val)
     return dwarf::DWARF_VERSION;
@@ -210,8 +209,9 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M)
   else
     HasDwarfPubSections = DwarfPubSections == Enable;
 
-  DwarfVersion = DwarfVersionNumber ? DwarfVersionNumber
-                                    : getDwarfVersion(MMI->getModule());
+  DwarfVersion = DwarfVersionNumber
+                     ? DwarfVersionNumber
+                     : getDwarfVersionFromModule(MMI->getModule());
 
   {
     NamedRegionTimer T(DbgTimerName, DWARFGroupName, TimePassesIsEnabled);