diff options
| -rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/tools/clang-format/clang-format.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 5e911b41b7c..a7898da14ff 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/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/clang/tools/clang-format/clang-format.py b/clang/tools/clang-format/clang-format.py index b07160eea6c..56a6e5d86bf 100644 --- a/clang/tools/clang-format/clang-format.py +++ b/clang/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') |
