[compiler-rt] 4c0b396 - Revert "[GWP-ASan] Fix 6413872"

[Mitch Phillips via llvm-commits]

Author: Mitch Phillips
Date: 2023-01-12T15:59:58-08:00
New Revision: 4c0b3964cbc0f8366903e5fb5784af01b79545a1

URL: https://github.com/llvm/llvm-project/commit/4c0b3964cbc0f8366903e5fb5784af01b79545a1
DIFF: https://github.com/llvm/llvm-project/commit/4c0b3964cbc0f8366903e5fb5784af01b79545a1.diff

LOG: 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.

Added: 
    

Modified: 
    compiler-rt/lib/gwp_asan/tests/harness.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/gwp_asan/tests/harness.h b/compiler-rt/lib/gwp_asan/tests/harness.h
index efac8266c3214..e6be68cf74b3c 100644
--- a/compiler-rt/lib/gwp_asan/tests/harness.h
+++ b/compiler-rt/lib/gwp_asan/tests/harness.h
@@ -18,7 +18,7 @@ template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>;
 #else
 #include "gtest/gtest.h"
 using Test = ::testing::Test;
-template <typename T> using TestWithParam = ::testing::TestWithParam<T>;
+template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>;
 #endif
 
 #include "gwp_asan/guarded_pool_allocator.h"