[libc][test] remove C++ stdlib includes #122369
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These make cross compiling the test suite more difficult, as you need the sysroot to contain these headers and libraries cross compiled for your target. It's straightforward to stick with the corresponding C headers.
|
@llvm/pr-subscribers-libc Author: Nick Desaulniers (nickdesaulniers) ChangesThese make cross compiling the test suite more difficult, as you need the Full diff: https://github.com/llvm/llvm-project/pull/122369.diff 3 Files Affected:
diff --git a/libc/test/UnitTest/ExecuteFunctionUnix.cpp b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
index 3a657c00851c7b..df71738668592a 100644
--- a/libc/test/UnitTest/ExecuteFunctionUnix.cpp
+++ b/libc/test/UnitTest/ExecuteFunctionUnix.cpp
@@ -8,13 +8,13 @@
#include "ExecuteFunction.h"
#include "src/__support/macros/config.h"
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-#include <memory>
+#include "test/UnitTest/ExecuteFunction.h" // FunctionCaller
+#include <assert.h>
#include <poll.h>
#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
@@ -35,21 +35,20 @@ int ProcessStatus::get_fatal_signal() {
}
ProcessStatus invoke_in_subprocess(FunctionCaller *func, unsigned timeout_ms) {
- std::unique_ptr<FunctionCaller> X(func);
int pipe_fds[2];
if (::pipe(pipe_fds) == -1)
return ProcessStatus::error("pipe(2) failed");
// Don't copy the buffers into the child process and print twice.
- std::cout.flush();
- std::cerr.flush();
+ ::fflush(stderr);
+ ::fflush(stdout);
pid_t pid = ::fork();
if (pid == -1)
return ProcessStatus::error("fork(2) failed");
if (!pid) {
(*func)();
- std::exit(0);
+ ::exit(0);
}
::close(pipe_fds[1]);
diff --git a/libc/test/UnitTest/FPExceptMatcher.cpp b/libc/test/UnitTest/FPExceptMatcher.cpp
index 37ba0a0a7abde4..889f9f6f44a913 100644
--- a/libc/test/UnitTest/FPExceptMatcher.cpp
+++ b/libc/test/UnitTest/FPExceptMatcher.cpp
@@ -9,11 +9,11 @@
#include "FPExceptMatcher.h"
#include "src/__support/macros/config.h"
+#include "test/UnitTest/ExecuteFunction.h" // FunctionCaller
#include "test/UnitTest/Test.h"
#include "hdr/types/fenv_t.h"
#include "src/__support/FPUtil/FEnvImpl.h"
-#include <memory>
#include <setjmp.h>
#include <signal.h>
@@ -37,14 +37,13 @@ static void sigfpeHandler(int sig) {
}
FPExceptMatcher::FPExceptMatcher(FunctionCaller *func) {
- auto oldSIGFPEHandler = signal(SIGFPE, &sigfpeHandler);
- std::unique_ptr<FunctionCaller> funcUP(func);
+ sighandler_t oldSIGFPEHandler = signal(SIGFPE, &sigfpeHandler);
caughtExcept = false;
fenv_t oldEnv;
fputil::get_env(&oldEnv);
if (sigsetjmp(jumpBuffer, 1) == 0)
- funcUP->call();
+ func->call();
// We restore the previous floating point environment after
// the call to the function which can potentially raise SIGFPE.
fputil::set_env(&oldEnv);
diff --git a/libc/test/UnitTest/LibcDeathTestExecutors.cpp b/libc/test/UnitTest/LibcDeathTestExecutors.cpp
index 77b0559c7acea9..943e2c23c5fde9 100644
--- a/libc/test/UnitTest/LibcDeathTestExecutors.cpp
+++ b/libc/test/UnitTest/LibcDeathTestExecutors.cpp
@@ -12,7 +12,7 @@
#include "test/UnitTest/ExecuteFunction.h"
#include "test/UnitTest/TestLogger.h"
-#include <cassert>
+#include <assert.h>
namespace {
constexpr unsigned TIMEOUT_MS = 10000;
|
lntue
approved these changes
Jan 9, 2025
michaelrj-google
approved these changes
Jan 9, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/171/builds/13525 Here is the relevant piece of the build log for the reference |
|
ah, that's why they were using std::unique_ptr. I guess I can manually free these callbacks. |
nickdesaulniers
added a commit
to nickdesaulniers/llvm-project
that referenced
this pull request
Jan 9, 2025
Looks like the smart pointer I removed was being used to free the underlying object. Fixes: llvm#122369
|
#122378 should fix this |
nickdesaulniers
added a commit
that referenced
this pull request
Jan 9, 2025
Looks like the smart pointer I removed was being used to free the underlying object. Fixes: #122369
nickdesaulniers
added a commit
to nickdesaulniers/llvm-project
that referenced
this pull request
Jan 9, 2025
These were created with operator new (see `Test::createCallable`), so operator delete should be used instead of free(). Fixes: llvm#122369 Fixes: llvm#122378
nickdesaulniers
added a commit
that referenced
this pull request
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These make cross compiling the test suite more difficult, as you need the
sysroot to contain these headers and libraries cross compiled for your target.
It's straightforward to stick with the corresponding C headers.