[compiler-rt] Fix frame numbering for unparsable frames. (#148278)
This can happen when JIT code is run, and we can't symbolize those frames, but they should remain numbered in the stack. An example spidermonkey trace: ``` #0 0x564ac90fb80f (/builds/worker/dist/bin/js+0x240e80f) (BuildId: 5d053c76aad4cfbd08259f8832e7ac78bbeeab58) #1 0x564ac9223a64 (/builds/worker/dist/bin/js+0x2536a64) (BuildId: 5d053c76aad4cfbd08259f8832e7ac78bbeeab58) #2 0x564ac922316f (/builds/worker/dist/bin/js+0x253616f) (BuildId: 5d053c76aad4cfbd08259f8832e7ac78bbeeab58) #3 0x564ac9eac032 (/builds/worker/dist/bin/js+0x31bf032) (BuildId: 5d053c76aad4cfbd08259f8832e7ac78bbeeab58) #4 0x0dec477ca22e (<unknown module>) ``` Without this change, the following symbolization is output: ``` #0 0x55a6d72f980f in MOZ_CrashSequence /builds/worker/workspace/obj-build/dist/include/mozilla/Assertions.h:248:3 #1 0x55a6d72f980f in Crash(JSContext*, unsigned int, JS::Value*) /builds/worker/checkouts/gecko/js/src/shell/js.cpp:4223:5 #2 0x55a6d7421a64 in CallJSNative(JSContext*, bool (*)(JSContext*, unsigned int, JS::Value*), js::CallReason, JS::CallArgs const&) /builds/worker/checkouts/gecko/js/src/vm/Interpreter.cpp:501:13 #3 0x55a6d742116f in js::InternalCallOrConstruct(JSContext*, JS::CallArgs const&, js::MaybeConstruct, js::CallReason) /builds/worker/checkouts/gecko/js/src/vm/Interpreter.cpp:597:12 #4 0x55a6d80aa032 in js::jit::DoCallFallback(JSContext*, js::jit::BaselineFrame*, js::jit::ICFallbackStub*, unsigned int, JS::Value*, JS::MutableHandle<JS::Value>) /builds/worker/checkouts/gecko/js/src/jit/BaselineIC.cpp:1705:10 #4 0x2c803bd8f22e (<unknown module>) ``` The last frame has a duplicate number. With this change the numbering is correct: ``` #0 0x5620c58ec80f in MOZ_CrashSequence /builds/worker/workspace/obj-build/dist/include/mozilla/Assertions.h:248:3 #1 0x5620c58ec80f in Crash(JSContext*, unsigned int, JS::Value*) /builds/worker/checkouts/gecko/js/src/shell/js.cpp:4223:5 #2 0x5620c5a14a64 in CallJSNative(JSContext*, bool (*)(JSContext*, unsigned int, JS::Value*), js::CallReason, JS::CallArgs const&) /builds/worker/checkouts/gecko/js/src/vm/Interpreter.cpp:501:13 #3 0x5620c5a1416f in js::InternalCallOrConstruct(JSContext*, JS::CallArgs const&, js::MaybeConstruct, js::CallReason) /builds/worker/checkouts/gecko/js/src/vm/Interpreter.cpp:597:12 #4 0x5620c669d032 in js::jit::DoCallFallback(JSContext*, js::jit::BaselineFrame*, js::jit::ICFallbackStub*, unsigned int, JS::Value*, JS::MutableHandle<JS::Value>) /builds/worker/checkouts/gecko/js/src/jit/BaselineIC.cpp:1705:10 #5 0x349f24c7022e (<unknown module>) ```
This commit is contained in:
parent
fd7f69bfe7
commit
b1306da6ac
@ -507,13 +507,22 @@ class SymbolizationLoop(object):
|
||||
assert result
|
||||
return result
|
||||
|
||||
def get_symbolized_lines(self, symbolized_lines, inc_frame_counter=True):
|
||||
def get_symbolized_lines(self, symbolized_lines):
|
||||
if not symbolized_lines:
|
||||
if inc_frame_counter:
|
||||
# If it is an unparsable frame, but contains a frame counter and address
|
||||
# replace the frame counter so the stack is still consistent.
|
||||
unknown_stack_frame_format = r"^( *#([0-9]+) +)(0x[0-9a-f]+) +.*"
|
||||
match = re.match(unknown_stack_frame_format, self.current_line)
|
||||
if match:
|
||||
rewritten_line = (
|
||||
self.current_line[: match.start(2)]
|
||||
+ str(self.frame_no)
|
||||
+ self.current_line[match.end(2) :]
|
||||
)
|
||||
self.frame_no += 1
|
||||
return [rewritten_line]
|
||||
# Not a frame line so don't increment the frame counter.
|
||||
return [self.current_line]
|
||||
else:
|
||||
assert inc_frame_counter
|
||||
result = []
|
||||
for symbolized_frame in symbolized_lines:
|
||||
result.append(
|
||||
@ -546,8 +555,7 @@ class SymbolizationLoop(object):
|
||||
match = re.match(stack_trace_line_format, line)
|
||||
if not match:
|
||||
logging.debug('Line "{}" does not match regex'.format(line))
|
||||
# Not a frame line so don't increment the frame counter.
|
||||
return self.get_symbolized_lines(None, inc_frame_counter=False)
|
||||
return self.get_symbolized_lines(None)
|
||||
logging.debug(line)
|
||||
_, frameno_str, addr, binary, offset = match.groups()
|
||||
|
||||
|
@ -5,7 +5,6 @@
|
||||
// UNSUPPORTED: aarch64
|
||||
// UNSUPPORTED: darwin
|
||||
// UNSUPPORTED: ios
|
||||
// XFAIL: *
|
||||
|
||||
// RUN: %clangxx_asan -O0 -g %s -o %t
|
||||
// RUN: %env_asan_opts=symbolize=0 not %run %t DUMMY_ARG > %t.asan_report 2>&1
|
||||
|
Loading…
x
Reference in New Issue
Block a user