Rebased PNaCl localmods in LLVM to 223109

lib/CodeGen/AsmPrinter/DwarfDebug.cpp

 //===-- llvm/CodeGen/DwarfDebug.cpp - Dwarf Debug Framework ---------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains support for writing dwarf debug info into asm files.
@@ skipping 1249 matching lines @@
   TheCU.addRange(RangeSpan(FunctionBeginSym, FunctionEndSym));
 
   // Under -gmlt, skip building the subprogram if there are no inlined
   // subroutines inside it.
   if (TheCU.getCUNode().getEmissionKind() == DIBuilder::LineTablesOnly &&
       LScopes.getAbstractScopesList().empty() && !IsDarwin) {
     assert(InfoHolder.getScopeVariables().empty());
     assert(DbgValues.empty());
     // FIXME: This wouldn't be true in LTO with a -g (with inlining) CU followed
     // by a -gmlt CU. Add a test and remove this assertion.
-    assert(AbstractVariables.empty());
+    // @LOCALMOD-BEGIN -- The PNaCl IRT build does bitcode linking
+    // and mixes -g w/ -gmlt.
+    // https://code.google.com/p/nativeclient/issues/detail?id=4026
+    // assert(AbstractVariables.empty());
+    // @LOCALMOD-END
     LabelsBeforeInsn.clear();
     LabelsAfterInsn.clear();
     PrevLabel = nullptr;
     CurFn = nullptr;
     return;
   }
 
 #ifndef NDEBUG
   size_t NumAbstractScopes = LScopes.getAbstractScopesList().size();
 #endif
@@ skipping 929 matching lines @@
   AccelNamespace.AddName(Name, InfoHolder.getStringPool().getSymbol(*Asm, Name),
                          &Die);
 }
 
 void DwarfDebug::addAccelType(StringRef Name, const DIE &Die, char Flags) {
   if (!useDwarfAccelTables())
     return;
   AccelTypes.AddName(Name, InfoHolder.getStringPool().getSymbol(*Asm, Name),
                      &Die);
 }