Rebased PNaCl localmods in LLVM to 223109

lib/CodeGen/LexicalScopes.cpp

 //===- LexicalScopes.cpp - Collecting lexical scope info ------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements LexicalScopes analysis.
@@ skipping 158 matching lines @@
   if (D.isLexicalBlock())
     Parent = getOrCreateLexicalScope(DebugLoc::getFromDILexicalBlock(Scope));
   // FIXME: Use forward_as_tuple instead of make_tuple, once MSVC2012
   // compatibility is no longer required.
   I = LexicalScopeMap.emplace(std::piecewise_construct, std::make_tuple(Scope),
                               std::make_tuple(Parent, DIDescriptor(Scope),
                                               nullptr, false)).first;
 
   if (!Parent) {
     assert(DIDescriptor(Scope).isSubprogram());
-    assert(DISubprogram(Scope).describes(MF->getFunction()));
-    assert(!CurrentFnLexicalScope);
+    // @LOCALMOD-BEGIN
+    // This currently asserts when mixing -g and -g0 compilation
+    // units + LTO. Debug info from a few inlined functions are not
+    // marked as inline, so we end up in getOrCreateRegularScope
+    // instead of getOrCreateInlinedScope.
+    // This is reproducible w/ the pnacl-llc.nexe build and
+    // setting the env var PNACL_PRUNE=false.
+    // https://code.google.com/p/nativeclient/issues/detail?id=4026
+    //assert(DISubprogram(Scope).describes(MF->getFunction()));
+    //assert(!CurrentFnLexicalScope);
+    // @LOCALMOD-END
     CurrentFnLexicalScope = &I->second;
   }
 
   return &I->second;
 }
 
 /// getOrCreateInlinedScope - Find or create an inlined lexical scope.
 LexicalScope *LexicalScopes::getOrCreateInlinedScope(MDNode *ScopeNode,
                                                      MDNode *InlinedAt) {
   std::pair<const MDNode*, const MDNode*> P(ScopeNode, InlinedAt);
@@ skipping 156 matching lines @@
   if (AbstractScope)
     err << std::string(Indent, ' ') << "Abstract Scope\n";
 
   if (!Children.empty())
     err << std::string(Indent + 2, ' ') << "Children ...\n";
   for (unsigned i = 0, e = Children.size(); i != e; ++i)
     if (Children[i] != this)
       Children[i]->dump(Indent + 2);
 #endif
 }