diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2016-04-07 15:09:55 -0700 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2016-04-07 15:09:55 -0700 |
| commit | 28ad4e6d83e307b814d76f53795fa5ff61bbdb2f (patch) | |
| tree | 92b1390d05085e3a12def7d2701577c3be39fa18 | |
| parent | 3b535d2c3af5259a71916681d87ab0c01f24b58d (diff) | |
| download | zig-28ad4e6d83e307b814d76f53795fa5ff61bbdb2f.tar.gz zig-28ad4e6d83e307b814d76f53795fa5ff61bbdb2f.zip | |
fix segfault in generic functions
See #22
| -rw-r--r-- | src/parser.cpp | 8 | ||||
| -rw-r--r-- | test/self_hosted.zig | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index df1fe65310..2c3c4e4155 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -2861,8 +2861,12 @@ static void clone_subtree_list_ptr(ZigList<AstNode *> **dest_ptr, ZigList<AstNod } static void clone_subtree_field(AstNode **dest, AstNode *src, uint32_t *next_node_index) { - *dest = ast_clone_subtree(src, next_node_index); - (*dest)->parent_field = dest; + if (src) { + *dest = ast_clone_subtree(src, next_node_index); + (*dest)->parent_field = dest; + } else { + *dest = nullptr; + } } static void clone_subtree_tld(TopLevelDecl *dest, TopLevelDecl *src, uint32_t *next_node_index) { diff --git a/test/self_hosted.zig b/test/self_hosted.zig index f715fffe2c..847bc604bc 100644 --- a/test/self_hosted.zig +++ b/test/self_hosted.zig @@ -542,6 +542,18 @@ fn generic_function_equality() { } +#attribute("test") +fn generic_malloc_free() { + const a = %%mem_alloc(u8)(10); + mem_free(u8)(a); +} +const some_mem : [100]u8 = undefined; +fn mem_alloc(T: type)(n: isize) -> %[]T { + return (&T)(&some_mem[0])[0...n]; +} +fn mem_free(T: type)(mem: []T) { } + + fn assert(b: bool) { if (!b) unreachable{} } |
