Merge "Handle IOExceptions if addr2line fails." am: 9a192cd10b am: 636042a889
am: 7d17c32a1a
Change-Id: I3b48ff8671e6e73e1c423ec9e54b6fea9edc72c0
This commit is contained in:
@@ -297,6 +297,7 @@ def CallAddr2LineForSet(lib, unique_addrs):
|
||||
child = _PIPE_ADDR2LINE_CACHE.GetProcess(cmd)
|
||||
|
||||
for addr in addrs:
|
||||
try:
|
||||
child.stdin.write("0x%s\n" % addr)
|
||||
child.stdin.flush()
|
||||
records = []
|
||||
@@ -317,6 +318,9 @@ def CallAddr2LineForSet(lib, unique_addrs):
|
||||
# The blank line will cause addr2line to emit "??\n??:0\n".
|
||||
child.stdin.write("\n")
|
||||
first = False
|
||||
except IOError as e:
|
||||
# Remove the / in front of the library name to match other output.
|
||||
records = [(None, lib[1:] + " ***Error: " + str(e))]
|
||||
result[addr] = records
|
||||
addr_cache[addr] = records
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user