This is an archive of the discontinued LLVM Phabricator instance.

Differential D131806

Update hwasan test to fix failure on older Android API versions.
ClosedPublic

Authored by mnadeem on Aug 12 2022, 1:35 PM.

Details

Reviewers
hctim
vitalybuka
kstoimenov
Commits
rG405ad847931f: Update hwasan test to fix failure on older Android API versions.
Summary

In Android API < 30 there is no HWAsan instrumentation support for globals
so the test fails if API < 30 or if the target triple does not specify the API version.

Add -triple=aarch64-linux-android31 to enable global instrumentation. This is the
same triple as is used in the RUN line for -fsanitize=memtag-globals.

Diff Detail

Event Timeline

mnadeem created this revision.Aug 12 2022, 1:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 12 2022, 1:35 PM
Herald added a subscriber: danielkiss. · View Herald Transcript
mnadeem requested review of this revision.Aug 12 2022, 1:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 12 2022, 1:35 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B180991: Diff 452291.Aug 12 2022, 3:20 PM
vitalybuka added inline comments.Aug 12 2022, 4:01 PM
clang/test/CodeGen/sanitizer-special-case-list-globals.c
5

to avoid inconsistency between runs on different platforms, it should probably just run with a fixed
triple, like MEMTAG

vitalybuka accepted this revision.Aug 12 2022, 4:08 PM

Either way is good, but I slightly prefer the triple.

This revision is now accepted and ready to land.Aug 12 2022, 4:08 PM
mnadeem updated this revision to Diff 452326.Aug 12 2022, 4:19 PM
mnadeem edited the summary of this revision. (Show Details)

Update to use the same triple as MEMTAG

Herald added a subscriber: kristof.beyls. · View Herald TranscriptAug 12 2022, 4:19 PM
mnadeem marked an inline comment as done.Aug 12 2022, 4:29 PM
This revision was landed with ongoing or failed builds.Aug 12 2022, 4:31 PM
Closed by commit rG405ad847931f: Update hwasan test to fix failure on older Android API versions. (authored by mnadeem). · Explain Why
This revision was automatically updated to reflect the committed changes.
mnadeem added a commit: rG405ad847931f: Update hwasan test to fix failure on older Android API versions..
Harbormaster completed remote builds in B181019: Diff 452326.Aug 12 2022, 4:58 PM
hctim added a comment.Aug 15 2022, 2:05 PM

Thanks for the patch!

Revision Contents

PathSize
clang/
test/
CodeGen/
2 lines

Diff 452328

clang/test/CodeGen/sanitizer-special-case-list-globals.c

/// Verify that ignorelist sections correctly select sanitizers to apply /// Verify that ignorelist sections correctly select sanitizers to apply
/// ignorelist entries to. /// ignorelist entries to.
// RUN: %clang_cc1 -emit-llvm %s -o -\ // RUN: %clang_cc1 -emit-llvm %s -o -\
// RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \ // RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \
vitalybukaUnsubmitted
Done
ReplyInline Actions

to avoid inconsistency between runs on different platforms, it should probably just run with a fixed
triple, like MEMTAG

vitalybuka: to avoid inconsistency between runs on different platforms, it should probably just run with a…
// RUN: | FileCheck %s --check-prefix=NONE // RUN: | FileCheck %s --check-prefix=NONE
// RUN: %clang_cc1 -fsanitize=address -emit-llvm %s -o -\ // RUN: %clang_cc1 -fsanitize=address -emit-llvm %s -o -\
// RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \ // RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \
// RUN: | FileCheck %s --check-prefix=ASAN // RUN: | FileCheck %s --check-prefix=ASAN
/// Note: HWASan effectively reorders globals (it puts the unsanitized ones /// Note: HWASan effectively reorders globals (it puts the unsanitized ones
/// first), which is hard to check for, as 'CHECK-DAG' doesn't play terribly /// first), which is hard to check for, as 'CHECK-DAG' doesn't play terribly
/// nicely with 'CHECK-NOT'. This is why the 'always_ignored' and /// nicely with 'CHECK-NOT'. This is why the 'always_ignored' and
/// 'hwasan_ignored' comes first in this file. /// 'hwasan_ignored' comes first in this file.
// RUN: %clang_cc1 -fsanitize=hwaddress -emit-llvm %s -o -\ // RUN: %clang_cc1 -fsanitize=hwaddress -triple=aarch64-linux-android31 -emit-llvm %s -o -\
// RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \ // RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \
// RUN: | FileCheck %s --check-prefix=HWASAN // RUN: | FileCheck %s --check-prefix=HWASAN
// RUN: %clang_cc1 -fsanitize=memtag-globals -triple=aarch64-linux-android31 \ // RUN: %clang_cc1 -fsanitize=memtag-globals -triple=aarch64-linux-android31 \
// RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \ // RUN: -fsanitize-ignorelist=%S/Inputs/sanitizer-special-case-list-globals.txt \
// RUN: -emit-llvm %s -o - | FileCheck %s --check-prefix=MEMTAG // RUN: -emit-llvm %s -o - | FileCheck %s --check-prefix=MEMTAG
/// Check that the '[cfi-vcall|cfi-icall] src:*' rule in the ignorelist doesn't change /// Check that the '[cfi-vcall|cfi-icall] src:*' rule in the ignorelist doesn't change
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines