<div dir="ltr">ASTReaderDecl not submitted intentionally. Reverted in r235163.</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Apr 17, 2015 at 9:59 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Fri Apr 17 02:59:19 2015<br>
New Revision: 235162<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=235162&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=235162&view=rev</a><br>
Log:<br>
clang-format: Add default fallback style.<br>
<br>
Thanks to Michael Schlottke.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Serialization/ASTReaderDecl.cpp<br>
    cfe/trunk/tools/clang-format/clang-format.py<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTReaderDecl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=235162&r1=235161&r2=235162&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=235162&r1=235161&r2=235162&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTReaderDecl.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTReaderDecl.cpp Fri Apr 17 02:59:19 2015<br>
@@ -3364,7 +3364,7 @@ namespace {<br>
         searchForID(M, SearchDecls[I]);<br>
       // FIXME: If none of the SearchDecls had local IDs in this module, can<br>
       // we avoid searching any ancestor module files?<br>
-      return false;<br>
+      return Deserialized.empty();<br>
     }<br>
<br>
     ArrayRef<Decl *> getChain() const {<br>
<br>
Modified: cfe/trunk/tools/clang-format/clang-format.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/clang-format.py?rev=235162&r1=235161&r2=235162&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/clang-format.py?rev=235162&r1=235161&r2=235162&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/tools/clang-format/clang-format.py (original)<br>
+++ cfe/trunk/tools/clang-format/clang-format.py Fri Apr 17 02:59:19 2015<br>
@@ -34,6 +34,7 @@ if vim.eval('exists("g:clang_format_path<br>
 # a '.clang-format' or '_clang-format' file to indicate the style that should be<br>
 # used.<br>
 style = 'file'<br>
+fallback_style = None<br>
 if vim.eval('exists("g:clang_format_fallback_style")') == "1":<br>
   fallback_style = vim.eval('g:clang_format_fallback_style')<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>