File 0134-erts-Fix-unused-variable-warnings-in-dtrac... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0134-erts-Fix-unused-variable-warnings-in-dtrace-build.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Currently displaying revision 0e04b8d79a55adf8ba49c177393a4846 , Show latest

From b5c84df6a66af68e7fbba0ef2e4fa3d2116c792f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Thu, 7 Oct 2021 12:00:30 +0200
Subject: [PATCH 2/3] erts: Fix unused variable warnings in dtrace build

---
 erts/emulator/beam/erl_async.c          | 18 ------------------
 erts/emulator/beam/erl_proc_sig_queue.c |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index 0f33459fa4..b1aef68b82 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -115,17 +115,6 @@ typedef struct {
     ErtsAlgndAsyncReadyQ *ready_queue;
 } ErtsAsyncData;
 
-#if defined(USE_VM_PROBES)
-
-/*
- * Some compilers, e.g. GCC 4.2.1 and -O3, will optimize away DTrace
- * calls if they're the last thing in the function.  :-(
- * Many thanks to Trond Norbye, via:
- * https://github.com/memcached/memcached/commit/6298b3978687530bc9d219b6ac707a1b681b2a46
- */
-static unsigned gcc_optimizer_hack = 0;
-#endif
-
 int erts_async_max_threads; /* Initialized by erl_init.c */
 int erts_async_thread_suggested_stack_size; /* Initialized by erl_init.c */
 
@@ -238,10 +227,6 @@ erts_get_async_ready_queue(Uint sched_id)
 
 static ERTS_INLINE void async_add(ErtsAsync *a, ErtsAsyncQ* q)
 {
-#ifdef USE_VM_PROBES
-    int len;
-#endif
-
     if (is_internal_port(a->port)) {
 	ErtsAsyncReadyQ *arq = async_ready_q(a->sched_id);
 	a->q.prep_enq = erts_thr_q_prepare_enqueue(&arq->thr_q);
@@ -263,9 +248,6 @@ static ERTS_INLINE ErtsAsync *async_get(ErtsThrQ_t *q,
 {
     int saved_fin_deq = 0;
     ErtsThrQFinDeQ_t fin_deq;
-#ifdef USE_VM_PROBES
-    int len;
-#endif
 
     while (1) {
 	ErtsAsync *a = (ErtsAsync *) erts_thr_q_dequeue(q);
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index 711e15bc92..5ebeae75b0 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -455,6 +455,7 @@ sig_enqueue_trace(Process *c_p, ErtsMessage **sigp, int op,
             ErtsExitSignalData *xsigd;
 
             ASSERT(type == ERTS_SIG_Q_TYPE_GEN_EXIT);
+            (void)type;
 
             xsigd = get_exit_signal_data(sig);
             reason = xsigd->reason;
-- 
2.31.1

Places

File 0134-erts-Fix-unused-variable-warnings-in-dtrace-build.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Places