From 539d5d40fd425118fd9b70e0bd15b6546a9e9ddf Mon Sep 17 00:00:00 2001 From: Walter Lee Date: Mon, 24 Nov 2025 16:33:35 -0500 Subject: [PATCH 1/2] Revert "[bazel] Fully port 3773bbe9e7916ec89fb3e3cd02e29c54cabac82b (#169247)" This reverts commit f7ed15b9e734e63ab062a1f9a1b50588776a653d. --- utils/bazel/llvm-project-overlay/clang/BUILD.bazel | 1 - utils/bazel/llvm-project-overlay/lldb/BUILD.bazel | 2 +- .../bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel index 020b2aa68a357..322863246032f 100644 --- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel @@ -2084,7 +2084,6 @@ cc_plugin_library( ":frontend", ":index", ":lex", - ":options", ":rewrite", ":sema", ":tooling", diff --git a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel index 852921c392429..2e163d78e46d3 100644 --- a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel @@ -441,8 +441,8 @@ cc_library( ":Utility", ":Version", "//clang:codegen", - "//clang:driver", "//clang:frontend", + "//clang:options", "//clang:serialization", "//llvm:Support", ], diff --git a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel index 45ab113931aaf..5eef544821b5c 100644 --- a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel @@ -188,7 +188,6 @@ cc_library( "//clang:basic", "//clang:codegen", "//clang:config", - "//clang:driver", "//clang:edit", "//clang:frontend", "//clang:frontend_rewrite", From 223314bc04d10288cee926963fb1a209c36f2fe8 Mon Sep 17 00:00:00 2001 From: Walter Lee Date: Mon, 24 Nov 2025 16:34:03 -0500 Subject: [PATCH 2/2] Revert "[bazel] Port 3773bbe9e7916ec89fb3e3cd02e29c54cabac82b" This reverts commit e5edb512072bc040face27ed6c9e92f4a5f1e910. --- clang/lib/Frontend/CompilerInvocation.cpp | 1 + utils/bazel/llvm-project-overlay/clang/BUILD.bazel | 9 +-------- .../llvm-project-overlay/clang/unittests/BUILD.bazel | 4 ---- utils/bazel/llvm-project-overlay/lldb/BUILD.bazel | 1 - .../llvm-project-overlay/lldb/source/Plugins/BUILD.bazel | 2 +- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index c7c29a91721c0..6929395d192a6 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -96,6 +96,7 @@ #include using namespace clang; +using namespace driver; using namespace options; using namespace llvm::opt; diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel index 322863246032f..8d8d367cb490a 100644 --- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel @@ -1371,7 +1371,6 @@ cc_library( ":analysis", ":ast", ":basic", - ":driver", ":frontend", ":index", "//llvm:Option", @@ -1519,11 +1518,9 @@ cc_library( includes = ["include"], deps = [ ":basic", - ":config", ":driver_options_inc_gen", ":static_analyzer_checkers_gen", "//llvm:Option", - "//llvm:Support", ], ) @@ -1563,11 +1560,9 @@ cc_library( ":basic", ":config", ":driver_options_inc_gen", - ":frontend", ":lex", ":options", ":parse", - ":serialization", ":static_analyzer_checkers_gen", "//llvm:BinaryFormat", "//llvm:FrontendDebug", @@ -1719,6 +1714,7 @@ cc_library( ":ast", ":basic", ":config", + ":driver", ":driver_options_inc_gen", ":edit", ":lex", @@ -2051,7 +2047,6 @@ cc_library( ":frontend", ":index", ":lex", - ":options", ":rewrite", ":sema", ":tooling", @@ -2125,7 +2120,6 @@ cc_binary( ":basic", ":codegen", ":config", - ":driver", ":frontend", ":index", ":lex", @@ -2242,7 +2236,6 @@ cc_binary( deps = [ ":basic", ":diagnostic_defs_gen", - ":driver", ":frontend", ":lex", ":sema", diff --git a/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel index bf5bb7568c531..a862ac43e0fa1 100644 --- a/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/clang/unittests/BUILD.bazel @@ -267,7 +267,6 @@ cc_test( "//clang:ast", "//clang:basic", "//clang:codegen", - "//clang:driver", "//clang:driver_options_inc_gen", "//clang:frontend", "//clang:frontend_tool", @@ -339,7 +338,6 @@ cc_test( "//clang:ast", "//clang:ast_matchers", "//clang:basic", - "//clang:driver", "//clang:frontend", "//clang:lex", "//clang:parse", @@ -518,7 +516,6 @@ cc_test( deps = [ "//clang:ast", "//clang:basic", - "//clang:driver", "//clang:frontend", "//clang:lex", "//clang:testing", @@ -723,7 +720,6 @@ cc_test( deps = [ "//clang:ast_matchers", "//clang:basic", - "//clang:driver", "//clang:frontend", "//clang:lex", "//clang:parse", diff --git a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel index 2e163d78e46d3..b69dddba261a9 100644 --- a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel @@ -442,7 +442,6 @@ cc_library( ":Version", "//clang:codegen", "//clang:frontend", - "//clang:options", "//clang:serialization", "//llvm:Support", ], diff --git a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel index 5eef544821b5c..3ded8bdf89514 100644 --- a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel @@ -188,11 +188,11 @@ cc_library( "//clang:basic", "//clang:codegen", "//clang:config", + "//clang:driver", "//clang:edit", "//clang:frontend", "//clang:frontend_rewrite", "//clang:lex", - "//clang:options", "//clang:parse", "//clang:rewrite", "//clang:sema",