Skip to content

Patches #4474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 18, 2020
Merged

Patches #4474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
096f792
ir: Prevent crash when indexing undefined ptr to array
LemonBoy Feb 15, 2020
59a243c
std: Remove now-superflous hack
LemonBoy Feb 15, 2020
6b74fd2
ir: Avoid invalidating the decl_table iterator
LemonBoy Feb 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/std/json.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,10 +1026,8 @@ pub const TokenStream = struct {

pub fn next(self: *TokenStream) Error!?Token {
if (self.token) |token| {
// TODO: Audit this pattern once #2915 is closed
const copy = token;
self.token = null;
return copy;
return token;
}

var t1: ?Token = undefined;
Expand Down
8 changes: 2 additions & 6 deletions lib/std/zig/tokenizer.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,8 @@ pub const Tokenizer = struct {

pub fn next(self: *Tokenizer) Token {
if (self.pending_invalid_token) |token| {
// TODO: Audit this pattern once #2915 is closed
const copy = token;
self.pending_invalid_token = null;
return copy;
return token;
}
const start_index = self.index;
var state = State.Start;
Expand Down Expand Up @@ -1270,10 +1268,8 @@ pub const Tokenizer = struct {

if (result.id == Token.Id.Eof) {
if (self.pending_invalid_token) |token| {
// TODO: Audit this pattern once #2915 is closed
const copy = token;
self.pending_invalid_token = null;
return copy;
return token;
}
}

Expand Down
87 changes: 57 additions & 30 deletions src/ir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20638,12 +20638,12 @@ static IrInstGen *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstSrcElemP
if (type_is_invalid(array_ptr->value->type))
return ira->codegen->invalid_inst_gen;

ZigValue *orig_array_ptr_val = array_ptr->value;

IrInstGen *elem_index = elem_ptr_instruction->elem_index->child;
if (type_is_invalid(elem_index->value->type))
return ira->codegen->invalid_inst_gen;

ZigValue *orig_array_ptr_val = array_ptr->value;

ZigType *ptr_type = orig_array_ptr_val->type;
assert(ptr_type->id == ZigTypeIdPointer);

Expand All @@ -20653,23 +20653,25 @@ static IrInstGen *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstSrcElemP
// We will adjust return_type's alignment before returning it.
ZigType *return_type;

if (type_is_invalid(array_type)) {
if (type_is_invalid(array_type))
return ira->codegen->invalid_inst_gen;
} else if (array_type->id == ZigTypeIdArray ||
(array_type->id == ZigTypeIdPointer &&
array_type->data.pointer.ptr_len == PtrLenSingle &&
array_type->data.pointer.child_type->id == ZigTypeIdArray))

if (array_type->id == ZigTypeIdPointer &&
array_type->data.pointer.ptr_len == PtrLenSingle &&
array_type->data.pointer.child_type->id == ZigTypeIdArray)
{
if (array_type->id == ZigTypeIdPointer) {
array_type = array_type->data.pointer.child_type;
ptr_type = ptr_type->data.pointer.child_type;
if (orig_array_ptr_val->special != ConstValSpecialRuntime) {
orig_array_ptr_val = const_ptr_pointee(ira, ira->codegen, orig_array_ptr_val,
elem_ptr_instruction->base.base.source_node);
if (orig_array_ptr_val == nullptr)
return ira->codegen->invalid_inst_gen;
}
}
IrInstGen *ptr_value = ir_get_deref(ira, &elem_ptr_instruction->base.base,
array_ptr, nullptr);
if (type_is_invalid(ptr_value->value->type))
return ira->codegen->invalid_inst_gen;

array_type = array_type->data.pointer.child_type;
ptr_type = ptr_type->data.pointer.child_type;

orig_array_ptr_val = ptr_value->value;
}

if (array_type->id == ZigTypeIdArray) {
if (array_type->data.array.len == 0) {
ir_add_error_node(ira, elem_ptr_instruction->base.base.source_node,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a call to ir_resolve_const_val is appropriate here. Maybe like this (changing some lines above as well):

if (orig_array_ptr_val->special != ConstValSpecialRuntime) {
    if ((err = ir_resolve_const_val(ira->codegen, ira->new_irb.exec, value->base.source_node,
                    orig_array_ptr_val, UndefBad)))
    {
        return ira->codegen->invalid_inst_gen;
    }
    if (orig_array_ptr_val->data.x_ptr.special != ConstPtrSpecialHardCodedAddr) {
        orig_array_ptr_val = const_ptr_pointee(ira, ira->codegen, orig_array_ptr_val,
            elem_ptr_instruction->base.base.source_node);
        if (orig_array_ptr_val == nullptr)
            return ira->codegen->invalid_inst_gen; 
        // and then if we need to make sure the new orig_array_ptr_val is also not
        // undefined then another call to ir_resolve_const_val here.
    }
}

buf_sprintf("index 0 outside array of size 0"));
Expand Down Expand Up @@ -20807,8 +20809,14 @@ static IrInstGen *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstSrcElemP
orig_array_ptr_val->data.x_ptr.special != ConstPtrSpecialHardCodedAddr &&
(orig_array_ptr_val->data.x_ptr.mut != ConstPtrMutRuntimeVar || array_type->id == ZigTypeIdArray))
{
if ((err = ir_resolve_const_val(ira->codegen, ira->new_irb.exec,
elem_ptr_instruction->base.base.source_node, orig_array_ptr_val, UndefBad)))
{
return ira->codegen->invalid_inst_gen;
}

ZigValue *array_ptr_val = const_ptr_pointee(ira, ira->codegen, orig_array_ptr_val,
elem_ptr_instruction->base.base.source_node);
elem_ptr_instruction->base.base.source_node);
if (array_ptr_val == nullptr)
return ira->codegen->invalid_inst_gen;

Expand Down Expand Up @@ -23645,14 +23653,13 @@ static Error ir_make_type_info_decls(IrAnalyze *ira, IrInst* source_instr, ZigVa
if ((err = type_resolve(ira->codegen, type_info_fn_decl_inline_type, ResolveStatusSizeKnown)))
return err;

// Loop through our declarations once to figure out how many declarations we will generate info for.
// The unresolved declarations are collected in a separate queue to avoid
// modifying decl_table while iterating over it
ZigList<Tld*> resolve_decl_queue{};

auto decl_it = decls_scope->decl_table.entry_iterator();
decltype(decls_scope->decl_table)::Entry *curr_entry = nullptr;
int declaration_count = 0;

while ((curr_entry = decl_it.next()) != nullptr) {
// If the declaration is unresolved, force it to be resolved again.
resolve_top_level_decl(ira->codegen, curr_entry->value, curr_entry->value->source_node, false);
if (curr_entry->value->resolution == TldResolutionInvalid) {
return ErrorSemanticAnalyzeFail;
}
Expand All @@ -23662,16 +23669,36 @@ static Error ir_make_type_info_decls(IrAnalyze *ira, IrInst* source_instr, ZigVa
return ErrorSemanticAnalyzeFail;
}

// If the declaration is unresolved, force it to be resolved again.
if (curr_entry->value->resolution == TldResolutionUnresolved)
resolve_decl_queue.append(curr_entry->value);
}

for (size_t i = 0; i < resolve_decl_queue.length; i++) {
Tld *decl = resolve_decl_queue.at(i);
resolve_top_level_decl(ira->codegen, decl, decl->source_node, false);
if (decl->resolution == TldResolutionInvalid) {
return ErrorSemanticAnalyzeFail;
}
}

resolve_decl_queue.deinit();

// Loop through our declarations once to figure out how many declarations we will generate info for.
int declaration_count = 0;
decl_it = decls_scope->decl_table.entry_iterator();
while ((curr_entry = decl_it.next()) != nullptr) {
// Skip comptime blocks and test functions.
if (curr_entry->value->id != TldIdCompTime) {
if (curr_entry->value->id == TldIdFn) {
ZigFn *fn_entry = ((TldFn *)curr_entry->value)->fn_entry;
if (fn_entry->is_test)
continue;
}
if (curr_entry->value->id == TldIdCompTime)
continue;

declaration_count += 1;
if (curr_entry->value->id == TldIdFn) {
ZigFn *fn_entry = ((TldFn *)curr_entry->value)->fn_entry;
if (fn_entry->is_test)
continue;
}

declaration_count += 1;
}

ZigValue *declaration_array = ira->codegen->pass1_arena->create<ZigValue>();
Expand Down
9 changes: 9 additions & 0 deletions test/compile_errors.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ const builtin = @import("builtin");
const Target = @import("std").Target;

pub fn addCases(cases: *tests.CompileErrorContext) void {
cases.addTest("",
\\const A = B;
\\test "Crash" {
\\ _ = @typeInfo(@This()).Struct.decls;
\\}
, &[_][]const u8{
"tmp.zig:1:11: error: use of undeclared identifier 'B'",
});

cases.addTest("duplicate field in anonymous struct literal",
\\export fn entry() void {
\\ const anon = .{
Expand Down