5 files changed, 37 insertions, 7 deletions
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index b69f979397..84d2d5e3ed 100644
--- a/erts/emulator/beam/atom.c
+++ b/erts/emulator/beam/atom.c
@@ -132,9 +132,17 @@ atom_hash(Atom* obj)
     byte* p = obj->name;
     int len = obj->len;
     HashValue h = 0, g;
+    byte v;
 
     while(len--) {
-	h = (h << 4) + *p++;
+	v = *p++;
+	/* latin1 clutch for r16 */
+	if ((v & 0xFE) == 0xC2 && (*p & 0xC0) == 0x80) {
+	    v = (v << 6) | (*p & 0x3F);
+	    p++; len--;
+	}
+	/* normal hashpjw follows for v */
+	h = (h << 4) + v;
 	if ((g = h & 0xf0000000)) {
 	    h ^= (g >> 24);
 	    h ^= g;
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 73264214ce..8a8239493a 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -1081,7 +1081,21 @@ beam_make_current_old(Process *c_p, ErtsProcLocks c_p_locks, Eterm module)
 static int
 is_native(BeamInstr* code)
 {
-    return ((Eterm *)code[MI_FUNCTIONS])[1] != 0;
+    Uint i, num_functions = code[MI_NUM_FUNCTIONS];
+
+    /* Check NativeAdress of first real function in module
+     */
+    for (i=0; i<num_functions; i++) {
+	BeamInstr* func_info = (BeamInstr *) code[MI_FUNCTIONS+i];
+	Eterm name = (Eterm) func_info[3];
+
+	if (is_atom(name)) {
+	    return func_info[1] != 0;    
+	}
+	else ASSERT(is_nil(name)); /* ignore BIF stubs */
+    }
+    /* Not a single non-BIF function? */
+    return 0;
 }
 
 
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index 1562748f2d..059c013322 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -1791,7 +1791,7 @@ BIF_RETTYPE hipe_bifs_remove_refs_from_1(BIF_ALIST_1)
 
     if (BIF_ARG_1 == am_all) {
 	hipe_purge_all_refs();
-	BIF_RET(NIL);
+	BIF_RET(am_ok);
     }
 
     if (!term_to_mfa(BIF_ARG_1, &mfa))
@@ -1828,7 +1828,7 @@ BIF_RETTYPE hipe_bifs_remove_refs_from_1(BIF_ALIST_1)
 	caller_mfa->refers_to = NULL;
     }
     hipe_mfa_info_table_unlock();
-    BIF_RET(NIL);
+    BIF_RET(am_ok);
 }
 
 
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c
index 3be821f8f7..af1c36777f 100644
--- a/erts/emulator/hipe/hipe_native_bif.c
+++ b/erts/emulator/hipe/hipe_native_bif.c
@@ -503,9 +503,7 @@ static int validate_unicode(Eterm arg)
 {
     if (is_not_small(arg) ||
 	arg > make_small(0x10FFFFUL) ||
-	(make_small(0xD800UL) <= arg && arg <= make_small(0xDFFFUL)) ||
-	arg == make_small(0xFFFEUL) ||
-	arg == make_small(0xFFFFUL))
+	(make_small(0xD800UL) <= arg && arg <= make_small(0xDFFFUL)))
 	return 0;
     return 1;
 }
diff --git a/erts/emulator/test/hash_SUITE.erl b/erts/emulator/test/hash_SUITE.erl
index 898eae8c15..e34050cd07 100644
--- a/erts/emulator/test/hash_SUITE.erl
+++ b/erts/emulator/test/hash_SUITE.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -363,6 +364,15 @@ phash2_test() ->
          %% (cannot use block_hash due to compatibility issues...)
 	 {abc,26499},
 	 {abd,26500},
+	 {'åäö', 62518}, 
+	 %% 81 runes as an atom, 'ᚠᚡᚢᚣᚤᚥᚦᚧᚨᚩᚪᚫᚬᚭᚮᚯᚰᚱᚲᚳᚴᚵᚶᚷᚸᚹᚺᚻᚼᚽᚾᚿᛀᛁᛂᛃᛄᛅᛆᛇᛈᛉᛊᛋᛌᛍᛎᛏᛐᛑᛒᛓᛔᛕᛖᛗᛘᛙᛚᛛᛜᛝᛞᛟᛠᛡᛢᛣᛤᛥᛦᛧᛨᛩᛪ᛫᛬᛭ᛮᛯᛰ'
+	 {erlang:binary_to_term(<<131, 118, 0, 243, (unicode:characters_to_binary(lists:seq(5792, 5872)))/binary >>), 241561024},
+	 %% åäö dynamic
+	 {erlang:binary_to_term(<<131, 118, 0, 6, 195, 165, 195, 164, 195, 182>>),62518},
+	 %% the atom '゙゚゛゜ゝゞゟ゠ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズ'
+	 {erlang:binary_to_term(<<131, 118, 0, 102, (unicode:characters_to_binary(lists:seq(12441, 12542)))/binary>>), 246053818},
+	 %% the atom, '😃'
+	 {erlang:binary_to_term(<<131, 118, 0, 4, 240, 159, 152, 131>>), 1026307},
 
 	 %% small
 	 {0,3175731469},