Always use in_context definition for struct expansion, closes #6409

Author: José Valim

lib/elixir/src/elixir_map.erl

@@ -121,10 +121,7 @@ validate_struct(_, _) -> false.
 
 load_struct(Meta, Name, Args, InContext, E) ->
   Arity = length(Args),
-
-  Local =
-    not(ensure_loaded(Name)) andalso
-      (InContext orelse wait_for_struct(Name)),
+  Local = InContext orelse (not(ensure_loaded(Name)) andalso wait_for_struct(Name)),
 
   try
     case Local andalso elixir_def:local_for(Name, '__struct__', Arity, [def]) of

lib/elixir/test/elixir/map_test.exs

@@ -216,7 +216,7 @@ defmodule MapTest do
     end
   end
 
-  test "defstruct allow keys to be enforced" do
+  test "defstruct allows keys to be enforced" do
     message = "the following keys must also be given when building struct TestMod: [:foo]"
     assert_raise ArgumentError, message, fn ->
       Code.eval_string("""
@@ -243,6 +243,26 @@ defmodule MapTest do
     end
   end
 
+  test "struct always expands context module" do
+    Code.compiler_options(ignore_module_conflict: true)
+
+    defmodule LocalPoint do
+      defstruct x: 0
+      def new, do: %LocalPoint{}
+    end
+
+    assert LocalPoint.new == %{__struct__: LocalPoint, x: 0}
+
+    defmodule LocalPoint do
+      defstruct x: 0, y: 0
+      def new, do: %LocalPoint{}
+    end
+
+    assert LocalPoint.new == %{__struct__: LocalPoint, x: 0, y: 0}
+  after
+    Code.compiler_options(ignore_module_conflict: false)
+  end
+
   defmodule LocalUser do
     defmodule NestedUser do
       defstruct []