diff options
| author | Ian Lance Taylor <iant@golang.org> | 2013-03-26 14:01:12 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2013-03-26 14:01:12 -0700 |
| commit | 515353a290be7718783ce31987b74e8e515e6c2d (patch) | |
| tree | 9bf255523b5bd8093b75c302b0e52ca69ca95253 /src/pkg/runtime/malloc.goc | |
| parent | 2180506169e448ce1473b25875195f3681291f54 (diff) | |
| download | go-515353a290be7718783ce31987b74e8e515e6c2d.tar.xz | |
pkg/runtime: ignore runtime.memlimit when allocating heap
For Go 1.1, stop checking the rlimit, because it broke now
that mheap is allocated using SysAlloc. See issue 5049.
R=r
CC=golang-dev
https://golang.org/cl/7741050
Diffstat (limited to 'src/pkg/runtime/malloc.goc')
| -rw-r--r-- | src/pkg/runtime/malloc.goc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pkg/runtime/malloc.goc b/src/pkg/runtime/malloc.goc index fa28e2b738..a30129ffc1 100644 --- a/src/pkg/runtime/malloc.goc +++ b/src/pkg/runtime/malloc.goc @@ -318,7 +318,10 @@ runtime·mallocinit(void) runtime·InitSizes(); - limit = runtime·memlimit(); + // limit = runtime·memlimit(); + // See https://code.google.com/p/go/issues/detail?id=5049 + // TODO(rsc): Fix after 1.1. + limit = 0; // Set up the allocation arena, a contiguous area of memory where // allocated data will be found. The arena begins with a bitmap large |