diff options
author | Yi Kong <yikong@google.com> | 2022-04-27 16:48:00 +0800 |
---|---|---|
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-04-28 04:22:48 +0000 |
commit | f5116e26b4527acaa75b7be08d8408d4bb6661bb (patch) | |
tree | 16c0ddf43ce774917dd98d2dab93f0127cb8d553 | |
parent | 5ca2ae2a5f9f53fd5899fd8c94e4c17ffa44fec3 (diff) | |
download | linux-x86-f5116e26b4527acaa75b7be08d8408d4bb6661bb.tar.gz |
Update clang-stable to clang-r450784d
Bug: 219872355
Test: presubmit
Change-Id: I6be8742aafc1e8724b4152926cac85b005610f8d
(cherry picked from commit 6fbdb94dfed101f9abadc52370ed135a4e523085)
Merged-In: I6be8742aafc1e8724b4152926cac85b005610f8d
-rw-r--r-- | clang-stable/README.md | 2 | ||||
-rwxr-xr-x | clang-stable/bin/clang-format | bin | 2228728 -> 2182304 bytes | |||
-rwxr-xr-x | clang-stable/bin/git-clang-format | 12 | ||||
-rw-r--r-- | clang-stable/lib64/libc++.so.1 | bin | 1358248 -> 2015128 bytes | |||
-rw-r--r-- | clang-stable/lib64/libclang.so.13 | bin | 75906408 -> 107299800 bytes | |||
-rwxr-xr-x | clang-stable/share/clang/clang-format-diff.py | 4 |
6 files changed, 13 insertions, 5 deletions
diff --git a/clang-stable/README.md b/clang-stable/README.md index 8e2a175aa..f65acd7ed 100644 --- a/clang-stable/README.md +++ b/clang-stable/README.md @@ -1 +1 @@ -All contents in clang-stable are copies of clang-r445002. +All contents in clang-stable are copies of clang-r450784d. diff --git a/clang-stable/bin/clang-format b/clang-stable/bin/clang-format Binary files differindex ddc8f9d79..149ffed7c 100755 --- a/clang-stable/bin/clang-format +++ b/clang-stable/bin/clang-format diff --git a/clang-stable/bin/git-clang-format b/clang-stable/bin/git-clang-format index ca0b32ce5..268e4dd14 100755 --- a/clang-stable/bin/git-clang-format +++ b/clang-stable/bin/git-clang-format @@ -79,6 +79,7 @@ def main(): 'm', # ObjC 'mm', # ObjC++ 'cc', 'cp', 'cpp', 'c++', 'cxx', 'hh', 'hpp', 'hxx', # C++ + 'ccm', 'cppm', 'cxxm', 'c++m', # C++ Modules 'cu', 'cuh', # CUDA # Other languages that clang-format supports 'proto', 'protodevel', # Protocol Buffers @@ -160,10 +161,12 @@ def main(): print('Running clang-format on the following files:') for filename in changed_lines: print(' %s' % filename) + if not changed_lines: if opts.verbose >= 0: print('no modified files to format') - return + return 0 + if len(commits) > 1: old_tree = commits[1] new_tree = run_clang_format_and_save_to_tree(changed_lines, @@ -178,10 +181,13 @@ def main(): if opts.verbose >= 1: print('old tree: %s' % old_tree) print('new tree: %s' % new_tree) + if old_tree == new_tree: if opts.verbose >= 0: print('clang-format did not modify any files') - elif opts.diff: + return 0 + + if opts.diff: print_diff(old_tree, new_tree) elif opts.diffstat: print_diffstat(old_tree, new_tree) @@ -193,6 +199,8 @@ def main(): for filename in changed_files: print(' %s' % filename) + return 1 + def load_git_config(non_string_options=None): """Return the git configuration as a dictionary. diff --git a/clang-stable/lib64/libc++.so.1 b/clang-stable/lib64/libc++.so.1 Binary files differindex d2042118a..ec5e03a46 100644 --- a/clang-stable/lib64/libc++.so.1 +++ b/clang-stable/lib64/libc++.so.1 diff --git a/clang-stable/lib64/libclang.so.13 b/clang-stable/lib64/libclang.so.13 Binary files differindex 6ced40d6f..daa64db5f 100644 --- a/clang-stable/lib64/libclang.so.13 +++ b/clang-stable/lib64/libclang.so.13 diff --git a/clang-stable/share/clang/clang-format-diff.py b/clang-stable/share/clang/clang-format-diff.py index 28ac02756..1f6ff0fe2 100755 --- a/clang-stable/share/clang/clang-format-diff.py +++ b/clang-stable/share/clang/clang-format-diff.py @@ -47,8 +47,8 @@ def main(): help='custom pattern selecting file paths to reformat ' '(case sensitive, overrides -iregex)') parser.add_argument('-iregex', metavar='PATTERN', default= - r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hh|hpp|hxx|m|mm|inc|js|ts' - r'|proto|protodevel|java|cs|json)', + r'.*\.(cpp|cc|c\+\+|cxx|cppm|ccm|cxxm|c\+\+m|c|cl|h|hh|hpp|hxx' + r'|m|mm|inc|js|ts|proto|protodevel|java|cs|json)', help='custom pattern selecting file paths to reformat ' '(case insensitive, overridden by -regex)') parser.add_argument('-sort-includes', action='store_true', default=False, |