summaryrefslogtreecommitdiff
path: root/src/trans/allocator.hpp
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2019-11-02 11:07:23 +0800
committerJohn Hodge <tpg@ucc.asn.au>2019-11-02 11:07:23 +0800
commit1d02810c3cf908bfba7c15ae50eb5314603b9d85 (patch)
tree79dd5e4ef4c3ff79db0912ba546f08e61a7a8c10 /src/trans/allocator.hpp
parent7111acba04d72fe4084b1a1f3209ff83efe8614d (diff)
parent8b53b38f40625ab0510f541d69db3f83332a830a (diff)
downloadmrust-1d02810c3cf908bfba7c15ae50eb5314603b9d85.tar.gz
Merge branch 'nightly-1.29' - #95 Working support for rustc 1.29
Diffstat (limited to 'src/trans/allocator.hpp')
-rw-r--r--src/trans/allocator.hpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/trans/allocator.hpp b/src/trans/allocator.hpp
index 8a4e5186..c124ef57 100644
--- a/src/trans/allocator.hpp
+++ b/src/trans/allocator.hpp
@@ -9,17 +9,12 @@
enum class AllocatorDataTy {
// - Return
- Never, // !
Unit, // ()
ResultPtr, // (..., *mut i8) + *mut u8
- ResultExcess, // (..., *mut i8, *mut i8) + *mut u8
- UsizePair, // (..., *mut usize, *mut usize) + ()
- ResultUnit, // i8
// - Args
Layout, // usize, usize
- LayoutRef, // *const Layout [actually *const i8]
- AllocError, // *const i8
Ptr, // *mut u8
+ Usize, // usize
};
struct AllocatorMethod {
const char* name;
@@ -33,5 +28,6 @@ enum class AllocatorKind {
DefaultExe,
};
-extern const AllocatorMethod ALLOCATOR_METHODS[10];
+extern const AllocatorMethod ALLOCATOR_METHODS[];
+extern const size_t NUM_ALLOCATOR_METHODS;