This is an archive of the discontinued LLVM Phabricator instance.

Differential D84510

[msan] Compile the libatomic.c test with a C compiler
ClosedPublic

Authored by arichardson on Jul 24 2020, 4:00 AM.

Details

Reviewers
guiand
eugenis
vitalybuka
dim
emaste
Commits
rG03affa8099cb: [msan] Compile the libatomic.c test with a C compiler
Summary

Otherwise we end up compiling in C++ mode and on FreeBSD
/usr/include/stdatomic.h is not compatible with C++ since it uses _Bool.

Diff Detail

Event Timeline

arichardson created this revision.Jul 24 2020, 4:00 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 24 2020, 4:00 AM
Herald added subscribers: Restricted Project, jfb, krytarowski, emaste. · View Herald Transcript
Harbormaster failed remote builds in B65529: Diff 280394!Jul 24 2020, 4:00 AM
arichardson added a reviewer: dim.Jul 24 2020, 8:02 AM
guiand added a comment.Jul 24 2020, 9:27 AM

I think we can actually just drop the #include <stdatomic.h> line here. It was used for a previous version of the test but I forgot to remove it after some changes.

eugenis added a comment.Jul 24 2020, 9:29 AM

Does it help to replace %clangxx_msan with %clang_msan instead?

arichardson added a comment.Jul 24 2020, 9:30 AM
In D84510#2172577, @eugenis wrote:

Does it help to replace %clangxx_msan with %clang_msan instead?

That sounds like the better solution. I wasn't aware that that substitution also existed.

arichardson updated this revision to Diff 280838.Jul 27 2020, 3:21 AM

use %clang_msan

arichardson retitled this revision from [msan] Compile the libatomic.c test with -xc to [msan] Compile the libatomic.c test with a C compiler.Jul 27 2020, 3:22 AM
Harbormaster completed remote builds in B65792: Diff 280838.Jul 27 2020, 4:00 AM
emaste accepted this revision.Jul 27 2020, 7:17 AM

LGTM

This revision is now accepted and ready to land.Jul 27 2020, 7:17 AM
guiand accepted this revision.Jul 27 2020, 9:35 AM

LGTM

vitalybuka accepted this revision.Jul 28 2020, 7:46 PM
eugenis accepted this revision.Jul 31 2020, 10:19 AM
Closed by commit rG03affa8099cb: [msan] Compile the libatomic.c test with a C compiler (authored by arichardson). · Explain WhyAug 3 2020, 2:52 AM
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rG03affa8099cb: [msan] Compile the libatomic.c test with a C compiler.

Revision Contents

PathSize
compiler-rt/
test/
msan/
6 lines

Diff 280838

compiler-rt/test/msan/libatomic.c

// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -latomic -DTEST_STORE -O0 %s -o %t && %run %t 2>&1 // RUN: %clang_msan -fsanitize-memory-track-origins=2 -latomic -DTEST_STORE -O0 %s -o %t && %run %t 2>&1
// RUN: %clangxx_msan -fsanitize-memory-track-origins=0 -latomic -DTEST_LOAD -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK // RUN: %clang_msan -fsanitize-memory-track-origins=0 -latomic -DTEST_LOAD -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK
// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -latomic -DTEST_LOAD -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-SHADOW // RUN: %clang_msan -fsanitize-memory-track-origins=2 -latomic -DTEST_LOAD -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-SHADOW
// PPC has no libatomic // PPC has no libatomic
// UNSUPPORTED: powerpc64-target-arch // UNSUPPORTED: powerpc64-target-arch
// UNSUPPORTED: powerpc64le-target-arch // UNSUPPORTED: powerpc64le-target-arch
#include <sanitizer/msan_interface.h> #include <sanitizer/msan_interface.h>
#include <stdatomic.h> #include <stdatomic.h>
Show All 30 Lines