Merge branch 'maint'

* maint:
  xmerl: Remove 'no_return' Dialyzer warnings
  xmerl: Add suppression of Dialyzer warnings
  eunit: Add suppression of Dialyzer warnings
  debugger: Add suppression of Dialyzer warnings
  kernel: Add suppression of Dialyzer warnings
  mnesia: Add suppression of Dialyzer warnings
  observer: Add suppression of Dialyzer warnings
  runtime_tools: Add suppression of Dialyzer warnings
  stdlib: Add suppression of Dialyzer warnings
  test_server: Add suppression of Dialyzer warnings
  tools: Add suppression of Dialyzer warnings

Conflicts:
	lib/stdlib/src/erl_lint.erl
	lib/stdlib/src/otp_internal.erl

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index 4c34f253c6..1b274e20ae 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -267,7 +267,7 @@ handle_int_msg({old_code,Mod}, Status, Bs,
 	       #ieval{level=Le,module=M}=Ieval) ->
     if
 	Status =:= idle, Le =:= 1 ->
-	    erase([Mod|db]),
+	    erase(?DB_REF_KEY(Mod)),
 	    put(cache, []);
 	true ->
 	    case dbg_istk:in_use_p(Mod, M) of
@@ -277,7 +277,7 @@ handle_int_msg({old_code,Mod}, Status, Bs,
 		    exit(get(self), kill),
 		    dbg_ieval:exception(exit, old_code, Bs, Ieval);
 		false ->
-		    erase([Mod|db]),
+		    erase(?DB_REF_KEY(Mod)),
 		    put(cache, [])
 	    end
     end;