From cf3f527eedd5f51c84d8f9573fd6897036259b97 Mon Sep 17 00:00:00 2001 From: Mark Shinwell Date: Tue, 31 Oct 2023 15:24:58 +0000 Subject: [PATCH] flambda-backend: Fix ocaml/testsuite/tests/backtrace/backtrace_systhreads --- testsuite/tests/backtrace/backtrace_systhreads.ml | 2 +- .../backtrace/backtrace_systhreads.reference | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/testsuite/tests/backtrace/backtrace_systhreads.ml b/testsuite/tests/backtrace/backtrace_systhreads.ml index d22ce3a9355..5a31d226166 100644 --- a/testsuite/tests/backtrace/backtrace_systhreads.ml +++ b/testsuite/tests/backtrace/backtrace_systhreads.ml @@ -7,7 +7,7 @@ include systhreads ** native *) -let throw_exn msg = failwith msg [@@inline never] +let throw_exn msg = (failwith [@inlined never]) msg [@@inline never] let thread_func delay = Thread.yield (); diff --git a/testsuite/tests/backtrace/backtrace_systhreads.reference b/testsuite/tests/backtrace/backtrace_systhreads.reference index a11dca8fd0c..57d7b72f024 100644 --- a/testsuite/tests/backtrace/backtrace_systhreads.reference +++ b/testsuite/tests/backtrace/backtrace_systhreads.reference @@ -1,30 +1,25 @@ Thread 2 killed on uncaught exception Failure("0") -Raised at Stdlib.failwith in file "stdlib.ml" (inlined), line 34, characters 17-33 -Raised by primitive operation at Backtrace_systhreads.throw_exn in file "backtrace_systhreads.ml", line 10, characters 20-32 +Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33 Called from Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 14, characters 6-37 Re-raised at Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 18, characters 5-14 Called from Thread.create.(fun) in file "thread.ml", line 51, characters 8-14 Thread 3 killed on uncaught exception Failure("1") -Raised at Stdlib.failwith in file "stdlib.ml" (inlined), line 34, characters 17-33 -Raised by primitive operation at Backtrace_systhreads.throw_exn in file "backtrace_systhreads.ml", line 10, characters 20-32 +Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33 Called from Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 14, characters 6-37 Re-raised at Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 18, characters 5-14 Called from Thread.create.(fun) in file "thread.ml", line 51, characters 8-14 Thread 4 killed on uncaught exception Failure("2") -Raised at Stdlib.failwith in file "stdlib.ml" (inlined), line 34, characters 17-33 -Raised by primitive operation at Backtrace_systhreads.throw_exn in file "backtrace_systhreads.ml", line 10, characters 20-32 +Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33 Called from Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 14, characters 6-37 Re-raised at Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 18, characters 5-14 Called from Thread.create.(fun) in file "thread.ml", line 51, characters 8-14 Thread 5 killed on uncaught exception Failure("3") -Raised at Stdlib.failwith in file "stdlib.ml" (inlined), line 34, characters 17-33 -Raised by primitive operation at Backtrace_systhreads.throw_exn in file "backtrace_systhreads.ml", line 10, characters 20-32 +Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33 Called from Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 14, characters 6-37 Re-raised at Backtrace_systhreads.thread_func in file "backtrace_systhreads.ml", line 18, characters 5-14 Called from Thread.create.(fun) in file "thread.ml", line 51, characters 8-14 Thread 1 killed on uncaught exception Failure("backtrace") -Raised at Stdlib.failwith in file "stdlib.ml" (inlined), line 34, characters 17-33 -Raised by primitive operation at Backtrace_systhreads.throw_exn in file "backtrace_systhreads.ml", line 10, characters 20-32 +Raised at Stdlib.failwith in file "stdlib.ml", line 34, characters 17-33 Called from Backtrace_systhreads.thread_backtrace in file "backtrace_systhreads.ml", line 22, characters 6-27 Re-raised at Backtrace_systhreads.thread_backtrace in file "backtrace_systhreads.ml", line 26, characters 5-14 Called from Thread.create.(fun) in file "thread.ml", line 51, characters 8-14