commit cdace2f2275694075c03ac90a80c990387807588
author Ryan Prichard <rprichard@google.com> Wed Feb 10 07:08:18 2021 +0000
committer Ryan Prichard <rprichard@google.com> Wed Feb 10 07:08:18 2021 +0000
tree ad0662b00c26bb779a4139d1ba7fbfb8696275d8
parent 315969a67eb09607f278cd17ae1637bbf661a559

Revert "Disable signal frame unwinding tests on arm64"

This reverts commit 315969a67eb09607f278cd17ae1637bbf661a559.

Reason for revert: r407598b has llvm.org/D90898, which should fix the test.

Change-Id: I466e2122a700ba4df9160b57a5d3c94867472615

tests/stack_unwinding_test.cpp

diff --git a/tests/stack_unwinding_test.cpp b/tests/stack_unwinding_test.cpp
index 7fb2247..0ff6f30 100644
--- a/tests/stack_unwinding_test.cpp
+++ b/tests/stack_unwinding_test.cpp
@@ -82,7 +82,7 @@
 
 static UnwindData g_unwind_data;
 
-__attribute__((unused)) static void noinline UnwindSignalHandler(int) {
+static void noinline UnwindSignalHandler(int) {
   _Unwind_Backtrace(FrameCounter, &g_unwind_data.handler_frame_count);
 
   g_unwind_data.handler_one_deeper_frame_count = unwind_one_frame_deeper();
@@ -98,7 +98,7 @@
   EXPECT_EQ(unwind_data.handler_frame_count + 1, unwind_data.handler_one_deeper_frame_count);
 }
 
-__attribute__((unused)) static void noinline UnwindTest() {
+static void noinline UnwindTest() {
   g_unwind_data = {};
 
   _Unwind_Backtrace(FrameCounter, &g_unwind_data.expected_frame_count);
@@ -112,24 +112,14 @@
 }
 
 TEST(stack_unwinding, unwind_through_signal_frame) {
-#if defined(__aarch64__)
-  // A newer libunwind.a update should restore signal frame unwinding on arm64.
-  GTEST_SKIP() << "signal frame unwinding temporarily broken on arm64 -- b/153025717";
-#else
   ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler);
 
   UnwindTest();
-#endif
 }
 
 // On LP32, the SA_SIGINFO flag gets you __restore_rt instead of __restore.
 TEST(stack_unwinding, unwind_through_signal_frame_SA_SIGINFO) {
-#if defined(__aarch64__)
-  // A newer libunwind.a update should restore signal frame unwinding on arm64.
-  GTEST_SKIP() << "signal frame unwinding temporarily broken on arm64 -- b/153025717";
-#else
   ScopedSignalHandler ssh(SIGUSR1, UnwindSignalHandler, SA_SIGINFO);
 
   UnwindTest();
-#endif
 }