3 files changed, 35 insertions, 10 deletions
diff --git a/lib/tools/src/fprof.erl b/lib/tools/src/fprof.erl
index c5c24c8eb3..f9da748fef 100644
--- a/lib/tools/src/fprof.erl
+++ b/lib/tools/src/fprof.erl
@@ -1567,13 +1567,20 @@ trace_handler({trace_ts, Pid, return_to, {_M, _F, Args} = MFArgs, TS} = Trace,
     trace_return_to(Table, Pid, Func, TS),
     TS;
 %%
-%% spawn
+%% spawn, only needed (and reliable) prior to 19.0
 trace_handler({trace_ts, Pid, spawn, Child, MFArgs, TS} = Trace,
 	      Table, _, Dump) ->
     dump_stack(Dump, get(Pid), Trace),
     trace_spawn(Table, Child, MFArgs, TS, Pid),
     TS;
 %%
+%% spawned, added in 19.0
+trace_handler({trace_ts, Pid, spawned, Parent, MFArgs, TS} = Trace,
+	      Table, _, Dump) ->
+    dump_stack(Dump, get(Pid), Trace),
+    trace_spawn(Table, Pid, MFArgs, TS, Parent),
+    TS;
+%%
 %% exit
 trace_handler({trace_ts, Pid, exit, _Reason, TS} = Trace,
 	      Table, _, Dump) ->
@@ -2014,8 +2021,10 @@ trace_spawn(Table, Pid, MFArgs, TS, Parent) ->
 	    ets:insert(Table, #proc{id = Pid, parent = Parent,
 				    spawned_as = MFArgs});
 	_ ->
-	    throw({inconsistent_trace_data, ?MODULE, ?LINE,
-		  [Pid, MFArgs, TS, Parent, Stack]})
+            %% In 19.0 we get both a spawn and spawned event,
+            %% however we do not know the order so we just ignore
+            %% the second event that comes
+	    ok
     end.
 
 
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index ba3b71cc1f..e908413315 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -81,9 +81,6 @@ basic(Config) when is_list(Config) ->
 
     %% error case
 
-    error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
-    Pid       = whereis(eprof),
-    error     = eprof:profile([Pid], fun() -> eprof_test:go(10) end),
     A         = spawn(fun() -> receive _ -> ok end end),
     profiling = eprof:profile([A]),
     true      = exit(A, kill_it),
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 244bdaaf0e..e18d384b52 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -985,10 +985,15 @@ handle_trace({trace_ts,Pid,spawn,NewPid,{M,F,Args},TS},P) ->
     MFA = {M,F,length(Args)},
     ?dbg("~p",[{{spawn,Pid,NewPid,MFA},get(Pid)}]),
     T = ts_sub(TS,get({Pid,last_ts})),
-    put({NewPid,last_ts},TS),
-    put(NewPid,[suspend,MFA]),
-    insert(NewPid,suspend),
-    insert(NewPid,MFA),
+    case get(NewPid) of
+        undefined ->
+            put({NewPid,last_ts},TS),
+            put(NewPid,[suspend,MFA]),
+            insert(NewPid,suspend),
+            insert(NewPid,MFA);
+        _Else ->
+            ok
+    end,
     case get(Pid) of
         [SpawningMFA|_] = Stack ->
             update_own(Pid,SpawningMFA,T),
@@ -996,6 +1001,19 @@ handle_trace({trace_ts,Pid,spawn,NewPid,{M,F,Args},TS},P) ->
     end,
     put({Pid,last_ts},TS),
     P;
+handle_trace({trace_ts,NewPid,spawned,Pid,{M,F,Args},TS},P) ->
+    MFA = {M,F,length(Args)},
+    ?dbg("~p",[{{spawned,NewPid,Pid,MFA},get(NewPid)}]),
+    case get(NewPid) of
+        undefined ->
+            put({NewPid,last_ts},TS),
+            put(NewPid,[suspend,MFA]),
+            insert(NewPid,suspend),
+            insert(NewPid,MFA);
+        _Else ->
+            ok
+    end,
+    P;
 handle_trace({trace_ts,Pid,exit,_Reason,TS},P) ->
     ?dbg("~p",[{{exit,Pid,_Reason},get(Pid)}]),
     T = ts_sub(TS,get({Pid,last_ts})),
@@ -1023,6 +1041,7 @@ handle_trace(end_of_trace,P) ->
     P ! {result,[{totals,TotAcc,TotOwn}|ProcOwns]++Result},
     P;
 handle_trace(Other,_P) ->
+    ct:log("Got unexpected trace message: ~p",[Other]),
     exit({unexpected,Other}).
 
 find_return_to(MFA,[MFA|_]=Stack) ->