From facd91c1d66f6656e75f4030c5ed3e4e3024556b Mon Sep 17 00:00:00 2001
From: Pechetty Sravani <pechetty@google.com>
Date: Tue, 16 Jul 2024 05:11:57 +0000
Subject: [PATCH] Revert^2 "Workaround Clang hangs indefinitely"

This reverts commit 64a1b6a57d3a3f6bdda44dd02bbc32397a452575.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/353410480. Will be verifying through ABTD before submission.

Change-Id: Iec3b4303b4f16943c163b36ced0166fb06a51d8f
---
 neuralnetworks/1.2/utils/test/DeviceTest.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/neuralnetworks/1.2/utils/test/DeviceTest.cpp b/neuralnetworks/1.2/utils/test/DeviceTest.cpp
index 0d8c141582..0e855c4b10 100644
--- a/neuralnetworks/1.2/utils/test/DeviceTest.cpp
+++ b/neuralnetworks/1.2/utils/test/DeviceTest.cpp
@@ -54,6 +54,10 @@ constexpr V1_0::PerformanceInfo kNoPerformanceInfo = {
         .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) {
@@ -61,6 +65,7 @@ auto makeCallbackReturn(Args&&... args) {
         return Void();
     };
 }
+#pragma clang optimize on
 
 sp<MockDevice> createMockDevice() {
     const auto mockDevice = MockDevice::create();