Merge pull request #325 from aeternity/issue324

Fix #324: bug when compiling default init in the presence of child contracts

src/aeso_ast_to_fcode.erl

@@ -330,10 +330,11 @@ to_fcode(Env, [{Contract, Attrs, Con = {con, _, Name}, Decls}|Rest])
     case Contract =:= contract_interface of
         false ->
             #{ builtins := Builtins } = Env,
-            ConEnv = Env#{ context  => {contract_def, Name},
+            ConEnv = maps:remove(state_layout,
+                     Env#{ context  => {contract_def, Name},
                            builtins => Builtins#{[Name, "state"]          => {get_state, none},
                                                  [Name, "put"]            => {set_state, 1},
-                                                 [Name, "Chain", "event"] => {chain_event, 1}} },
+                                                 [Name, "Chain", "event"] => {chain_event, 1}} }),
             #{ functions := PrevFuns } = ConEnv,
             #{ functions := Funs } = Env1 =
                 decls_to_fcode(ConEnv, Decls),

test/aeso_compiler_tests.erl

@@ -199,6 +199,7 @@ compilable_contracts() ->
      "clone",
      "clone_simple",
      "create",
+     "child_contract_init_bug",
      "test" % Custom general-purpose test file. Keep it last on the list.
     ].
 

test/contracts/child_contract_init_bug.aes

@@ -0,0 +1,8 @@
+contract Identity =
+  record state = {foo: int, bar: string}
+  entrypoint init() = {foo = 0, bar = ""}
+
+main contract IdentityService =
+  stateful entrypoint createNewIdentity() : Identity =
+    put(())
+    Chain.create()