Fix the build

Author: José Valim

lib/elixir/lib/exception.ex

@@ -613,12 +613,12 @@ defmodule BadArityError do
 end
 
 defmodule UndefinedFunctionError do
-  defexception [module: nil, function: nil, arity: nil]
+  defexception [module: nil, function: nil, arity: nil, self: false]
 
-  def message(%{function: function, module: module, arity: arity}) do
+  def message(%{function: function, module: module, arity: arity, self: self}) do
     if function do
       formatted = Exception.format_mfa module, function, arity
-      suffix = if nil?(module) || :code.is_loaded(module) do
+      suffix = if self or nil?(module) or :code.is_loaded(module) do
         ""
       else
         " (module #{inspect module} is not available)"
@@ -777,8 +777,9 @@ defmodule ErlangError do
   end
 
   def normalize(:undef, stacktrace) do
-    {mod, fun, arity} = from_stacktrace(stacktrace || :erlang.get_stacktrace)
-    %UndefinedFunctionError{module: mod, function: fun, arity: arity}
+    stacktrace = stacktrace || :erlang.get_stacktrace
+    {mod, fun, arity} = from_stacktrace(stacktrace)
+    %UndefinedFunctionError{module: mod, function: fun, arity: arity, self: from_self(stacktrace)}
   end
 
   def normalize(:function_clause, stacktrace) do
@@ -805,4 +806,7 @@ defmodule ErlangError do
   defp from_stacktrace(_) do
     {nil, nil, nil}
   end
+
+  defp from_self([{module, _, _, _}, {module, _, _, _}|_]), do: true
+  defp from_self(_), do: false
 end

lib/elixir/test/elixir/kernel/raise_test.exs

@@ -226,7 +226,7 @@ defmodule Kernel.RaiseTest do
       x in [UndefinedFunctionError] -> Exception.message(x)
     end
 
-    assert result == "undefined function: DoNotExist.for_sure/0"
+    assert result == "undefined function: DoNotExist.for_sure/0 (module DoNotExist is not available)"
   end
 
   test :function_clause_error do
@@ -352,7 +352,7 @@ defmodule Kernel.RaiseTest do
       x in [ErlangError] -> Exception.message(x)
     end
 
-    assert result == "undefined function: DoNotExist.for_sure/0"
+    assert result == "undefined function: DoNotExist.for_sure/0 (module DoNotExist is not available)"
   end
 
   defmacrop exceptions do
@@ -366,7 +366,7 @@ defmodule Kernel.RaiseTest do
       x in exceptions -> Exception.message(x)
     end
 
-    assert result == "undefined function: DoNotExist.for_sure/0"
+    assert result == "undefined function: DoNotExist.for_sure/0 (module DoNotExist is not available)"
   end
 
   defp zero(0), do: 0

lib/ex_unit/test/ex_unit/assertions_test.exs

@@ -226,7 +226,8 @@ defmodule ExUnit.AssertionsTest do
     end
   rescue
     error in [ExUnit.AssertionError] ->
-      "Expected exception ArgumentError but got UndefinedFunctionError (undefined function: Not.Defined.function/3)" = error.message
+      "Expected exception ArgumentError but got UndefinedFunctionError " <>
+      "(undefined function: Not.Defined.function/3 (module Not.Defined is not available))" = error.message
   end
 
   test "assert raise with erlang error" do

lib/ex_unit/test/ex_unit/doc_test_test.exs

@@ -239,7 +239,7 @@ defmodule ExUnit.DocTestTest do
     assert output =~ """
       4) test moduledoc at ExUnit.DocTestTest.Invalid (4) (ExUnit.DocTestTest.ActuallyCompiled)
          test/ex_unit/doc_test_test.exs:204
-         Doctest failed: got UndefinedFunctionError with message undefined function: Hello.world/0
+         Doctest failed: got UndefinedFunctionError with message undefined function: Hello.world/0 (module Hello is not available)
          code:  Hello.world
          stacktrace:
            test/ex_unit/doc_test_test.exs:112: ExUnit.DocTestTest.Invalid (module)

lib/iex/test/iex/helpers_test.exs

@@ -168,7 +168,7 @@ defmodule IEx.HelpersTest do
   end
 
   test "c helper" do
-    assert_raise UndefinedFunctionError, "undefined function: Sample.run/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: Sample\.run/0", fn ->
       Sample.run
     end
 
@@ -192,7 +192,7 @@ defmodule IEx.HelpersTest do
   end
 
   test "c helper multiple modules" do
-    assert_raise UndefinedFunctionError, "undefined function: Sample.run/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: Sample.run/0", fn ->
       Sample.run
     end
 
@@ -207,7 +207,7 @@ defmodule IEx.HelpersTest do
   end
 
   test "c helper list" do
-    assert_raise UndefinedFunctionError, "undefined function: Sample.run/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: Sample.run/0", fn ->
       Sample.run
     end
 
@@ -222,7 +222,7 @@ defmodule IEx.HelpersTest do
   end
 
   test "c helper erlang" do
-    assert_raise UndefinedFunctionError, "undefined function: :sample.hello/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: :sample.hello/0", fn ->
       :sample.hello
     end
 
@@ -237,7 +237,7 @@ defmodule IEx.HelpersTest do
 
 
   test "c helper skips unknown files" do
-    assert_raise UndefinedFunctionError, "undefined function: :sample.hello/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: :sample.hello/0", fn ->
       :sample.hello
     end
 
@@ -253,7 +253,7 @@ defmodule IEx.HelpersTest do
 
 
   test "l helper" do
-    assert_raise UndefinedFunctionError, "undefined function: Sample.run/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: Sample.run/0", fn ->
       Sample.run
     end
 
@@ -284,7 +284,7 @@ defmodule IEx.HelpersTest do
   end
 
   test "r helper elixir" do
-    assert_raise UndefinedFunctionError, "undefined function: Sample.run/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: Sample.run/0", fn ->
       Sample.run
     end
 
@@ -307,7 +307,7 @@ defmodule IEx.HelpersTest do
   end
 
   test "r helper erlang" do
-    assert_raise UndefinedFunctionError, "undefined function: :sample.hello/0", fn ->
+    assert_raise UndefinedFunctionError, ~r"undefined function: :sample.hello/0", fn ->
       :sample.hello
     end