Commit 66d981c0 authored by Wez's avatar Wez Committed by Commit Bot

Revert "Enable -Wunreachable-code in Fuchsia builds."

This reverts commit ec7d2855.

Reason for revert: Breaks the Fuchsia Cast bots due to unreachable code under //chromecast. We'll need to fix //chromecast to re-land.

Original change's description:
> Enable -Wunreachable-code in Fuchsia builds.
> 
> Depends on https://chromium-review.googlesource.com/c/angle/angle/+/2112281
> 
> Bug: 346399
> Change-Id: I6bf27dc15303c207be0ae85dd3256af217db005b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2111833
> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#752299}

TBR=wez@chromium.org,thakis@chromium.org,kmarshall@chromium.org,sergeyu@chromium.org

Change-Id: Id094305ad1df897b8a12bb93d76b5feca5d96f27
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 346399, 1063669
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2114271Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752334}
parent e594c70d
...@@ -1591,8 +1591,7 @@ config("chromium_code") { ...@@ -1591,8 +1591,7 @@ config("chromium_code") {
# TODO(thakis): Enable this more often, https://crbug.com/346399 # TODO(thakis): Enable this more often, https://crbug.com/346399
# use_libfuzzer: https://crbug.com/1063180 # use_libfuzzer: https://crbug.com/1063180
if (!is_nacl && !use_libfuzzer && if (!is_nacl && target_os == "linux" && !use_libfuzzer) {
(target_os == "fuchsia" || target_os == "linux")) {
cflags += [ "-Wunreachable-code" ] cflags += [ "-Wunreachable-code" ]
} }
......
...@@ -74,9 +74,8 @@ void WebContentRunner::StartComponent( ...@@ -74,9 +74,8 @@ void WebContentRunner::StartComponent(
this, this,
std::make_unique<base::fuchsia::StartupContext>(std::move(startup_info)), std::make_unique<base::fuchsia::StartupContext>(std::move(startup_info)),
std::move(controller_request)); std::move(controller_request));
#if BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT) != 0 if (BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT) != 0)
component->EnableRemoteDebugging(); component->EnableRemoteDebugging();
#endif
component->StartComponent(); component->StartComponent();
component->LoadUrl(url, std::vector<fuchsia::net::http::Header>()); component->LoadUrl(url, std::vector<fuchsia::net::http::Header>());
RegisterComponent(std::move(component)); RegisterComponent(std::move(component));
......
...@@ -42,10 +42,10 @@ int main(int argc, char** argv) { ...@@ -42,10 +42,10 @@ int main(int argc, char** argv) {
base::FilePath(base::fuchsia::kPersistedDataDirectoryPath))); base::FilePath(base::fuchsia::kPersistedDataDirectoryPath)));
CHECK(create_context_params.data_directory()); CHECK(create_context_params.data_directory());
#if BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT) != 0 if (BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT) != 0) {
create_context_params.set_remote_debugging_port( create_context_params.set_remote_debugging_port(
BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT)); BUILDFLAG(WEB_RUNNER_REMOTE_DEBUGGING_PORT));
#endif }
WebContentRunner runner( WebContentRunner runner(
std::move(create_context_params), std::move(create_context_params),
......
...@@ -167,16 +167,15 @@ void ThreadCPUThrottler::ThrottlingThread::Throttle() { ...@@ -167,16 +167,15 @@ void ThreadCPUThrottler::ThrottlingThread::Throttle() {
} }
void ThreadCPUThrottler::ThrottlingThread::Start() { void ThreadCPUThrottler::ThrottlingThread::Start() {
#if defined(USE_SIGNALS) || defined(OS_WIN) #ifdef USE_SIGNALS
#if defined(USE_SIGNALS)
InstallSignalHandler(); InstallSignalHandler();
#elif !defined(OS_WIN)
LOG(ERROR) << "CPU throttling is not supported.";
return;
#endif #endif
if (!base::PlatformThread::Create(0, this, &throttling_thread_handle_)) { if (!base::PlatformThread::Create(0, this, &throttling_thread_handle_)) {
LOG(ERROR) << "Failed to create throttling thread."; LOG(ERROR) << "Failed to create throttling thread.";
} }
#else
LOG(ERROR) << "CPU throttling is not supported.";
#endif
} }
void ThreadCPUThrottler::ThrottlingThread::Sleep(base::TimeDelta duration) { void ThreadCPUThrottler::ThrottlingThread::Sleep(base::TimeDelta duration) {
......
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