This is an archive of the discontinued LLVM Phabricator instance.

Differential D73515

[asan] Fix test compilation on Android API <= 17
ClosedPublic

Authored by smeenai on Jan 27 2020, 5:26 PM.

Details

Reviewers
kcc
pcc
danalbert
eugenis
Commits
rGd8f6950828df: [asan] Fix test compilation on Android API <= 17
Summary

mlockall and munlockall were introduced in Android API 17, so avoid
referencing them on prior versions.

Diff Detail

Event Timeline

smeenai created this revision.Jan 27 2020, 5:26 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 27 2020, 5:27 PM
Herald added subscribers: llvm-commits, Restricted Project, krytarowski. · View Herald Transcript
Harbormaster completed remote builds in B45072: Diff 240740.Jan 27 2020, 5:27 PM
eugenis accepted this revision.Jan 27 2020, 5:32 PM
eugenis added a subscriber: eugenis.

LGTM

This revision is now accepted and ready to land.Jan 27 2020, 5:32 PM
Closed by commit rGd8f6950828df: [asan] Fix test compilation on Android API <= 17 (authored by smeenai). · Explain WhyJan 28 2020, 2:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
lib/
asan/
tests/
4 lines

Diff 240740

compiler-rt/lib/asan/tests/asan_test.cpp

Show First 20 Lines • Show All 1,151 Lines • ▼ Show 20 Lines for (int i = 0; i < 10000; i++) {
} catch(...) { } catch(...) {
} }
} }
} }
#endif #endif
#if !defined(_WIN32) #if !defined(_WIN32)
TEST(AddressSanitizer, MlockTest) { TEST(AddressSanitizer, MlockTest) {
#if !defined(__ANDROID__) || __ANDROID_API__ >= 17
EXPECT_EQ(0, mlockall(MCL_CURRENT)); EXPECT_EQ(0, mlockall(MCL_CURRENT));
#endif
EXPECT_EQ(0, mlock((void*)0x12345, 0x5678)); EXPECT_EQ(0, mlock((void*)0x12345, 0x5678));
#if !defined(__ANDROID__) || __ANDROID_API__ >= 17
EXPECT_EQ(0, munlockall()); EXPECT_EQ(0, munlockall());
#endif
EXPECT_EQ(0, munlock((void*)0x987, 0x654)); EXPECT_EQ(0, munlock((void*)0x987, 0x654));
} }
#endif #endif
struct LargeStruct { struct LargeStruct {
int foo[100]; int foo[100];
}; };
▲ Show 20 Lines • Show All 192 Lines • Show Last 20 Lines