Merge branch 'maint'

11 files changed, 90 insertions, 48 deletions

diff --git a/erts/configure.in b/erts/configure.in
index 2ee907b6e4..7995c95aee 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -3576,10 +3576,7 @@ DED_EXT=so
 case $host_os in
     win32) DED_EXT=dll;;
     darwin*)
-	DED_CFLAGS="$DED_CFLAGS -fno-common"
-	if test "X$STATIC_CFLAGS" = "X"; then
-	    STATIC_CFLAGS="-mdynamic-no-pic"
-	fi;;
+	DED_CFLAGS="$DED_CFLAGS -fno-common";;
     *)
 	;;
 esac
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index bd4e5a52d0..4193eb4f3f 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -2964,19 +2964,19 @@ gen_put_integer(LoaderState* stp, GenOpArg Fail, GenOpArg Size,
     NEW_GENOP(stp, op);
 
     NATIVE_ENDIAN(Flags);
-    if (Size.type == TAG_i && Size.val < 0) {
-    error:
 	/* Negative size must fail */
-	op->op = genop_badarg_1;
-	op->arity = 1;
-	op->a[0] = Fail;
-    } else if (Size.type == TAG_i) {
+    if (Size.type == TAG_i) {
 	op->op = genop_i_new_bs_put_integer_imm_4;
 	op->arity = 4;
 	op->a[0] = Fail;
 	op->a[1].type = TAG_u;
 	if (!safe_mul(Size.val, Unit.val, &op->a[1].val)) {
-	    goto error;
+        error:
+            op->op = genop_badarg_1;
+            op->arity = 1;
+            op->a[0] = Fail;
+            op->next = NULL;
+            return op;
 	}
 	op->a[1].val = Size.val * Unit.val;
 	op->a[2].type = Flags.type;
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index 9260c0c4b8..6f9b171224 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -2528,17 +2528,18 @@ const byte d_base_exp_lookup[] = { 31, 19, 15, 13, 11, 11, 10, 9, 9, 8, 8, 8, 8,
  * end
  * How much can the characters which fit in 31 bit represent
  */
-const Uint d_base_base_lookup[] = { 2147483648, 1162261467, 1073741824,
-	1220703125, 362797056, 1977326743, 1073741824, 387420489, 1000000000,
-	214358881, 429981696, 815730721, 1475789056, 170859375, 268435456,
-	410338673, 612220032, 893871739, 1280000000, 1801088541, 113379904,
-	148035889, 191102976, 244140625, 308915776, 387420489, 481890304,
-	594823321, 729000000, 887503681, 1073741824, 1291467969, 1544804416,
-	1838265625, 60466176, 69343957, 79235168, 90224199, 102400000,
-	115856201, 130691232, 147008443, 164916224, 184528125, 205962976,
-	229345007, 254803968, 282475249, 312500000, 345025251, 380204032,
-	418195493, 459165024, 503284375, 550731776, 601692057, 656356768,
-	714924299, 777600000, 844596301, 916132832, 992436543, 1073741824 };
+const Uint d_base_base_lookup[] = { 2147483648u, 1162261467u, 1073741824u,
+	1220703125u, 362797056u, 1977326743u, 1073741824u, 387420489u,
+	1000000000u, 214358881u, 429981696u, 815730721u, 1475789056u,
+	170859375u, 268435456u, 410338673u, 612220032u, 893871739u, 1280000000u,
+	1801088541u, 113379904u, 148035889u, 191102976u, 244140625u, 308915776u,
+	387420489u, 481890304u, 594823321u, 729000000u, 887503681u, 1073741824u,
+	1291467969u, 1544804416u, 1838265625u, 60466176u, 69343957u, 79235168u,
+	90224199u, 102400000u, 115856201u, 130691232u, 147008443u, 164916224u,
+	184528125u, 205962976u, 229345007u, 254803968u, 282475249u, 312500000u,
+	345025251u, 380204032u, 418195493u, 459165024u, 503284375u, 550731776u,
+	601692057u, 656356768u, 714924299u, 777600000u, 844596301u, 916132832u,
+	992436543u, 1073741824u };
 
 Eterm erts_chars_to_integer(Process *BIF_P, char *bytes, 
 			   Uint size, const int base) {
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 41c98bbffb..559cb3efa1 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -1224,9 +1224,7 @@ trace_info_func(Process* p, Eterm func_spec, Eterm key)
 		match_spec_meta = NIL;
 	}
 	if (r & FUNC_TRACE_COUNT_TRACE) {
-	    c = count < 0 ? 
-		erts_make_integer(-count-1, p) : 
-		erts_make_integer(count, p);
+	    c = erts_make_integer(count, p);
 	}
 	if (r & FUNC_TRACE_TIME_TRACE) {
 	    ct = call_time;
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 7cadd4aaad..f93b599632 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -4147,7 +4147,7 @@ port_sig_call(Port *prt,
 	    ErlOffHeap *ohp;
 	    Process *rp;
 	    ErtsProcLocks rp_locks = 0;
-	    Uint hsz;
+	    Sint hsz;
 
 	    rp = erts_proc_lookup_raw(sigdp->caller);
 	    if (!rp)
@@ -4264,7 +4264,7 @@ erts_port_call(Process* c_p,
 	switch (try_call_res) {
 	case ERTS_TRY_IMM_DRV_CALL_OK: {
 	    Eterm *hp, *hp_end;
-	    Uint hsz;
+	    Sint hsz;
 	    unsigned ret_flags = 0U;
 	    Eterm term;
 
@@ -5941,10 +5941,6 @@ int driver_outputv(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen,
 	return driver_output2(ix, hbuf, hlen, NULL, 0);
     size = vec->size - skip;   /* Size of remaining bytes in vector */
 
-    ASSERT(hlen >= 0);       /* debug only */
-    if (hlen < 0)
-	hlen = 0;
-
     prt = erts_drvport2port_state(ix, &state);
     if (prt == ERTS_INVALID_ERL_DRV_PORT)
 	return -1;
diff --git a/erts/emulator/hipe/hipe_x86_signal.c b/erts/emulator/hipe/hipe_x86_signal.c
index 64c0e0da3e..19fc448742 100644
--- a/erts/emulator/hipe/hipe_x86_signal.c
+++ b/erts/emulator/hipe/hipe_x86_signal.c
@@ -183,6 +183,7 @@ static void do_init(void)
 #include <dlfcn.h>
 static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
 #define init_done()	(__next_sigaction != 0)
+extern int _sigaction(int, const struct sigaction*, struct sigaction*);
 #define __SIGACTION _sigaction
 static void do_init(void)
 {
diff --git a/erts/emulator/sys/unix/sys_float.c b/erts/emulator/sys/unix/sys_float.c
index 787f8d6728..689be98969 100644
--- a/erts/emulator/sys/unix/sys_float.c
+++ b/erts/emulator/sys/unix/sys_float.c
@@ -832,6 +832,8 @@ sys_chars_to_double(char* buf, double* fp)
     return 0;
 }
 
+#ifdef USE_MATHERR
+
 int
 matherr(struct exception *exc)
 {
@@ -842,3 +844,5 @@ matherr(struct exception *exc)
 #endif
     return 1;
 }
+
+#endif
diff --git a/erts/emulator/sys/win32/sys_float.c b/erts/emulator/sys/win32/sys_float.c
index fb1ffc3089..e2a777d182 100644
--- a/erts/emulator/sys/win32/sys_float.c
+++ b/erts/emulator/sys/win32/sys_float.c
@@ -133,6 +133,8 @@ sys_double_to_chars_ext(double fp, char *buffer, size_t buffer_size, size_t deci
     return s-buffer; /* i.e strlen(buffer) */
 }
 
+#ifdef USE_MATHERR
+
 int
 matherr(struct _exception *exc)
 {
@@ -141,6 +143,8 @@ matherr(struct _exception *exc)
     return 1;
 }
 
+#endif
+
 static void
 fpe_exception(int sig)
 {
diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Environment.java b/lib/ic/java_src/com/ericsson/otp/ic/Environment.java
index fff854a5f8..4b321fbce7 100644
--- a/lib/ic/java_src/com/ericsson/otp/ic/Environment.java
+++ b/lib/ic/java_src/com/ericsson/otp/ic/Environment.java
@@ -135,8 +135,8 @@ public class Environment {
     if (connection == null)
       connection = self.connect(peer);
  
-    clientP = new com.ericsson.otp.erlang.OtpErlangPid(self); /* This is not perfect */
-    send_ref = new com.ericsson.otp.erlang.OtpErlangRef(self);
+    clientP = self.createPid(); /* This is not perfect */
+    send_ref = self.createRef();
     
   }
 
diff --git a/lib/ic/src/icparse.yrl b/lib/ic/src/icparse.yrl
index d0dd6cde4c..b0286d57f4 100644
--- a/lib/ic/src/icparse.yrl
+++ b/lib/ic/src/icparse.yrl
@@ -230,6 +230,9 @@ Terminals
 Rootsymbol '<specification>'.
 
 
+Expect 9.
+
+
 %%------------------------------------------------------------
 %% Clauses
 %%
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 432ab19423..85bd82a854 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -75,6 +75,7 @@
 -export([otp_9932/1]).
 -export([otp_9423/1]).
 -export([otp_10182/1]).
+-export([memory_check_summary/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% Convenience for manual testing
@@ -149,7 +150,9 @@ all() ->
      give_away, setopts, bad_table, types,
      otp_10182,
      otp_9932,
-     otp_9423].
+     otp_9423,
+     
+     memory_check_summary]. % MUST BE LAST
 
 groups() -> 
     [{new, [],
@@ -185,7 +188,8 @@ init_per_suite(Config) ->
 
 end_per_suite(_Config) ->
     stop_spawn_logger(),
-    catch erts_debug:set_internal_state(available_internal_state, false).
+    catch erts_debug:set_internal_state(available_internal_state, false),
+    ok.
 
 init_per_group(_GroupName, Config) ->
 	Config.
@@ -193,6 +197,26 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
 	Config.
 
+%% Test that we did not have "too many" failed verify_etsmem()'s
+%% in the test suite.
+%% verify_etsmem() may give a low number of false positives
+%% as concurrent activities, such as lingering processes
+%% from earlier test suites, may do unrelated ets (de)allocations.
+memory_check_summary(_Config) ->
+    case whereis(ets_test_spawn_logger) of
+	undefined ->
+	    ?t:fail("No spawn logger exist");
+	_ ->
+	    ets_test_spawn_logger ! {self(), get_failed_memchecks},
+	    receive {get_failed_memchecks, FailedMemchecks} -> ok end,
+	    io:format("Failed memchecks: ~p\n",[FailedMemchecks]),
+	    if FailedMemchecks > 3 ->
+		    ct:fail("Too many failed (~p) memchecks", [FailedMemchecks]);
+	       true ->
+		    ok
+	    end
+    end.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -5684,7 +5708,8 @@ verify_etsmem({MemInfo,AllTabs}) ->
 	    io:format("Actual:   ~p", [MemInfo2]),
 	    io:format("Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
 	    io:format("Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
-	    ?t:fail()
+	    ets_test_spawn_logger ! failed_memcheck,
+	    {comment, "Failed memory check"}
     end.
 
 
@@ -5706,10 +5731,10 @@ stop_loopers(Loopers) ->
 looper(Fun, State) ->
     looper(Fun, Fun(State)).
 
-spawn_logger(Procs) ->
+spawn_logger(Procs, FailedMemchecks) ->
     receive
 	{new_test_proc, Proc} ->
-	    spawn_logger([Proc|Procs]);
+	    spawn_logger([Proc|Procs], FailedMemchecks);
 	{sync_test_procs, Kill, From} ->
 	    lists:foreach(fun (Proc) when From == Proc ->
 				  ok;
@@ -5732,7 +5757,14 @@ spawn_logger(Procs) ->
 				  end
 			  end, Procs),
 	    From ! test_procs_synced,
-	    spawn_logger([From])
+	    spawn_logger([From], FailedMemchecks);
+
+	failed_memcheck ->
+	    spawn_logger(Procs, FailedMemchecks+1);
+
+	{Pid, get_failed_memchecks} ->
+	    Pid ! {get_failed_memchecks, FailedMemchecks},
+	    spawn_logger(Procs, FailedMemchecks)
     end.
 
 pid_status(Pid) ->
@@ -5748,7 +5780,7 @@ start_spawn_logger() ->
     case whereis(ets_test_spawn_logger) of
 	Pid when is_pid(Pid) -> true;
 	_ -> register(ets_test_spawn_logger,
-		      spawn_opt(fun () -> spawn_logger([]) end,
+		      spawn_opt(fun () -> spawn_logger([], 0) end,
 				[{priority, max}]))
     end.
 
@@ -5759,8 +5791,7 @@ start_spawn_logger() ->
 stop_spawn_logger() ->
     Mon = erlang:monitor(process, ets_test_spawn_logger),
     (catch exit(whereis(ets_test_spawn_logger), kill)),
-    receive {'DOWN', Mon, _, _, _} -> ok end,
-    ok.
+    receive {'DOWN', Mon, _, _, _} -> ok end.
 
 wait_for_test_procs() ->
     wait_for_test_procs(false).
@@ -5860,7 +5891,7 @@ spawn_monitor_with_pid(Pid, Fun, N) ->
 		  end) of
 	Pid ->
 	    {Pid, erlang:monitor(process, Pid)};
-	Other ->
+	_Other ->
 	    spawn_monitor_with_pid(Pid,Fun,N-1)
     end.
 
@@ -6166,11 +6197,18 @@ repeat_for_opts(F, OptGenList) ->
     repeat_for_opts(F, OptGenList, []).
 
 repeat_for_opts(F, [], Acc) ->
-    lists:map(fun(Opts) ->
-                    OptList = lists:filter(fun(E) -> E =/= void end, Opts),
-                    io:format("Calling with options ~p\n",[OptList]),
-		            F(OptList)
-	          end, Acc);
+    lists:foldl(fun(Opts, RV_Acc) ->
+			OptList = lists:filter(fun(E) -> E =/= void end, Opts),
+			io:format("Calling with options ~p\n",[OptList]),
+			RV = F(OptList),
+			case RV_Acc of
+			    {comment,_} -> RV_Acc;
+			    _ -> case RV of
+				     {comment,_} -> RV;
+				     _ -> [RV | RV_Acc]
+				 end
+			end
+	          end, [], Acc);
 repeat_for_opts(F, [OptList | Tail], []) when is_list(OptList) ->
     repeat_for_opts(F, Tail, [[Opt] || Opt <- OptList]);
 repeat_for_opts(F, [OptList | Tail], AccList) when is_list(OptList) ->