diff options
| author | bors <bors@rust-lang.org> | 2015-04-13 10:23:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-13 10:23:58 +0000 |
| commit | 3cac76bcf239c5db7d612eea52dd39be6e0281b4 (patch) | |
| tree | 17d153d29074ac6fa4d23155bb6bb5858e39d89c /src/libbacktrace/alloc.c | |
| parent | 524547551cd6c9b33a9677e1a58e9a9d1e19c0fc (diff) | |
| parent | 10073c23c67218a5e38f28e6859f3fd7785c6ae8 (diff) | |
| download | rust-3cac76bcf239c5db7d612eea52dd39be6e0281b4.tar.gz rust-3cac76bcf239c5db7d612eea52dd39be6e0281b4.zip | |
Auto merge of #24344 - gfxmonk:update-libbacktrace, r=pnkfelix
On linux, certain crashes can cause rust's backtrace generation code to consume huge amounts of memory (multiple gigabytes) when trying to generate a backtrace (e.g. servo/servo#5340). I tracked this down to a bug in libbacktrace's allocation strategy when processing large binaries, and thankfully it's already been fixed upstream. The change which fixes this specific issue is r210256, and is discussed here: https://gcc.gnu.org/ml/gcc-patches/2014-05/msg00547.html I assume we'd prefer to update libbacktrace wholesale, rather than cherry-picking individual patches, so this PR updates libbacktrace to the latest code from svn://gcc.gnu.org/svn/gcc/trunk/libbacktrace (r220112). I've copied the upstream code and reapplied the parts of the following commits which touch src/libbacktrace: - cd8f31759fd04b9ce9c903fa00cae81dc5bba546 - fcb30a0b67b1bd4acbc3422ff74fac5d031ae1ae I have not reapplied f5765793b650e45e8c9bc89dfc7a4dc628123cb7 or d51047ded072b412ec18a6f78c1fb80835a477f5, as those are both cosmetic cleanups applied to the entire codebase. For this directory, it seems worthwhile diverging as little as possible from upstream, to reduce the effort of future updates. But I can add them as well if preferred.
Diffstat (limited to 'src/libbacktrace/alloc.c')
| -rw-r--r-- | src/libbacktrace/alloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libbacktrace/alloc.c b/src/libbacktrace/alloc.c index 4aa85d050fd..143ef68ca51 100644 --- a/src/libbacktrace/alloc.c +++ b/src/libbacktrace/alloc.c @@ -1,5 +1,5 @@ /* alloc.c -- Memory allocation without mmap. - Copyright (C) 2012-2014 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. Written by Ian Lance Taylor, Google. Redistribution and use in source and binary forms, with or without @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are met: (1) Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the - distribution. - + distribution. + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. |