Commit 3829c6ad authored by Hans Wennborg's avatar Hans Wennborg

Roll clang 277962:278861

BUG=636558,637866
R=dcheng@chromium.org, dpranke@chromium.org, inferno@chromium.org, rnk@chromium.org

Review URL: https://codereview.chromium.org/2241413003 .

Cr-Commit-Position: refs/heads/master@{#413337}
parent 74765e5a
...@@ -137,8 +137,9 @@ TEST_F(ThreadTest, StartWithOptions_StackSize) { ...@@ -137,8 +137,9 @@ TEST_F(ThreadTest, StartWithOptions_StackSize) {
// Ensure that the thread can work with only 12 kb and still process a // Ensure that the thread can work with only 12 kb and still process a
// message. // message.
Thread::Options options; Thread::Options options;
#if defined(ADDRESS_SANITIZER) #if defined(ADDRESS_SANITIZER) || !defined(NDEBUG)
// ASan bloats the stack variables and overflows the 12 kb stack. // ASan bloats the stack variables and overflows the 12 kb stack. Some debug
// builds also grow the stack too much.
options.stack_size = 24*1024; options.stack_size = 24*1024;
#else #else
options.stack_size = 12*1024; options.stack_size = 12*1024;
......
...@@ -1030,13 +1030,10 @@ config("default_warnings") { ...@@ -1030,13 +1030,10 @@ config("default_warnings") {
# TODO(thakis): https://crbug.com/617318 # TODO(thakis): https://crbug.com/617318
"-Wno-nonportable-include-path", "-Wno-nonportable-include-path",
# TODO(hans): https://crbug.com/637306
"-Wno-address-of-packed-member",
] ]
if (llvm_force_head_revision) {
cflags += [
# TODO(hans): https://crbug.com/637306
"-Wno-address-of-packed-member",
]
}
} }
} }
} }
......
...@@ -27,7 +27,7 @@ import zipfile ...@@ -27,7 +27,7 @@ import zipfile
# Do NOT CHANGE this if you don't know what you're doing -- see # 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 # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
# Reverting problematic clang rolls is safe, though. # Reverting problematic clang rolls is safe, though.
CLANG_REVISION = '277962' CLANG_REVISION = '278861'
use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ
if use_head_revision: if use_head_revision:
......
...@@ -166,7 +166,7 @@ bool Reader::ReadNameTable() { ...@@ -166,7 +166,7 @@ bool Reader::ReadNameTable() {
LOG(ERROR) << "Invalid string table offset: " << offset; LOG(ERROR) << "Invalid string table offset: " << offset;
return false; return false;
} }
name_map_.Add(entry->type, std::string(string_table_.data() + offset)); name_map_.Add(entry->type, string_table_.data() + offset);
} }
return true; return true;
} }
......
...@@ -20,7 +20,7 @@ class MessageNames { ...@@ -20,7 +20,7 @@ class MessageNames {
~MessageNames(); ~MessageNames();
static MessageNames* GetInstance(); static MessageNames* GetInstance();
void Add(uint32_t type, const std::string& name) { void Add(uint32_t type, const char* name) {
name_map_[type] = name; name_map_[type] = name;
type_map_[name] = type; type_map_[name] = type;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment