Merge "Revert "Workaround Clang hangs indefinitely"" into main

This commit is contained in:
Liana Kazanova
2024-07-15 20:53:34 +00:00
committed by Gerrit Code Review

View File

@@ -54,10 +54,6 @@ constexpr V1_0::PerformanceInfo kNoPerformanceInfo = {
.execTime = std::numeric_limits<float>::max(), .execTime = std::numeric_limits<float>::max(),
.powerUsage = 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> template <typename... Args>
auto makeCallbackReturn(Args&&... args) { auto makeCallbackReturn(Args&&... args) {
return [argPack = std::make_tuple(std::forward<Args>(args)...)](const auto& cb) { return [argPack = std::make_tuple(std::forward<Args>(args)...)](const auto& cb) {
@@ -65,7 +61,6 @@ auto makeCallbackReturn(Args&&... args) {
return Void(); return Void();
}; };
} }
#pragma clang optimize on
sp<MockDevice> createMockDevice() { sp<MockDevice> createMockDevice() {
const auto mockDevice = MockDevice::create(); const auto mockDevice = MockDevice::create();