commit f4d02849caf2a16bfc5b2b9ff1fd6ac3b569a129
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Dec 10 11:58:11 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 10 11:58:11 2024 +0000
tree 9e15e2d64cfaebfc29913e36616c24ec3953043c
parent 4cb3a7bfb61f8649a11beb569d89b3a8a89cc41c
parent 636d785b966164e7d40a5ca2c0a49ac5c7be8925

Merge "Revert^3 "Workaround Clang hangs indefinitely"" into main am: 2ce9bb9d71 am: 636d785b96

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3399864

Change-Id: I88da595a80a200914f9b80042cc9cf657163975e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

neuralnetworks/1.2/utils/test/DeviceTest.cpp

diff --git a/neuralnetworks/1.2/utils/test/DeviceTest.cpp b/neuralnetworks/1.2/utils/test/DeviceTest.cpp
index 0e855c4..0d8c141 100644
--- a/neuralnetworks/1.2/utils/test/DeviceTest.cpp
+++ b/neuralnetworks/1.2/utils/test/DeviceTest.cpp
@@ -54,10 +54,6 @@
         .execTime = std::numeric_limits<float>::max(),
         .powerUsage = std::numeric_limits<float>::max()};
 
-// FIXME: This function causes Clang to hang indefinitely when building with
-// -O1. Turn off optimization as a temporary workaround.
-// http://b/296850773
-#pragma clang optimize off
 template <typename... Args>
 auto makeCallbackReturn(Args&&... args) {
     return [argPack = std::make_tuple(std::forward<Args>(args)...)](const auto& cb) {
@@ -65,7 +61,6 @@
         return Void();
     };
 }
-#pragma clang optimize on
 
 sp<MockDevice> createMockDevice() {
     const auto mockDevice = MockDevice::create();