Skip to content

[compiler-rt] lsan remove unneeded comma for pthread_atfork declaration. #99788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2024

Conversation

devnexen
Copy link
Member

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Jul 20, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: David CARLIER (devnexen)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/99788.diff

1 Files Affected:

  • (modified) compiler-rt/lib/lsan/lsan_interceptors.cpp (+1-1)
diff --git a/compiler-rt/lib/lsan/lsan_interceptors.cpp b/compiler-rt/lib/lsan/lsan_interceptors.cpp
index 6df4b6865b379..b569c337e9764 100644
--- a/compiler-rt/lib/lsan/lsan_interceptors.cpp
+++ b/compiler-rt/lib/lsan/lsan_interceptors.cpp
@@ -389,7 +389,7 @@ INTERCEPTOR(int, atexit, void (*f)()) {
 extern "C" {
 extern int _pthread_atfork(void (*prepare)(), void (*parent)(),
                            void (*child)());
-};
+}
 
 INTERCEPTOR(int, pthread_atfork, void (*prepare)(), void (*parent)(),
             void (*child)()) {

@devnexen devnexen merged commit 7cbd899 into llvm:main Jul 20, 2024
10 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Jul 21, 2024

LLVM Buildbot has detected a new failure on builder sanitizer-aarch64-linux-bootstrap-hwasan running on sanitizer-buildbot12 while building compiler-rt at step 2 "annotate".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/55/builds/830

Here is the relevant piece of the build log for the reference:

Step 2 (annotate) failure: 'python ../sanitizer_buildbot/sanitizers/zorg/buildbot/builders/sanitizers/buildbot_selector.py' (failure)
...
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using lld-link: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/lld-link
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using ld64.lld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/ld64.lld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using wasm-ld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/wasm-ld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using ld.lld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/ld.lld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using lld-link: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/lld-link
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using ld64.lld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/ld64.lld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using wasm-ld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/wasm-ld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/main.py:72: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 900 seconds was requested on the command line. Forcing timeout to be 900 seconds.
-- Testing: 78587 tests, 48 workers --
Testing:  0.. 10.. 20..
FAIL: LLVM :: Analysis/StructuralHash/structural-hash-printer.ll (22291 of 78587)
******************** TEST 'LLVM :: Analysis/StructuralHash/structural-hash-printer.ll' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
RUN: at line 1: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt -passes='print<structural-hash>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll 2>&1 | /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt '-passes=print<structural-hash>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
RUN: at line 2: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt -passes='print<structural-hash><detailed>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll 2>&1 | /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll -check-prefix=DETAILED-HASH
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt '-passes=print<structural-hash><detailed>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll -check-prefix=DETAILED-HASH
/b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll:24:23: error: DETAILED-HASH-NEXT: expected string not found in input
; DETAILED-HASH-NEXT: Function f2 Hash: {{([a-z0-9]{14,})}}
                      ^
<stdin>:2:35: note: scanning from here
Function f1 Hash: 386cff580231c373
                                  ^
<stdin>:3:1: note: possible intended match here
Function f2 Hash: 7d393ca1897ac
^

Input file: <stdin>
Check file: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: Module Hash: 5b6f0b437bcdc7ea 
           2: Function f1 Hash: 386cff580231c373 
next:24'0                                       X error: no match found
           3: Function f2 Hash: 7d393ca1897ac 
next:24'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
next:24'1     ?                                possible intended match
>>>>>>

--

Step 13 (stage3/hwasan check) failure: stage3/hwasan check (failure)
...
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using lld-link: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/lld-link
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using ld64.lld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/ld64.lld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using wasm-ld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/wasm-ld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using ld.lld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/ld.lld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using lld-link: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/lld-link
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using ld64.lld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/ld64.lld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/llvm/config.py:508: note: using wasm-ld: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/wasm-ld
llvm-lit: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/utils/lit/lit/main.py:72: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 900 seconds was requested on the command line. Forcing timeout to be 900 seconds.
-- Testing: 78587 tests, 48 workers --
Testing:  0.. 10.. 20..
FAIL: LLVM :: Analysis/StructuralHash/structural-hash-printer.ll (22291 of 78587)
******************** TEST 'LLVM :: Analysis/StructuralHash/structural-hash-printer.ll' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
RUN: at line 1: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt -passes='print<structural-hash>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll 2>&1 | /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt '-passes=print<structural-hash>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
RUN: at line 2: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt -passes='print<structural-hash><detailed>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll 2>&1 | /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll -check-prefix=DETAILED-HASH
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/opt '-passes=print<structural-hash><detailed>' -disable-output /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll
+ /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm_build2_hwasan/bin/FileCheck /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll -check-prefix=DETAILED-HASH
/b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll:24:23: error: DETAILED-HASH-NEXT: expected string not found in input
; DETAILED-HASH-NEXT: Function f2 Hash: {{([a-z0-9]{14,})}}
                      ^
<stdin>:2:35: note: scanning from here
Function f1 Hash: 386cff580231c373
                                  ^
<stdin>:3:1: note: possible intended match here
Function f2 Hash: 7d393ca1897ac
^

Input file: <stdin>
Check file: /b/sanitizer-aarch64-linux-bootstrap-hwasan/build/llvm-project/llvm/test/Analysis/StructuralHash/structural-hash-printer.ll

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           1: Module Hash: 5b6f0b437bcdc7ea 
           2: Function f1 Hash: 386cff580231c373 
next:24'0                                       X error: no match found
           3: Function f2 Hash: 7d393ca1897ac 
next:24'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
next:24'1     ?                                possible intended match
>>>>>>

--


yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
…on. (#99788)

Summary: 

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60251254
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants