Merge branch 'lukas/erts/misc_fixes'

* lukas/erts/misc_fixes:
  erts: Fix a bunch of compiler warnings
  kernel: Fix gen_tcp_misc indentation
  erts: Fail port_SUITE:huge_env if error code > 127
  erts: Add lcnt prototype for dist locks update

10 files changed, 53 insertions, 40 deletions

diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 70078c8c59..509aa2a84f 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -408,7 +408,10 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
         addr++;
         ap = addr;
     } else {
-        BeamInstr instr_word = addr++[0];
+#if defined(ARCH_64) && defined(CODE_MODEL_SMALL)
+        BeamInstr instr_word = addr[0];
+#endif
+        addr++;
 
 	/*
 	 * Copy all arguments to a local buffer for the unpacking.
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index bbccd0b79d..7331c331a6 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -5022,7 +5022,7 @@ freeze_code(LoaderState* stp)
                  */
                 codev[pos] = (BeamInstr) (codev + value);
             } else {
-#ifdef DEBUG
+#if defined(DEBUG) && defined(BEAM_WIDE_MASK)
                 Uint w;
 #endif
                 Sint32 rel = lp->offset + value;
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index ad555bb195..4b11884f38 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -4200,7 +4200,7 @@ BIF_RETTYPE list_to_port_1(BIF_ALIST_1)
 
     cp += 6; /* strlen("#Port<") */
 
-    if (sscanf(cp, "%u.%u>", &n, &p) < 2)
+    if (sscanf(cp, "%u.%u>", (unsigned int*)&n, (unsigned int*)&p) < 2)
         goto bad;
 
     if (p > ERTS_MAX_PORT_NUMBER)
diff --git a/erts/emulator/beam/erl_io_queue.c b/erts/emulator/beam/erl_io_queue.c
index 190ba6bbb9..40d69ea6b0 100644
--- a/erts/emulator/beam/erl_io_queue.c
+++ b/erts/emulator/beam/erl_io_queue.c
@@ -658,7 +658,7 @@ io_list_vec_count(Eterm obj, Uint *v_size,
 int
 erts_ioq_iolist_vec_len(Eterm obj, int* vsize, Uint* csize,
                         Uint* pvsize, Uint* pcsize,
-                        Uint* total_size, Uint blimit)
+                        size_t* total_size, Uint blimit)
 {
     DECLARE_ESTACK(s);
     Eterm* objp;
@@ -669,7 +669,7 @@ erts_ioq_iolist_vec_len(Eterm obj, int* vsize, Uint* csize,
     Uint p_v_size = 0;
     Uint p_c_size = 0;
     Uint p_in_clist = 0;
-    Uint total;
+    size_t total;
 
     goto L_jump_start;  /* avoid a push */
 
diff --git a/erts/emulator/beam/erl_io_queue.h b/erts/emulator/beam/erl_io_queue.h
index 51abe99510..7d0fe6751c 100644
--- a/erts/emulator/beam/erl_io_queue.h
+++ b/erts/emulator/beam/erl_io_queue.h
@@ -103,7 +103,7 @@ Uint erts_ioq_sizeq(ErtsIOQueue *q);
 
 int erts_ioq_iolist_vec_len(Eterm obj, int* vsize, Uint* csize,
                             Uint* pvsize, Uint* pcsize,
-                            Uint* total_size, Uint blimit);
+                            size_t* total_size, Uint blimit);
 int erts_ioq_iolist_to_vec(Eterm obj, SysIOVec* iov,
                            ErtsIOQBinary** binv, ErtsIOQBinary* cbin,
                            Uint bin_limit, int driver_binary);
@@ -111,7 +111,7 @@ int erts_ioq_iolist_to_vec(Eterm obj, SysIOVec* iov,
 ERTS_GLB_INLINE
 int erts_ioq_iodata_vec_len(Eterm obj, int* vsize, Uint* csize,
                             Uint* pvsize, Uint* pcsize,
-                            Uint* total_size, Uint blimit);
+                            size_t* total_size, Uint blimit);
 ERTS_GLB_INLINE
 int erts_ioq_iodata_to_vec(Eterm obj, SysIOVec* iov,
                            ErtsIOQBinary** binv, ErtsIOQBinary* cbin,
@@ -123,7 +123,7 @@ int erts_ioq_iodata_to_vec(Eterm obj, SysIOVec* iov,
 ERTS_GLB_INLINE
 int erts_ioq_iodata_vec_len(Eterm obj, int* vsize, Uint* csize,
                             Uint* pvsize, Uint* pcsize,
-                            Uint* total_size, Uint blimit) {
+                            size_t* total_size, Uint blimit) {
   if (is_binary(obj)) {
     /* We optimize for when we get a procbin without a bit-offset
      * that fits in one iov slot
diff --git a/erts/emulator/beam/erl_node_tables.h b/erts/emulator/beam/erl_node_tables.h
index 3bba673435..ee8277b5ea 100644
--- a/erts/emulator/beam/erl_node_tables.h
+++ b/erts/emulator/beam/erl_node_tables.h
@@ -271,5 +271,6 @@ erts_de_links_unlock(DistEntry *dep)
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 void erts_debug_test_node_tab_delayed_delete(Sint64 millisecs);
+void erts_lcnt_update_distribution_locks(int enable);
 
 #endif
diff --git a/erts/emulator/beam/erl_term.h b/erts/emulator/beam/erl_term.h
index 6daf043117..5ec6b6b44b 100644
--- a/erts/emulator/beam/erl_term.h
+++ b/erts/emulator/beam/erl_term.h
@@ -862,7 +862,7 @@ do {									\
   ((ErtsMRefThing *) (Hp))->mb = (Binp);				\
   ((ErtsMRefThing *) (Hp))->next = (Ohp)->first;			\
   (Ohp)->first = (struct erl_off_heap_header*) (Hp);			\
-  ASSERT(erts_is_ref_numbers_magic(&(Binp)->refn));			\
+  ASSERT(erts_is_ref_numbers_magic((Binp)->refn));			\
 } while (0)
 
 #endif /* ARCH_32 */
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 30a595c17a..7aa53e8f36 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -2059,7 +2059,8 @@ uint32_t epoll_events(int kp_fd, int fd)
         int ev_fd;
         uint32_t events;
         uint64_t data;
-        if (fscanf(f,"tfd:%d events:%x data:%lx\n", &ev_fd, &events, &data) != 3) {
+        if (fscanf(f,"tfd:%d events:%x data:%llx\n", &ev_fd, &events,
+                   (unsigned long long*)&data) != 3) {
             fprintf(stderr,"failed to parse file %s on line %d, errno = %d\n", fname,
                     line,
                     errno);
@@ -2125,7 +2126,8 @@ ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet *ps,
         int fd;
         uint32_t events;
         uint64_t data;
-        if (fscanf(f,"tfd:%d events:%x data:%lx\n", &fd, &events, &data) != 3) {
+        if (fscanf(f,"tfd:%d events:%x data:%llx\n", &fd, &events,
+                   (unsigned long long*)&data) != 3) {
             fprintf(stderr,"failed to parse file %s on line %d, errno = %d\n",
                     fname, line, errno);
             ASSERT(0);
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index f29528a22f..e46665a881 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -1035,6 +1035,9 @@ huge_env(Config) when is_list(Config) ->
     try erlang:open_port({spawn,Cmd},[exit_status, {env, Env}]) of
         P ->
             receive
+                {P, {exit_status,N}} = M when N > 127->
+                    %% If exit status is > 127 something went very wrong
+                    ct:fail("Open port failed got ~p",[M]);
                 {P, {exit_status,N}} = M ->
                     %% We test that the exit status is an integer, this means
                     %% that the child program has started. If we get an atom
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 331864b5de..e47023d201 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1572,52 +1572,56 @@ fill_sendq(Config) when is_list(Config) ->
     Master = self(),
     Server =
 	spawn_link(fun () ->
-			   {ok,L} = gen_tcp:listen
-				      (0, [{active,false},binary,
-					   {reuseaddr,true},{packet,0}]),
+			   {ok,L} = gen_tcp:listen(0, [{active,false},binary,
+                                                       {reuseaddr,true},{packet,0}]),
 			   {ok,Port} = inet:port(L),
 			   Master ! {self(),client,
 				     fill_sendq_client(Port, Master)},
 			   fill_sendq_srv(L, Master)
 		   end),
     io:format("~p Server~n", [Server]),
-    receive {Server,client,Client} ->
-		  io:format("~p Client~n", [Client]),
-		  receive {Server,reader,Reader} ->
-				io:format("~p Reader~n", [Reader]),
-				fill_sendq_loop(Server, Client, Reader)
+    receive
+        {Server,client,Client} ->
+            io:format("~p Client~n", [Client]),
+            receive
+                {Server,reader,Reader} ->
+                    io:format("~p Reader~n", [Reader]),
+                    fill_sendq_loop(Server, Client, Reader)
 	    end
     end.
 
 fill_sendq_loop(Server, Client, Reader) ->
     %% Master
     %%
-    receive {Server,send} ->
+    receive
+        {Server,send} ->
 	    fill_sendq_loop(Server, Client, Reader)
     after 2000 ->
 	    %% Send queue full, sender blocked -> close client.
 	    io:format("Send timeout, closing Client...~n", []),
 	    Client ! {self(),close},
-	    receive {Server,[{error,closed}]} ->
-			  io:format("Got server closed.~n"),
-			  receive {Reader,[{error,closed}]} ->
-					io:format
-						("Got reader closed.~n"),
-					ok
-				after 3000 ->
-					ct:fail({timeout,{closed,reader}})
-				end;
-			  {Reader,[{error,closed}]} ->
-			  io:format("Got reader closed.~n"),
-			  receive {Server,[{error,closed}]} ->
-					io:format("Got server closed~n"),
-					ok
-				after 3000 ->
-					ct:fail({timeout,{closed,server}})
-				end
-		  after 3000 ->
-			  ct:fail({timeout,{closed,[server,reader]}})
-		  end
+	    receive
+                {Server,[{error,closed}]} ->
+                    io:format("Got server closed.~n"),
+                    receive
+                        {Reader,[{error,closed}]} ->
+                            io:format("Got reader closed.~n"),
+                            ok
+                    after 3000 ->
+                            ct:fail({timeout,{closed,reader}})
+                    end;
+                {Reader,[{error,closed}]} ->
+                    io:format("Got reader closed.~n"),
+                    receive
+                        {Server,[{error,closed}]} ->
+                            io:format("Got server closed~n"),
+                            ok
+                    after 3000 ->
+                            ct:fail({timeout,{closed,server}})
+                    end
+            after 3000 ->
+                    ct:fail({timeout,{closed,[server,reader]}})
+            end
     end.
 
 fill_sendq_srv(L, Master) ->