Fixed inlining determination test (#972)

alexnask · andrewrk · commit 131c133bb74e · 2018-05-02T21:43:07.000-04:00
When deciding wether we should inline a scope, look up the parents until we get to a function definition scope
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -145,6 +145,8 @@ static bool ir_should_inline(IrExecutable *exec, Scope *scope) {
     while (scope != nullptr) {
         if (scope->id == ScopeIdCompTime)
             return true;
+        if (scope->id == ScopeIdFnDef)
+            break;
         scope = scope->parent;
     }
     return false;
diff --git a/test/behavior.zig b/test/behavior.zig
@@ -52,4 +52,5 @@ comptime {
     _ = @import("cases/var_args.zig");
     _ = @import("cases/void.zig");
     _ = @import("cases/while.zig");
+    _ = @import("cases/fn_in_struct_in_comptime.zig");
 }
diff --git a/test/cases/fn_in_struct_in_comptime.zig b/test/cases/fn_in_struct_in_comptime.zig
@@ -0,0 +1,17 @@
+const assert = @import("std").debug.assert;
+
+fn get_foo() fn(&u8)usize {
+    comptime {
+        return struct {
+            fn func(ptr: &u8) usize {
+                var u = @ptrToInt(ptr);
+                return u;
+            }
+        }.func;
+    }
+}
+
+test "define a function in an anonymous struct in comptime" {
+    const foo = get_foo();
+    assert(foo(@intToPtr(&u8, 12345)) == 12345);
+}

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ static bool ir_should_inline(IrExecutable exec, Scope scope) {`
`145`	`145`	`while (scope != nullptr) {`
`146`	`146`	`if (scope->id == ScopeIdCompTime)`
`147`	`147`	`return true;`
	`148`	`+ if (scope->id == ScopeIdFnDef)`
	`149`	`+ break;`
`148`	`150`	`scope = scope->parent;`
`149`	`151`	`}`
`150`	`152`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,5 @@ comptime {`
`52`	`52`	`_ = @import("cases/var_args.zig");`
`53`	`53`	`_ = @import("cases/void.zig");`
`54`	`54`	`_ = @import("cases/while.zig");`
	`55`	`+ _ = @import("cases/fn_in_struct_in_comptime.zig");`
`55`	`56`	`}`