Raise when loading struct info

Author: josevalim

lib/elixir/lib/macro.ex

@@ -973,7 +973,7 @@ defmodule Macro do
   def struct_info!(module, env) when is_atom(module) do
     meta = [line: env.line]
 
-    case :elixir_map.maybe_load_struct_info(meta, module, env) do
+    case :elixir_map.maybe_load_struct_info(meta, module, :hard, env) do
       {:ok, info} ->
         :elixir_env.trace({:struct_expansion, meta, module, []}, env)
         info

lib/elixir/lib/module/types/of.ex

@@ -495,7 +495,7 @@ defmodule Module.Types.Of do
   def struct_info(struct, kind, meta, stack, context) do
     case stack.no_warn_undefined do
       %Macro.Env{} = env ->
-        case :elixir_map.maybe_load_struct_info(meta, struct, env) do
+        case :elixir_map.maybe_load_struct_info(meta, struct, :soft, env) do
           {:ok, info} -> {info, context}
           {:error, _desc} -> {nil, context}
         end

lib/elixir/src/elixir_map.erl

@@ -3,7 +3,7 @@
 %% SPDX-FileCopyrightText: 2012 Plataformatec
 
 -module(elixir_map).
--export([expand_map/4, expand_struct/5, format_error/1, maybe_load_struct_info/3]).
+-export([expand_map/4, expand_struct/5, format_error/1, maybe_load_struct_info/4]).
 -import(elixir_errors, [function_error/4, file_error/4, file_warn/4]).
 -include("elixir.hrl").
 
@@ -139,22 +139,19 @@ assert_struct_info_if_not_function(Meta, Name, Assocs, #{function := nil} = E) -
 assert_struct_info_if_not_function(_Meta, _Name, _Assocs, _E) ->
   ok.
 
-maybe_load_struct_info(Meta, Name, E) ->
-  maybe_load_struct_info(Meta, Name, soft, E).
-
 maybe_load_struct_info(Meta, Name, Mode, E) ->
   try
-    InContext = in_context(Name, E),
+    Lookup = in_context(Name, E) orelse is_compiling_struct(Meta, Name, Mode, E),
 
-    case (InContext orelse is_compiling_struct(Meta, Name, Mode, E))
-           andalso lookup_struct_info_from_data_tables(Name) of
+    case lookup_struct_info_from_data_tables(Name) of
       %% If I am accessing myself and there is no attribute,
       %% don't invoke the fallback to avoid calling loaded code.
       false when ?key(E, module) =:= Name -> nil;
       false ->
-        %% We already attempted to wait for the struct (unless InContext),
-        %% so we only invoke '__info__' if already loaded or InContext
-        case InContext orelse erlang:module_loaded(Name) of
+        %% If we attempted to lookup a definition, we always invoke it, to deal
+        %% with potential race conditions about the table being deleted at the
+        %% time we were looking up.
+        case Lookup orelse erlang:module_loaded(Name) of
           true -> Name:'__info__'(struct);
           false -> nil
         end;

lib/elixir/test/elixir/code_test.exs

@@ -811,13 +811,13 @@ defmodule CodeTest do
     message = "unknown compiler option: :not_a_valid_option"
 
     assert_raise RuntimeError, message, fn ->
-      Code.put_compiler_option(:not_a_valid_option, :foo)
+      Code.put_compiler_option(Process.get(:unused, :not_a_valid_option), :ok)
     end
 
     message = "compiler option :debug_info should be a boolean, got: :not_a_boolean"
 
     assert_raise RuntimeError, message, fn ->
-      Code.put_compiler_option(:debug_info, :not_a_boolean)
+      Code.put_compiler_option(:debug_info, Process.get(:unused, :not_a_boolean))
     end
   end
 

lib/elixir/test/elixir/config/provider_test.exs

@@ -77,8 +77,13 @@ defmodule Config.ProviderTest do
       assert Provider.validate_config_path!("/foo") == :ok
       assert Provider.validate_config_path!({:system, "foo", "bar"}) == :ok
 
-      assert_raise ArgumentError, fn -> Provider.validate_config_path!({:system, 1, 2}) end
-      assert_raise ArgumentError, fn -> Provider.validate_config_path!(~c"baz") end
+      assert_raise ArgumentError, fn ->
+        Provider.validate_config_path!(Process.get(:unused, {:system, 1, 2}))
+      end
+
+      assert_raise ArgumentError, fn ->
+        Provider.validate_config_path!(Process.get(:unused, ~c"baz"))
+      end
     end
 
     test "resolve!" do