diff --git a/llvm/lib/CodeGen/DwarfWriter.cpp b/llvm/lib/CodeGen/DwarfWriter.cpp
index 19b1d84..ab00a99 100644
--- a/llvm/lib/CodeGen/DwarfWriter.cpp
+++ b/llvm/lib/CodeGen/DwarfWriter.cpp
@@ -1626,15 +1626,13 @@
   CompileUnitDesc *UnitDesc = static_cast<CompileUnitDesc *>(SPD->getContext());
   CompileUnit *Unit = FindCompileUnit(UnitDesc);
   
-  // Generate the mangled name.
-  std::string MangledName = Asm->Mang->getValueName(MF->getFunction());
-  
   // Get the subprogram die.
   DIE *SPDie = Unit->getDieMapSlotFor(SPD);
   assert(SPDie && "Missing subprogram descriptor");
   
   // Add the function bounds.
-  SPDie->AddObjectLabel(DW_AT_low_pc, DW_FORM_addr, MangledName);
+  SPDie->AddLabel(DW_AT_low_pc, DW_FORM_addr,
+                  DWLabel("func_begin", SubprogramCount));
   SPDie->AddLabel(DW_AT_high_pc, DW_FORM_addr,
                   DWLabel("func_end", SubprogramCount));
   MachineLocation Location(RI->getFrameRegister(*MF));
@@ -2408,8 +2406,8 @@
   EmitDebugMacInfo();
 }
 
-/// BeginFunction - Gather pre-function debug information.
-///
+/// BeginFunction - Gather pre-function debug information.  Assumes being 
+/// emitted immediately after the function entry point.
 void DwarfWriter::BeginFunction(MachineFunction *MF) {
   this->MF = MF;
   
@@ -2419,8 +2417,7 @@
   if (!ShouldEmitDwarf()) return;
   EOL("Dwarf Begin Function");
   
-  // Define begin label for subprogram.
-  Asm->SwitchSection(TextSection, 0);
+  // Assumes in correct section after the entry point.
   EmitLabel("func_begin", ++SubprogramCount);
 }