ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix the build with a newer LLVM." am: eed5e27c24 am: dcd275b3f8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2214887

Change-Id: Ice51cc334581367f9610a973f34617ee9d6e2b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-09-15 02:32:06 +00:00 • committed by Automerger Merge Worker
commit 2d68f08f16
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debuggerd/debuggerd_test.cpp
View file

@ -1403,7 +1403,7 @@ TEST_F(CrasherTest, seccomp_crash_oom) {
// We can't actually generate a backtrace, just make sure that the process terminates. // We can't actually generate a backtrace, just make sure that the process terminates.
} }
__attribute__((noinline)) extern "C" bool raise_debugger_signal(DebuggerdDumpType dump_type) { __attribute__((__noinline__)) extern "C" bool raise_debugger_signal(DebuggerdDumpType dump_type) {
siginfo_t siginfo; siginfo_t siginfo;
siginfo.si_code = SI_QUEUE; siginfo.si_code = SI_QUEUE;
siginfo.si_pid = getpid(); siginfo.si_pid = getpid();

5
libutils/CallStack_test.cpp
View file

@ -22,7 +22,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <utils/CallStack.h> #include <utils/CallStack.h>
[[clang::noinline]] extern "C" void CurrentCaller(android::String8& backtrace) { __attribute__((__noinline__)) extern "C" void CurrentCaller(android::String8& backtrace) {
android::CallStack cs; android::CallStack cs;
cs.update(); cs.update();
backtrace = cs.toString(); backtrace = cs.toString();
@ -35,7 +35,8 @@ TEST(CallStackTest, current_backtrace) {
ASSERT_NE(-1, backtrace.find("(CurrentCaller")) << "Full backtrace:\n" << backtrace; ASSERT_NE(-1, backtrace.find("(CurrentCaller")) << "Full backtrace:\n" << backtrace;
} }
[[clang::noinline]] extern "C" void ThreadBusyWait(std::atomic<pid_t>* tid, volatile bool* done) { __attribute__((__noinline__)) extern "C" void ThreadBusyWait(std::atomic<pid_t>* tid,
volatile bool* done) {
*tid = android::base::GetThreadId(); *tid = android::base::GetThreadId();
while (!*done) { while (!*done) {
} }