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

Issue 1839783005: Revert of Allocator shims working on VS2015. (Closed)

Created:
4 years, 8 months ago by Sorin Jianu
Modified:
4 years, 8 months ago
CC:
chromium-reviews, wfh+watch_chromium.org, Dai Mikurube (NOT FULLTIME), vmpstr+watch_chromium.org, brucedawson, Primiano Tucci (use gerrit)
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Allocator shims working on VS2015. (patchset #11 id:200001 of https://codereview.chromium.org/1414453017/ ) Reason for revert: It breaks the link on Windows. FAILED: C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x86 True views_examples_with_content_exe.exe "C:\b\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x86 False link.exe /nologo /OUT:views_examples_with_content_exe.exe @views_examples_with_content_exe.exe.rsp" 1 mt.exe rc.exe "obj\ui\views\examples\views_examples_with_content_exe.views_examples_with_content_exe.exe.intermediate.manifest" obj\ui\views\examples\views_examples_with_content_exe.views_examples_with_content_exe.exe.generated.manifest ..\..\ui\views\examples\views_examples.exe.manifest ..\..\build\win\compatibility.manifest allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: __query_new_mode already defined in libucrt.lib(new_mode.obj) allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: __set_new_mode already defined in libucrt.lib(new_mode.obj) allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _calloc already defined in libucrt.lib(calloc.obj) allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _free already defined in libucrt.lib(free.obj) allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _malloc already defined in libucrt.lib(malloc.obj) allocator.lib(allocator.allocator_shim_win.obj) : error LNK2005: _realloc already defined in libucrt.lib(realloc.obj) views_examples_with_content_exe.exe : fatal error LNK1169: one or more multiply defined symbols found Original issue's description: > Allocator shims working on VS2015. > > VS2015 is happy for us to simply override the CRT symbols since they > seem to be defined weakly by the universal CRT. > > This shim is far simpler than the previous one, as the libcmt stripping > technique can be removed. > > Allocator shim is also now only be enabled on Release Static builds. > > BUG=481611 > TEST=base_unittests --gtest_filter=*Memory* in all configurations > (Debug/Release/Static/Component/GN/gyp/x64/x86) > CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel > > Committed: https://crrev.com/e20c2e0ab4e5b796e7a1890fb9048b5eb307d015 > Cr-Commit-Position: refs/heads/master@{#383810} TBR=thakis@chromium.org,brucedawson@chromium.org,rnk@chromium.org,piman@chromium.org,primiano@chromium.org,wfh@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=481611 Committed: https://crrev.com/8da3c07046e9c0df8773771f816f017638418f1b Cr-Commit-Position: refs/heads/master@{#383851}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+400 lines, -132 lines) Patch
M base/allocator/BUILD.gn View 4 chunks +49 lines, -16 lines 0 comments Download
M base/allocator/allocator.gyp View 2 chunks +41 lines, -2 lines 0 comments Download
M base/allocator/allocator_check.cc View 2 chunks +7 lines, -5 lines 0 comments Download
D base/allocator/allocator_shim_win.h View 1 chunk +0 lines, -17 lines 0 comments Download
M base/allocator/allocator_shim_win.cc View 7 chunks +203 lines, -44 lines 0 comments Download
A base/allocator/prep_libc.py View 1 chunk +84 lines, -0 lines 0 comments Download
M base/process/memory_unittest.cc View 4 chunks +0 lines, -40 lines 0 comments Download
M build/common.gypi View 4 chunks +15 lines, -8 lines 0 comments Download
M gpu/gles2_conform_support/gles2_conform_support.gyp View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 7 (2 generated)
Sorin Jianu
Created Revert of Allocator shims working on VS2015.
4 years, 8 months ago (2016-03-29 22:29:13 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1839783005/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1839783005/1
4 years, 8 months ago (2016-03-29 22:29:50 UTC) #2
Will Harris
this is normally due to a double dependency on base/allocator - I can fix soon.
4 years, 8 months ago (2016-03-29 22:30:25 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 8 months ago (2016-03-29 22:30:54 UTC) #5
commit-bot: I haz the power
4 years, 8 months ago (2016-03-29 22:32:39 UTC) #7
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/8da3c07046e9c0df8773771f816f017638418f1b
Cr-Commit-Position: refs/heads/master@{#383851}

Powered by Google App Engine
This is Rietveld 408576698