Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Issue 46313006: Revert 232657 "GN: toolchain threading cleanup" (Closed)

Created:
7 years, 1 month ago by Nico
Modified:
7 years, 1 month ago
Reviewers:
brettw
CC:
chromium-reviews
Visibility:
Public.

Description

Revert 232657 "GN: toolchain threading cleanup" Broke linux clang bots: ../../tools/gn/ninja_helper_unittest.cc:20:9:error: field 'settings' will be initialized after field 'toolchain' [-Werror,-Wreorder] This happened on your try jobs too. > GN: toolchain threading cleanup > > Remove the thread-unsafe toolchain pointer on the otherwise-threadsafe Settings object. I replaced it with the toolchain label, and moved the is_default flag from the toolchain to the Settings object. > > This required that I pass the toolchain around in a few more places, but also simplifies some other cases. > > I removed the toolchain prefix from Ninja rules for the default toolchain since that's not necessary any more for GYP compat. > > This fixes an annoying double-free in the toolchain manager. I think my current refactor will clean this up in a later phase. > > R=scottmg@chromium.org > > Review URL: https://codereview.chromium.org/51693002 TBR=brettw@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232661

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+156 lines, -174 lines) Patch
M trunk/src/tools/gn/config.h View 1 chunk +1 line, -1 line 0 comments Download
M trunk/src/tools/gn/config.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/function_exec_script.cc View 1 chunk +1 line, -1 line 0 comments Download
M trunk/src/tools/gn/function_toolchain.cc View 1 chunk +1 line, -1 line 0 comments Download
M trunk/src/tools/gn/functions.cc View 1 chunk +1 line, -1 line 0 comments Download
M trunk/src/tools/gn/gyp_helper.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/input_conversion.cc View 1 chunk +3 lines, -1 line 0 comments Download
M trunk/src/tools/gn/item.h View 3 chunks +1 line, -5 lines 0 comments Download
M trunk/src/tools/gn/item.cc View 1 chunk +1 line, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_binary_target_writer.h View 1 chunk +1 line, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_binary_target_writer.cc View 6 chunks +7 lines, -6 lines 0 comments Download
M trunk/src/tools/gn/ninja_binary_target_writer_unittest.cc View 4 chunks +6 lines, -6 lines 0 comments Download
M trunk/src/tools/gn/ninja_copy_target_writer.h View 1 chunk +1 line, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_copy_target_writer.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_copy_target_writer_unittest.cc View 2 chunks +8 lines, -8 lines 0 comments Download
M trunk/src/tools/gn/ninja_group_target_writer.h View 1 chunk +1 line, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_group_target_writer.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_helper.h View 1 chunk +2 lines, -1 line 0 comments Download
M trunk/src/tools/gn/ninja_helper.cc View 1 chunk +10 lines, -7 lines 0 comments Download
M trunk/src/tools/gn/ninja_helper_unittest.cc View 1 chunk +2 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_script_target_writer.h View 1 chunk +1 line, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_script_target_writer.cc View 2 chunks +2 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/ninja_script_target_writer_unittest.cc View 6 chunks +6 lines, -6 lines 0 comments Download
M trunk/src/tools/gn/ninja_target_writer.h View 3 chunks +4 lines, -4 lines 0 comments Download
M trunk/src/tools/gn/ninja_target_writer.cc View 5 chunks +10 lines, -13 lines 0 comments Download
M trunk/src/tools/gn/ninja_toolchain_writer.cc View 2 chunks +2 lines, -6 lines 0 comments Download
M trunk/src/tools/gn/scope_per_file_provider.cc View 1 chunk +1 line, -1 line 0 comments Download
M trunk/src/tools/gn/scope_per_file_provider_unittest.cc View 2 chunks +17 lines, -13 lines 0 comments Download
M trunk/src/tools/gn/settings.h View 2 chunks +8 lines, -8 lines 0 comments Download
M trunk/src/tools/gn/settings.cc View 1 chunk +2 lines, -1 line 0 comments Download
M trunk/src/tools/gn/setup.h View 1 chunk +1 line, -0 lines 0 comments Download
M trunk/src/tools/gn/setup.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M trunk/src/tools/gn/target.h View 2 chunks +3 lines, -0 lines 0 comments Download
M trunk/src/tools/gn/target.cc View 2 chunks +4 lines, -3 lines 0 comments Download
M trunk/src/tools/gn/target_unittest.cc View 2 chunks +6 lines, -7 lines 0 comments Download
M trunk/src/tools/gn/test_with_scope.h View 1 chunk +1 line, -2 lines 0 comments Download
M trunk/src/tools/gn/test_with_scope.cc View 1 chunk +2 lines, -6 lines 0 comments Download
M trunk/src/tools/gn/toolchain.h View 3 chunks +5 lines, -1 line 0 comments Download
M trunk/src/tools/gn/toolchain.cc View 1 chunk +1 line, -2 lines 0 comments Download
M trunk/src/tools/gn/toolchain_manager.cc View 10 chunks +21 lines, -28 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Nico
7 years, 1 month ago (2013-11-03 04:50:42 UTC) #1
Nico
7 years, 1 month ago (2013-11-03 04:51:04 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 manually as r232661.

Powered by Google App Engine
This is Rietveld 408576698