Merge branch 'bjorn/fun-improvements/OTP-9667'

* bjorn/fun-improvements/OTP-9667:
  sys_pre_expand: Remove incorrect comment
  compiler: Eliminate use of deprecated erlang:hash/2
  beam_asm: Fix broken NewIndex in fun entries
  beam_asm: Strenghten the calculation of Uniq for funs

1 files changed, 31 insertions, 0 deletions

diff --git a/erts/emulator/test/code_SUITE_data/fun_confusion.erl b/erts/emulator/test/code_SUITE_data/fun_confusion.erl
new file mode 100644
index 0000000000..16000861df
--- /dev/null
+++ b/erts/emulator/test/code_SUITE_data/fun_confusion.erl
@@ -0,0 +1,31 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(fun_confusion).
+
+-export([f/0]).
+
+f() ->
+    fun() -> version() end.
+
+version() ->
+    %% Changing the value returned here should change
+    %% the identity of the fun in f/0.
+    ?version.
+