From: Daniel Jasper <djasper@google.com>
Date: Fri, 17 Apr 2015 07:59:19 +0000 (+0000)
Subject: clang-format: Add default fallback style.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab97523e404de1fa48ac3e1919582f2ac99b0ff0;p=clang

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 5e911b41b7..a7898da14f 100644
--- 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 b07160eea6..56a6e5d86b 100644
--- 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')