From 64a1b6a57d3a3f6bdda44dd02bbc32397a452575 Mon Sep 17 00:00:00 2001
From: Liana Kazanova <lkazanova@google.com>
Date: Mon, 15 Jul 2024 18:50:09 +0000
Subject: [PATCH] Revert "Workaround Clang hangs indefinitely"

This reverts commit 38f082f0411f603f522149b7fbfc600fd1b6b51c.

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

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

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