Merge "Revert "Workaround Clang hangs indefinitely"" into main am: 0480a2e8a2 am: 4d30584416

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

Change-Id: I33d5173e5e2d466b7fe4f62f50d23700f60f7853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liana Kazanova
2024-07-15 21:38:50 +00:00
committed by Automerger Merge Worker

View File

@@ -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();