Rebased PNaCl localmods in LLVM to 223109

lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 230ea4651823631335ccda2866af90d9ac41b5e0..46cb2eaa29105c96f3c61453d9e303962d9b4565 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -1267,7 +1267,11 @@ void DwarfDebug::endFunction(const MachineFunction *MF) {
     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;