|
 |
b8e312 |
commit e3287bddcdc51705bb206479daa82e97fb28071f
|
|
|
b8e312 |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
b8e312 |
Date: Wed Dec 9 22:29:43 2020 -0500
|
|
|
b8e312 |
|
|
|
b8e312 |
PR27044: fix lock loop for conditional probes
|
|
|
b8e312 |
|
|
|
b8e312 |
Emit a nested block carefully so that the "goto out;" from a failed
|
|
|
b8e312 |
stp_lock_probe() call in that spot near the epilogue of a
|
|
|
b8e312 |
probe-handler goes downward, not upward.
|
|
|
b8e312 |
|
|
|
b8e312 |
diff --git a/translate.cxx b/translate.cxx
|
|
|
b8e312 |
index f0195486c..d7fe1e3b2 100644
|
|
|
b8e312 |
--- a/translate.cxx
|
|
|
b8e312 |
+++ b/translate.cxx
|
|
|
b8e312 |
@@ -2969,21 +2969,21 @@ c_unparser::emit_probe (derived_probe* v)
|
|
|
b8e312 |
{
|
|
|
b8e312 |
// PR26296
|
|
|
b8e312 |
// emit all read/write locks for global variables ... if somehow still not done by now
|
|
|
b8e312 |
+ // emit a local out: label, for error catching in these condition exprs
|
|
|
b8e312 |
+ o->newline() << "{";
|
|
|
b8e312 |
+ o->newline(1) << "__label__ out, deref_fault;";
|
|
|
b8e312 |
if (v->needs_global_locks ())
|
|
|
b8e312 |
emit_lock ();
|
|
|
b8e312 |
|
|
|
b8e312 |
for (set<derived_probe*>::const_iterator
|
|
|
b8e312 |
- it = v->probes_with_affected_conditions.begin();
|
|
|
b8e312 |
- it != v->probes_with_affected_conditions.end(); ++it)
|
|
|
b8e312 |
+ it = v->probes_with_affected_conditions.begin();
|
|
|
b8e312 |
+ it != v->probes_with_affected_conditions.end(); ++it)
|
|
|
b8e312 |
{
|
|
|
b8e312 |
- // emit a local out: label, for error catching in these condition exprs
|
|
|
b8e312 |
- o->newline() << "{";
|
|
|
b8e312 |
- o->newline(1) << "__label__ out, deref_fault;";
|
|
|
b8e312 |
emit_probe_condition_update(*it);
|
|
|
b8e312 |
- o->newline(-1) << "deref_fault: __attribute__((unused));";
|
|
|
b8e312 |
- o->newline() << "out: __attribute__((unused));";
|
|
|
b8e312 |
- o->newline() << "}";
|
|
|
b8e312 |
}
|
|
|
b8e312 |
+ o->newline(-1) << "deref_fault: __attribute__((unused));";
|
|
|
b8e312 |
+ o->newline() << "out: __attribute__((unused));";
|
|
|
b8e312 |
+ o->newline() << "}";
|
|
|
b8e312 |
}
|
|
|
b8e312 |
|
|
|
b8e312 |
// PR26296
|