Skip to content

Commit

Permalink
Roll clang 370156:371202.
Browse files Browse the repository at this point in the history
Ran `tools/clang/scripts/upload_revision.py 8455294f2ac13d587b13d728038a9bffa7185f2b`.

And remove workarounds that are no longer needed.

TBR=thestig

Bug: 998158,998966,998712
Change-Id: I583aa4acc54ba7e6cc8d2b36f332070761418203
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1789662
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Hans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694450}
  • Loading branch information
nico authored and Commit Bot committed Sep 6, 2019
1 parent d5450b3 commit 0708eba
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 24 deletions.
26 changes: 11 additions & 15 deletions build/config/compiler/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1515,26 +1515,22 @@ config("default_warnings") {

# TODO(https://crbug.com/995200): Clean up and enable.
"-Wno-xor-used-as-pow",

# TODO(https://crbug.com/999871): Decide if we want to clean up the
# codebase or just disable this. Doesn't seem super useful, but
# also fires in only 4 files.
"-Wno-c99-designator",

# This is a side effect of -Wc99-designator; easier to clean up.
"-Wno-reorder-init-list",

# TODO(https://crbug.com/999886): Clean up, enable.
"-Wno-final-dtor-non-final-class",
]
cflags_c += [
# TODO(https://crbug.com/995993): Clean up and enable.
"-Wno-implicit-fallthrough",
]

if (llvm_force_head_revision) {
cflags += [
# TODO(https://crbug.com/999871): Decide if we want to clean up the
# codebase or just disable this. Doesn't seem super useful, but
# also fires in only 4 files.
"-Wno-c99-designator",

# This is a side effect of -Wc99-designator; easier to clean up.
"-Wno-reorder-init-list",

# TODO(https://crbug.com/999886): Clean up, enable.
"-Wno-final-dtor-non-final-class",
]
}
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions build/partitioned_shared_library.gni
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ template("partitioned_shared_library") {
"--link-only",
]

# https://crbug.com/1000665: Force partitions to be aligned. This can be
# removed once LLVM rolls in an alignment fix.
ldflags += [ "-Wl,-z,separate-code" ]

# This shared library is an intermediate artifact that should not packaged
# into the final build. Therefore, reset metadata.
metadata = {
Expand Down
4 changes: 1 addition & 3 deletions chromeos/printing/ppd_line_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,7 @@ class PpdLineReaderImpl : public PpdLineReader {

// Skip input until we hit a newline (which is discarded). If
// we encounter eof before a newline, false is returned.
// TODO(thakis): Remove NOINLINE once the msan fix for
// https://crbug.com/998966 is rolled in.
bool SkipToNextLine() NOINLINE {
bool SkipToNextLine() {
while (true) {
char c = NextChar();
if (Eof()) {
Expand Down
4 changes: 2 additions & 2 deletions tools/clang/scripts/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
# Do NOT CHANGE this if you don't know what you're doing -- see
# https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though.
CLANG_REVISION = '6964027315f70c6817217d8dba0368fd3a274ba3'
CLANG_SVN_REVISION = '370156'
CLANG_REVISION = '8455294f2ac13d587b13d728038a9bffa7185f2b'
CLANG_SVN_REVISION = '371202'
CLANG_SUB_REVISION = 1

PACKAGE_VERSION = '%s-%s-%s' % (CLANG_SVN_REVISION, CLANG_REVISION[:8],
Expand Down

0 comments on commit 0708eba

Please sign in to comment.