clang-format: Add default fallback style.

Thanks to Michael Schlottke.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@235162 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index 5e911b41b7c43707b3ca4c8a446c2aff79fe56c5..a7898da14ff233d1be0ff2a22d4ed775a1f9afc7 100644 (file)
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -3364,7 +3364,7 @@ namespace {
         searchForID(M, SearchDecls[I]);
       // FIXME: If none of the SearchDecls had local IDs in this module, can
       // we avoid searching any ancestor module files?
-      return false;
+      return Deserialized.empty();
     }
     
     ArrayRef<Decl *> getChain() const {

diff --git a/tools/clang-format/clang-format.py b/tools/clang-format/clang-format.py
index b07160eea6cb23b754c4d263c9d3e99ae19bbdf8..56a6e5d86bf43421dbd5d155851e27b1f5e6781e 100644 (file)
--- a/tools/clang-format/clang-format.py
+++ b/tools/clang-format/clang-format.py
@@ -34,6 +34,7 @@ if vim.eval('exists("g:clang_format_path")') == "1":
 # a '.clang-format' or '_clang-format' file to indicate the style that should be
 # used.
 style = 'file'
+fallback_style = None
 if vim.eval('exists("g:clang_format_fallback_style")') == "1":
   fallback_style = vim.eval('g:clang_format_fallback_style')