Skip to content

Commit d5bb7b8

Browse files
hroncoktstellar
authored andcommitted
Avoid a race condition in opt-viewer/optrecord (#131214)
See https://bugzilla.redhat.com/2336915 See https://reviews.llvm.org/D41784?id= See androm3da/optviewer-demo#4 (comment) Fixes #62403. The race condition happened when the demangler_proc was being set. The locking mechanism itself happened too late. This way, the lock always exists (to avoid a race when creating it) and is always used when *creating* demangler_proc. (cherry picked from commit e0f8898)
1 parent d15fef4 commit d5bb7b8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

llvm/tools/opt-viewer/optrecord.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,19 @@ class Remark(yaml.YAMLObject):
6464

6565
default_demangler = "c++filt -n"
6666
demangler_proc = None
67+
demangler_lock = Lock()
6768

6869
@classmethod
6970
def set_demangler(cls, demangler):
7071
cls.demangler_proc = subprocess.Popen(
7172
demangler.split(), stdin=subprocess.PIPE, stdout=subprocess.PIPE
7273
)
73-
cls.demangler_lock = Lock()
7474

7575
@classmethod
7676
def demangle(cls, name):
7777
with cls.demangler_lock:
78+
if not cls.demangler_proc:
79+
cls.set_demangler(cls.default_demangler)
7880
cls.demangler_proc.stdin.write((name + "\n").encode("utf-8"))
7981
cls.demangler_proc.stdin.flush()
8082
return cls.demangler_proc.stdout.readline().rstrip().decode("utf-8")
@@ -323,8 +325,6 @@ def get_remarks(input_file, filter_=None):
323325
def gather_results(filenames, num_jobs, should_print_progress, filter_=None):
324326
if should_print_progress:
325327
print("Reading YAML files...")
326-
if not Remark.demangler_proc:
327-
Remark.set_demangler(Remark.default_demangler)
328328
remarks = optpmap.pmap(
329329
get_remarks, filenames, num_jobs, should_print_progress, filter_
330330
)

0 commit comments

Comments
 (0)