From 98d0f8f2ff98ee02d79930a5aaa56c1cf5b14653 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Fri, 3 Sep 2021 09:19:11 -0400
Subject: [PATCH] Revert "[gn build] (manually) port 6fe2beba7d2a
 (ExceptionTests)"

This reverts commit da47c2719b1094a29427917ddb157c9c716e876d.
6fe2beba7d2a was reverted in 885964046114.
---
 llvm/utils/gn/secondary/clang/unittests/BUILD.gn     | 11 ++++-------
 .../unittests/Interpreter/ExceptionTests/BUILD.gn    | 20 --------------------
 llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn |  1 -
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn

diff --git a/llvm/utils/gn/secondary/clang/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/BUILD.gn
index 3322ca4..319205b 100644
--- a/llvm/utils/gn/secondary/clang/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/BUILD.gn
@@ -29,16 +29,13 @@ group("unittests") {
     ]
   }
   if (host_os != "win") {
+    # FIXME: libclang unit tests are disabled on Windows due
+    # to failures, mostly in libclang.VirtualFileOverlay_*.
+    # FIXME: Also, the executable can't find libclang.dll since that's
+    # in a different directory.
     deps += [
-      # FIXME: libclang unit tests are disabled on Windows due
-      # to failures, mostly in libclang.VirtualFileOverlay_*.
-      # FIXME: Also, the executable can't find libclang.dll since that's
-      # in a different directory.
       "libclang:libclangTests",
       "libclang/CrashTests:libclangCrashTests",
-
-      # Exceptions on Windows are not yet supported.
-      "Interpreter/ExceptionTests:ClangReplInterpreterExceptionTests",
     ]
   }
   testonly = true
diff --git a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
deleted file mode 100644
index 5b0173b..0000000
--- a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
+++ /dev/null
@@ -1,20 +0,0 @@
-import("//llvm/utils/unittest/unittest.gni")
-
-unittest("ClangReplInterpreterExceptionTests") {
-  configs += [ "//llvm/utils/gn/build:clang_code" ]
-  configs -= [
-    "//llvm/utils/gn/build:no_exceptions",
-    "//llvm/utils/gn/build:no_rtti",
-  ]
-  deps = [
-    "//clang/lib/AST",
-    "//clang/lib/Basic",
-    "//clang/lib/Interpreter",
-    "//clang/lib/Frontend",
-    "//llvm/lib/IR",
-    "//llvm/lib/ExecutionEngine/Orc",
-    "//llvm/lib/Support",
-    "//llvm/lib/Target:TargetsToBuild",
-  ]
-  sources = [ "InterpreterExceptionTest.cpp" ]
-}
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
index 844e43c..ccdb401 100644
--- a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
@@ -27,7 +27,6 @@ static_library("gtest") {
   ]
   public_configs = [ ":googletest_config" ]
   configs -= [ "//llvm/utils/gn/build:warn_covered_switch_default" ]
-  configs -= [ "//llvm/utils/gn/build:no_rtti" ]
   sources = [
     "googlemock/src/gmock-all.cc",
     "googletest/src/gtest-all.cc",
-- 
2.7.4