commit fabe3e6b2b279b55d4ef502ecf7ada994848d0d9
author Tom Anderson <thomasanderson@chromium.org> Fri Jan 26 22:05:17 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Jan 26 22:05:17 2018 +0000
tree 322ad38ed5d87ab1f63186fc694af5f25f2c74e2
parent fbdffc2bd55378a4bb469184beaa9f7687592bf4

Fix gn CHECK()ing when generating Chromium build files

After r531270, gn chokes while running exec_script():

[0124/122441.126364:FATAL:thread_restrictions.cc(105)] Check failed:
!g_base_sync_primitives_disallowed.Get().Get().

GN executes scripts synchronously while loading files, so blocking is necessary.
This CL adds a ScopedAllowBaseSyncPrimitives for gn to use while waiting for
exec_script() to complete.

BUG=805628
R=dpranke,thestig,fdoray

Change-Id: I7ad539a8dee0230c84d94f1c6b37755a890bfcd7
Reviewed-on: https://chromium-review.googlesource.com/884423
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#532069}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5d2531613139a1c409dfacd28d03b05b2100fcfe

tools/gn/function_exec_script.cc

diff --git a/tools/gn/function_exec_script.cc b/tools/gn/function_exec_script.cc
index 8c4909c..139b811 100644
--- a/tools/gn/function_exec_script.cc
+++ b/tools/gn/function_exec_script.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "tools/gn/err.h"
@@ -115,6 +116,9 @@
   exec_script("//foo/bar/myscript.py")
 )";
 
+class ExecScriptScopedAllowBaseSyncPrimitives
+    : public base::ScopedAllowBaseSyncPrimitives {};
+
 Value RunExecScript(Scope* scope,
                     const FunctionCallNode* function,
                     const std::vector<Value>& args,
@@ -221,11 +225,15 @@
   std::string output;
   std::string stderr_output;
   int exit_code = 0;
-  if (!internal::ExecProcess(
-          cmdline, startup_dir, &output, &stderr_output, &exit_code)) {
-    *err = Err(function->function(), "Could not execute python.",
-        "I was trying to execute \"" + FilePathToUTF8(python_path) + "\".");
-    return Value();
+  {
+    ExecScriptScopedAllowBaseSyncPrimitives allow_base_sync_primitives;
+    if (!internal::ExecProcess(cmdline, startup_dir, &output, &stderr_output,
+                               &exit_code)) {
+      *err = Err(
+          function->function(), "Could not execute python.",
+          "I was trying to execute \"" + FilePathToUTF8(python_path) + "\".");
+      return Value();
+    }
   }
   if (g_scheduler->verbose_logging()) {
     g_scheduler->Log("Pythoning", script_source.value() + " took " +