mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 13:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix container member access for fn/struct-fn

Browse Source 
- decls brought in via `usingnamespace` were not always found
  because lookup was performed directly against decl_table and
  use_decls was never consulted
- fix to use find_container_decl() path instead
- closes #3367
This commit is contained in:
Michael Dusan 2019-10-05 14:09:09 -04:00
parent a7c9aa7ddb
commit a23a022820
No known key found for this signature in database
GPG Key ID: ED4C5BA849FA1B74
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ir.cpp
View File

@ -17673,8 +17673,7 @@ static IrInstruction *ir_analyze_container_member_access_inner(IrAnalyze *ira,
if (!is_slice(bare_struct_type)) {
ScopeDecls *container_scope = get_container_scope(bare_struct_type);
assert(container_scope != nullptr);
auto entry = container_scope->decl_table.maybe_get(field_name);
Tld *tld = entry ? entry->value : nullptr;
auto tld = find_container_decl(ira->codegen, container_scope, field_name);
if (tld) {
if (tld->id == TldIdFn) {
resolve_top_level_decl(ira->codegen, tld, source_instr->source_node, false);

1
test/stage1/behavior.zig
View File

@ -34,6 +34,7 @@ comptime {
_ = @import("behavior/bugs/2692.zig");
_ = @import("behavior/bugs/3046.zig");
_ = @import("behavior/bugs/3112.zig");
_ = @import("behavior/bugs/3367.zig");
_ = @import("behavior/bugs/394.zig");
_ = @import("behavior/bugs/421.zig");
_ = @import("behavior/bugs/529.zig");

15
test/stage1/behavior/bugs/3367.zig Normal file
View File

@ -0,0 +1,15 @@
const std = @import("std");
const expect = std.testing.expect;
const Foo = struct {
usingnamespace Mixin;
};
const Mixin = struct {
pub fn two(self: Foo) void {}
};
test "container member access usingnamespace decls" {
var foo = Foo{};
foo.two();
}