From 4c0b3964cbc0f8366903e5fb5784af01b79545a1 Mon Sep 17 00:00:00 2001 From: Mitch Phillips <31459023+hctim@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:57:27 -0800 Subject: [PATCH] Revert "[GWP-ASan] Fix 6413872" This reverts commit df87e62cbd4b5090b5349247d29457706d2ac4e8. Parent change https://reviews.llvm.org/D140173 broke an internal build. I'll integrate this patch into the re-land for https://reviews.llvm.org/D140173. --- compiler-rt/lib/gwp_asan/tests/harness.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/gwp_asan/tests/harness.h b/compiler-rt/lib/gwp_asan/tests/harness.h index efac826..e6be68c 100644 --- a/compiler-rt/lib/gwp_asan/tests/harness.h +++ b/compiler-rt/lib/gwp_asan/tests/harness.h @@ -18,7 +18,7 @@ template using TestWithParam = ::zxtest::TestWithParam; #else #include "gtest/gtest.h" using Test = ::testing::Test; -template using TestWithParam = ::testing::TestWithParam; +template using TestWithParam = ::zxtest::TestWithParam; #endif #include "gwp_asan/guarded_pool_allocator.h" -- 2.7.4