This is an archive of the discontinued LLVM Phabricator instance.

Differential D119989

[clangd] Fix building SerializationTests unit test on OpenBSD
ClosedPublic

Authored by brad on Feb 16 2022, 4:05 PM.

Details

Reviewers
sammccall
kadircet
Commits
rGf374c8ddf2dd: [clangd] Fix building SerializationTests unit test on OpenBSD
Summary

This fixes building the unit tests on OpenBSD. OpenBSD does not support RLIMIT_AS.

Diff Detail

Event Timeline

brad created this revision.Feb 16 2022, 4:05 PM
Herald added subscribers: usaxena95, arphaman, krytarowski. · View Herald TranscriptFeb 16 2022, 4:05 PM
brad requested review of this revision.Feb 16 2022, 4:05 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptFeb 16 2022, 4:05 PM
Herald added subscribers: llvm-commits, MaskRay, ilya-biryukov. · View Herald Transcript
brad updated this revision to Diff 409445.Feb 16 2022, 4:08 PM

Remove a file I did not mean to include as part of the diff.

Harbormaster completed remote builds in B150104: Diff 409445.Feb 16 2022, 4:28 PM
kadircet accepted this revision.Feb 17 2022, 5:55 AM

thanks

clang-tools-extra/clangd/unittests/SerializationTests.cpp
313

can you also add a comment saying RLIMIT_AS doesn't exist in OpenBSD ?

This revision is now accepted and ready to land.Feb 17 2022, 5:55 AM
brad added a comment.Feb 17 2022, 9:15 AM
In D119989#3329413, @kadircet wrote:

thanks

Yes, I will do so.

Closed by commit rGf374c8ddf2dd: [clangd] Fix building SerializationTests unit test on OpenBSD (authored by brad). · Explain WhyFeb 17 2022, 9:17 AM
This revision was automatically updated to reflect the committed changes.
brad added a commit: rGf374c8ddf2dd: [clangd] Fix building SerializationTests unit test on OpenBSD.

Revision Contents

PathSize
clang-tools-extra/
clangd/
unittests/
4 lines

Diff 409689

clang-tools-extra/clangd/unittests/SerializationTests.cpp

Show First 20 Lines • Show All 302 Lines • ▼ Show 20 Lines Out.Cmd = &Cmd;
EXPECT_EQ(SerializedCmd.CommandLine, Cmd.CommandLine); EXPECT_EQ(SerializedCmd.CommandLine, Cmd.CommandLine);
EXPECT_EQ(SerializedCmd.Directory, Cmd.Directory); EXPECT_EQ(SerializedCmd.Directory, Cmd.Directory);
EXPECT_NE(SerializedCmd.Filename, Cmd.Filename); EXPECT_NE(SerializedCmd.Filename, Cmd.Filename);
EXPECT_NE(SerializedCmd.Heuristic, Cmd.Heuristic); EXPECT_NE(SerializedCmd.Heuristic, Cmd.Heuristic);
EXPECT_NE(SerializedCmd.Output, Cmd.Output); EXPECT_NE(SerializedCmd.Output, Cmd.Output);
} }
} }
// rlimit is part of POSIX. // rlimit is part of POSIX. RLIMIT_AS does not exist in OpenBSD.
// Sanitizers use a lot of address space, so we can't apply strict limits. // Sanitizers use a lot of address space, so we can't apply strict limits.
#if LLVM_ON_UNIX && !LLVM_ADDRESS_SANITIZER_BUILD && \ #if LLVM_ON_UNIX && defined(RLIMIT_AS) && !LLVM_ADDRESS_SANITIZER_BUILD && \
kadircetUnsubmitted
Not Done
ReplyInline Actions

can you also add a comment saying RLIMIT_AS doesn't exist in OpenBSD ?

kadircet: can you also add a comment saying `RLIMIT_AS` doesn't exist in OpenBSD ?
!LLVM_MEMORY_SANITIZER_BUILD !LLVM_MEMORY_SANITIZER_BUILD
class ScopedMemoryLimit { class ScopedMemoryLimit {
struct rlimit OriginalLimit; struct rlimit OriginalLimit;
bool Succeeded = false; bool Succeeded = false;
public: public:
ScopedMemoryLimit(rlim_t Bytes) { ScopedMemoryLimit(rlim_t Bytes) {
if (!getrlimit(RLIMIT_AS, &OriginalLimit)) { if (!getrlimit(RLIMIT_AS, &OriginalLimit)) {
▲ Show 20 Lines • Show All 114 Lines • Show Last 20 Lines