Merge "Revert "Workaround Clang hangs indefinitely"" into main (0480a2e8) · Commits · e / os / android_hardware_interfaces

neuralnetworks/1.2/utils/test/DeviceTest.cpp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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();