diff options
author | Araq <rumpf_a@web.de> | 2019-03-01 14:50:41 +0100 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2019-03-01 14:50:51 +0100 |
commit | e1d17ece5b79cd142248162c964604cd0ba5ca3f (patch) | |
tree | d716ca9df4ef0fa18613ea346a986404e879b7b3 /lib | |
parent | ca7980f301104d2ac5cbf30b36f79f7b4a350f48 (diff) | |
download | Nim-e1d17ece5b79cd142248162c964604cd0ba5ca3f.tar.gz |
alloc et al don't have any effect; fixes #9746
Diffstat (limited to 'lib')
-rw-r--r-- | lib/core/allocators.nim | 14 | ||||
-rw-r--r-- | lib/core/seqs.nim | 4 | ||||
-rw-r--r-- | lib/system.nim | 32 |
3 files changed, 25 insertions, 25 deletions
diff --git a/lib/core/allocators.nim b/lib/core/allocators.nim index b8d575422..001caac05 100644 --- a/lib/core/allocators.nim +++ b/lib/core/allocators.nim @@ -13,10 +13,10 @@ type ZerosMem ## the allocator always zeros the memory on an allocation Allocator* = ptr AllocatorObj AllocatorObj* {.inheritable.} = object - alloc*: proc (a: Allocator; size: int; alignment: int = 8): pointer {.nimcall.} - dealloc*: proc (a: Allocator; p: pointer; size: int) {.nimcall.} - realloc*: proc (a: Allocator; p: pointer; oldSize, newSize: int): pointer {.nimcall.} - deallocAll*: proc (a: Allocator) {.nimcall.} + alloc*: proc (a: Allocator; size: int; alignment: int = 8): pointer {.nimcall, raises: [], tags: [].} + dealloc*: proc (a: Allocator; p: pointer; size: int) {.nimcall, raises: [], tags: [].} + realloc*: proc (a: Allocator; p: pointer; oldSize, newSize: int): pointer {.nimcall, raises: [], tags: [].} + deallocAll*: proc (a: Allocator) {.nimcall, raises: [], tags: [].} flags*: set[AllocatorFlag] name*: cstring allocCount: int @@ -31,13 +31,13 @@ proc getLocalAllocator*(): Allocator = result = localAllocator if result == nil: result = addr allocatorStorage - result.alloc = proc (a: Allocator; size: int; alignment: int = 8): pointer {.nimcall.} = + result.alloc = proc (a: Allocator; size: int; alignment: int = 8): pointer {.nimcall, raises: [].} = result = system.alloc(size) inc a.allocCount - result.dealloc = proc (a: Allocator; p: pointer; size: int) {.nimcall.} = + result.dealloc = proc (a: Allocator; p: pointer; size: int) {.nimcall, raises: [].} = system.dealloc(p) inc a.deallocCount - result.realloc = proc (a: Allocator; p: pointer; oldSize, newSize: int): pointer {.nimcall.} = + result.realloc = proc (a: Allocator; p: pointer; oldSize, newSize: int): pointer {.nimcall, raises: [].} = result = system.realloc(p, newSize) result.deallocAll = nil result.flags = {ThreadLocal} diff --git a/lib/core/seqs.nim b/lib/core/seqs.nim index 2b39c6b41..be2cdcf1a 100644 --- a/lib/core/seqs.nim +++ b/lib/core/seqs.nim @@ -80,7 +80,7 @@ type cap: int region: Allocator -proc newSeqPayload(cap, elemSize: int): pointer {.compilerRtl.} = +proc newSeqPayload(cap, elemSize: int): pointer {.compilerRtl, raises: [].} = # we have to use type erasure here as Nim does not support generic # compilerProcs. Oh well, this will all be inlined anyway. if cap > 0: @@ -93,7 +93,7 @@ proc newSeqPayload(cap, elemSize: int): pointer {.compilerRtl.} = result = nil proc prepareSeqAdd(len: int; p: pointer; addlen, elemSize: int): pointer {. - compilerRtl, noSideEffect.} = + compilerRtl, noSideEffect, raises: [].} = {.noSideEffect.}: if len+addlen <= len: result = p diff --git a/lib/system.nim b/lib/system.nim index eac13aeb3..1d3be3075 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -1898,14 +1898,14 @@ when not defined(nimscript) and not defined(JS): when not defined(nimscript): when hasAlloc: - proc alloc*(size: Natural): pointer {.noconv, rtl, tags: [], benign.} + proc alloc*(size: Natural): pointer {.noconv, rtl, tags: [], benign, raises: [].} ## allocates a new memory block with at least ``size`` bytes. The ## block has to be freed with ``realloc(block, 0)`` or ## ``dealloc(block)``. The block is not initialized, so reading ## from it before writing to it is undefined behaviour! ## The allocated memory belongs to its allocating thread! ## Use `allocShared` to allocate from a shared heap. - proc createU*(T: typedesc, size = 1.Positive): ptr T {.inline, benign.} = + proc createU*(T: typedesc, size = 1.Positive): ptr T {.inline, benign, raises: [].} = ## allocates a new memory block with at least ``T.sizeof * size`` ## bytes. The block has to be freed with ``resize(block, 0)`` or ## ``dealloc(block)``. The block is not initialized, so reading @@ -1913,14 +1913,14 @@ when not defined(nimscript): ## The allocated memory belongs to its allocating thread! ## Use `createSharedU` to allocate from a shared heap. cast[ptr T](alloc(T.sizeof * size)) - proc alloc0*(size: Natural): pointer {.noconv, rtl, tags: [], benign.} + proc alloc0*(size: Natural): pointer {.noconv, rtl, tags: [], benign, raises: [].} ## allocates a new memory block with at least ``size`` bytes. The ## block has to be freed with ``realloc(block, 0)`` or ## ``dealloc(block)``. The block is initialized with all bytes ## containing zero, so it is somewhat safer than ``alloc``. ## The allocated memory belongs to its allocating thread! ## Use `allocShared0` to allocate from a shared heap. - proc create*(T: typedesc, size = 1.Positive): ptr T {.inline, benign.} = + proc create*(T: typedesc, size = 1.Positive): ptr T {.inline, benign, raises: [].} = ## allocates a new memory block with at least ``T.sizeof * size`` ## bytes. The block has to be freed with ``resize(block, 0)`` or ## ``dealloc(block)``. The block is initialized with all bytes @@ -1929,7 +1929,7 @@ when not defined(nimscript): ## Use `createShared` to allocate from a shared heap. cast[ptr T](alloc0(sizeof(T) * size)) proc realloc*(p: pointer, newSize: Natural): pointer {.noconv, rtl, tags: [], - benign.} + benign, raises: [].} ## grows or shrinks a given memory block. If p is **nil** then a new ## memory block is returned. In either way the block has at least ## ``newSize`` bytes. If ``newSize == 0`` and p is not **nil** @@ -1937,7 +1937,7 @@ when not defined(nimscript): ## be freed with ``dealloc``. ## The allocated memory belongs to its allocating thread! ## Use `reallocShared` to reallocate from a shared heap. - proc resize*[T](p: ptr T, newSize: Natural): ptr T {.inline, benign.} = + proc resize*[T](p: ptr T, newSize: Natural): ptr T {.inline, benign, raises: [].} = ## grows or shrinks a given memory block. If p is **nil** then a new ## memory block is returned. In either way the block has at least ## ``T.sizeof * newSize`` bytes. If ``newSize == 0`` and p is not @@ -1946,7 +1946,7 @@ when not defined(nimscript): ## its allocating thread! ## Use `resizeShared` to reallocate from a shared heap. cast[ptr T](realloc(p, T.sizeof * newSize)) - proc dealloc*(p: pointer) {.noconv, rtl, tags: [], benign.} + proc dealloc*(p: pointer) {.noconv, rtl, tags: [], benign, raises: [].} ## frees the memory allocated with ``alloc``, ``alloc0`` or ## ``realloc``. This procedure is dangerous! If one forgets to ## free the memory a leak occurs; if one tries to access freed @@ -1955,27 +1955,27 @@ when not defined(nimscript): ## The freed memory must belong to its allocating thread! ## Use `deallocShared` to deallocate from a shared heap. - proc allocShared*(size: Natural): pointer {.noconv, rtl, benign.} + proc allocShared*(size: Natural): pointer {.noconv, rtl, benign, raises: [].} ## allocates a new memory block on the shared heap with at ## least ``size`` bytes. The block has to be freed with ## ``reallocShared(block, 0)`` or ``deallocShared(block)``. The block ## is not initialized, so reading from it before writing to it is ## undefined behaviour! proc createSharedU*(T: typedesc, size = 1.Positive): ptr T {.inline, - benign.} = + benign, raises: [].} = ## allocates a new memory block on the shared heap with at ## least ``T.sizeof * size`` bytes. The block has to be freed with ## ``resizeShared(block, 0)`` or ``freeShared(block)``. The block ## is not initialized, so reading from it before writing to it is ## undefined behaviour! cast[ptr T](allocShared(T.sizeof * size)) - proc allocShared0*(size: Natural): pointer {.noconv, rtl, benign.} + proc allocShared0*(size: Natural): pointer {.noconv, rtl, benign, raises: [].} ## allocates a new memory block on the shared heap with at ## least ``size`` bytes. The block has to be freed with ## ``reallocShared(block, 0)`` or ``deallocShared(block)``. ## The block is initialized with all bytes ## containing zero, so it is somewhat safer than ``allocShared``. - proc createShared*(T: typedesc, size = 1.Positive): ptr T {.inline.} = + proc createShared*(T: typedesc, size = 1.Positive): ptr T {.inline, raises: [].} = ## allocates a new memory block on the shared heap with at ## least ``T.sizeof * size`` bytes. The block has to be freed with ## ``resizeShared(block, 0)`` or ``freeShared(block)``. @@ -1983,26 +1983,26 @@ when not defined(nimscript): ## containing zero, so it is somewhat safer than ``createSharedU``. cast[ptr T](allocShared0(T.sizeof * size)) proc reallocShared*(p: pointer, newSize: Natural): pointer {.noconv, rtl, - benign.} + benign, raises: [].} ## grows or shrinks a given memory block on the heap. If p is **nil** ## then a new memory block is returned. In either way the block has at ## least ``newSize`` bytes. If ``newSize == 0`` and p is not **nil** ## ``reallocShared`` calls ``deallocShared(p)``. In other cases the ## block has to be freed with ``deallocShared``. - proc resizeShared*[T](p: ptr T, newSize: Natural): ptr T {.inline.} = + proc resizeShared*[T](p: ptr T, newSize: Natural): ptr T {.inline, raises: [].} = ## grows or shrinks a given memory block on the heap. If p is **nil** ## then a new memory block is returned. In either way the block has at ## least ``T.sizeof * newSize`` bytes. If ``newSize == 0`` and p is ## not **nil** ``resizeShared`` calls ``freeShared(p)``. In other ## cases the block has to be freed with ``freeShared``. cast[ptr T](reallocShared(p, T.sizeof * newSize)) - proc deallocShared*(p: pointer) {.noconv, rtl, benign.} + proc deallocShared*(p: pointer) {.noconv, rtl, benign, raises: [].} ## frees the memory allocated with ``allocShared``, ``allocShared0`` or ## ``reallocShared``. This procedure is dangerous! If one forgets to ## free the memory a leak occurs; if one tries to access freed ## memory (or just freeing it twice!) a core dump may happen ## or other memory may be corrupted. - proc freeShared*[T](p: ptr T) {.inline, benign.} = + proc freeShared*[T](p: ptr T) {.inline, benign, raises: [].} = ## frees the memory allocated with ``createShared``, ``createSharedU`` or ## ``resizeShared``. This procedure is dangerous! If one forgets to ## free the memory a leak occurs; if one tries to access freed @@ -2929,7 +2929,7 @@ var ## do when setting this. If ``localRaiseHook`` returns false, the exception ## is caught and does not propagate further through the call stack. - outOfMemHook*: proc () {.nimcall, tags: [], benign.} + outOfMemHook*: proc () {.nimcall, tags: [], benign, raises: [].} ## set this variable to provide a procedure that should be called ## in case of an `out of memory`:idx: event. The standard handler ## writes an error message and terminates the program. `outOfMemHook` can |