From: Eric Christopher <echristo@gmail.com>
Date: Thu, 2 Jan 2014 21:03:28 +0000 (+0000)
Subject: Fix up a couple of review comments:
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e151788aae061cc4ec3a7bb76a7cb5b72edc046e;p=oota-llvm.git

Fix up a couple of review comments:

Use an if statement instead of a pair of ternary operators checking
the same condition.
Use a cheap method call rather than returning the local symbol.

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

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index acb25ccaaf1..aa2a1f75708 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -822,14 +822,14 @@ DwarfCompileUnit *DwarfDebug::constructDwarfCompileUnit(DICompileUnit DIUnit) {
   if (!FirstCU)
     FirstCU = NewCU;
 
-  NewCU->initSection(
-      useSplitDwarf() ? Asm->getObjFileLowering().getDwarfInfoDWOSection()
-                      : Asm->getObjFileLowering().getDwarfInfoSection(),
-      useSplitDwarf() ? DwarfInfoDWOSectionSym : DwarfInfoSectionSym);
-
-  // If we're splitting the dwarf then construct the skeleton CU now.
-  if (useSplitDwarf())
+  if (useSplitDwarf()) {
+    NewCU->initSection(Asm->getObjFileLowering().getDwarfInfoDWOSection(),
+                       DwarfInfoDWOSectionSym);
+    // If we're splitting the dwarf then construct the skeleton CU now.
     NewCU->setSkeleton(constructSkeletonCU(NewCU));
+  } else
+    NewCU->initSection(Asm->getObjFileLowering().getDwarfInfoSection(),
+                       DwarfInfoSectionSym);
 
   CUMap.insert(std::make_pair(DIUnit, NewCU));
   CUDieMap.insert(std::make_pair(Die, NewCU));
diff --git a/lib/CodeGen/AsmPrinter/DwarfUnit.h b/lib/CodeGen/AsmPrinter/DwarfUnit.h
index 808c9c25ed3..524cdc1b59f 100644
--- a/lib/CodeGen/AsmPrinter/DwarfUnit.h
+++ b/lib/CodeGen/AsmPrinter/DwarfUnit.h
@@ -185,7 +185,7 @@ public:
   MCSymbol *getLocalSectionSym() const {
     if (Skeleton)
       return Skeleton->getSectionSym();
-    return SectionSym;
+    return getSectionSym();
   }
 
   MCSymbol *getSectionSym() const {
@@ -198,7 +198,7 @@ public:
   MCSymbol *getLocalLabelBegin() const {
     if (Skeleton)
       return Skeleton->getLabelBegin();
-    return LabelBegin;
+    return getLabelBegin();
   }
 
   MCSymbol *getLabelBegin() const {