Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b795d6fa authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Fix the build with a newer LLVM. 

Unify all our "noinline" variants to the current most common one, not
least because the new [[noinline]] syntax is fussier about where it goes.

Test: treehugger
Change-Id: Icfcb75c9d687f0f05c19f66ee778fd8962519436
parent 565305b8

debuggerd/debuggerd_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1403,7 +1403,7 @@ TEST_F(CrasherTest, seccomp_crash_oom) { 
  // 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.si_code = SI_QUEUE;

  siginfo.si_pid = getpid();

libutils/CallStack_test.cpp

+3 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <gtest/gtest.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;

    cs.update();

    backtrace = cs.toString();
@@ -35,7 +35,8 @@ TEST(CallStackTest, current_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();

    while (!*done) {

    }