Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 91eac4d

Browse files
committedJul 3, 2018
Auto merge of #52020 - SimonSapin:no-jemalloc, r=<try>
[Do not merge yet] Remove alloc_jemalloc, switch the default global allocator to System Fixes #36963 **Do not merge** yet. This PR by itself is likely to regress rustc performance. The purpose of opening it now is to measure by how much. We’ll likely want to figure out #51038 and land them around the same time.
2 parents 860d169 + 54fa990 commit 91eac4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+24
-613
lines changed
 

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
path = src/llvm
33
url = https://github.com/rust-lang/llvm.git
44
branch = master
5-
[submodule "src/jemalloc"]
6-
path = src/jemalloc
7-
url = https://github.com/rust-lang/jemalloc.git
85
[submodule "src/rust-installer"]
96
path = src/tools/rust-installer
107
url = https://github.com/rust-lang/rust-installer.git

‎COPYRIGHT

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -229,35 +229,3 @@ their own copyright notices and license terms:
229229
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
230230
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
231231
OF SUCH DAMAGE. */
232-
233-
* jemalloc, under src/jemalloc:
234-
235-
Copyright (C) 2002-2014 Jason Evans
236-
<jasone@canonware.com>. All rights reserved.
237-
Copyright (C) 2007-2012 Mozilla Foundation.
238-
All rights reserved.
239-
Copyright (C) 2009-2014 Facebook, Inc.
240-
All rights reserved.
241-
242-
Redistribution and use in source and binary forms, with or without
243-
modification, are permitted provided that the following conditions are met:
244-
1. Redistributions of source code must retain the above copyright notice(s),
245-
this list of conditions and the following disclaimer.
246-
2. Redistributions in binary form must reproduce the above copyright notice(s),
247-
this list of conditions and the following disclaimer in the documentation
248-
and/or other materials provided with the distribution.
249-
250-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S)
251-
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
252-
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
253-
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
254-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S)
255-
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
256-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
257-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
258-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
259-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
260-
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
261-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
262-
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
263-
OF SUCH DAMAGE.

0 commit comments

Comments
 (0)
Please sign in to comment.