Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ziglang/zig
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7f7823e23cfd
Choose a base ref
...
head repository: ziglang/zig
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a6ad23b52aa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 13, 2018

  1. Panic instead of segfault when returning generic type from functions

    closes #829
    Andrea Orru committed Mar 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2cdd50c View commit details
  2. Merge branch 'master' of https://github.com/zig-lang/zig

    Andrea Orru committed Mar 13, 2018
    Copy the full SHA
    2a6ad23 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 src/analyze.cpp
6 changes: 5 additions & 1 deletion src/analyze.cpp
Original file line number Diff line number Diff line change
@@ -970,7 +970,11 @@ TypeTableEntry *get_fn_type(CodeGen *g, FnTypeId *fn_type_id) {
if (table_entry) {
return table_entry->value;
}
ensure_complete_type(g, fn_type_id->return_type);
if (fn_type_id->return_type != nullptr) {
ensure_complete_type(g, fn_type_id->return_type);
} else {
zig_panic("TODO implement inferred return types https://github.com/zig-lang/zig/issues/447");
}

TypeTableEntry *fn_type = new_type_table_entry(TypeTableEntryIdFn);
fn_type->is_copyable = true;