Skip to content

Commit 4ee1d80

Browse files
chelcassanovagithub-actions[bot]
authored andcommitted
Automerge: Revert "[lldb][RPC] Upstream lldb-rpc-gen tool" (#146969)
Reverts llvm/llvm-project#138031. This is failing during the build phase on the Ubuntu buildbot: ``` Error while processing /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/API/SBWatchpoint.h. [78/78] Processing file /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/API/SBWatchpointOptions.h. warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean '-Wno-uninitialized'? [-Wunknown-warning-option] warning: unknown warning option '-Wno-class-memaccess'; did you mean '-Wno-class-varargs'? [-Wunknown-warning-option] warning: unknown warning option '-Wno-stringop-truncation'; did you mean '-Wno-format-truncation'? [-Wunknown-warning-option] warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean '-Wno-uninitialized'? [-Wunknown-warning-option] warning: unknown warning option '-Wno-class-memaccess'; did you mean '-Wno-class-varargs'? [-Wunknown-warning-option] warning: unknown warning option '-Wno-stringop-truncation'; did you mean '-Wno-format-truncation'? [-Wunknown-warning-option] In file included from /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/API/SBWatchpointOptions.h:12: In file included from /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/API/SBDefines.h:12: In file included from /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/lldb-defines.h:12: In file included from /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/lldb-types.h:12: /home/buildbot/worker/as-builder-9/lldb-remote-linux-ubuntu/llvm-project/lldb/include/lldb/lldb-enumerations.h:12:10: fatal error: 'cstdint' file not found 12 | #include <cstdint> | ^~~~~~~~~ ```
2 parents e027416 + 7e04bfb commit 4ee1d80

File tree

15 files changed

+1
-1193
lines changed

15 files changed

+1
-1193
lines changed

lldb/cmake/modules/LLDBConfig.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,4 @@ else()
323323
set(LLDB_CAN_USE_DEBUGSERVER OFF)
324324
endif()
325325

326-
set(LLDB_BUILD_LLDBRPC ON CACHE BOOL "")
327-
328326
include(LLDBGenerateConfig)

lldb/test/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ if(TARGET lldb-framework)
132132
add_lldb_test_dependency(lldb-framework)
133133
endif()
134134

135-
if (LLDB_BUILD_LLDBRPC)
136-
add_lldb_test_dependency(lldb-rpc-generate-sources)
137-
endif()
138-
139135
# Add dependencies that are not exported targets when building standalone.
140136
if(NOT LLDB_BUILT_STANDALONE)
141137
add_lldb_test_dependency(
@@ -253,8 +249,7 @@ llvm_canonicalize_cmake_booleans(
253249
LLDB_TEST_SHELL_DISABLE_REMOTE
254250
LLDB_TOOL_LLDB_SERVER_BUILD
255251
LLDB_USE_SYSTEM_DEBUGSERVER
256-
LLDB_IS_64_BITS
257-
LLDB_BUILD_LLDBRPC)
252+
LLDB_IS_64_BITS)
258253

259254
# Configure the individual test suites.
260255
add_subdirectory(API)

lldb/test/Shell/RPC/Generator/Inputs/SBDummy.h

Whitespace-only changes.

lldb/test/Shell/RPC/Generator/Tests/CheckRPCGenToolByproducts.test

Lines changed: 0 additions & 9 deletions
This file was deleted.

lldb/test/Shell/RPC/Generator/lit.local.cfg

Lines changed: 0 additions & 3 deletions
This file was deleted.

lldb/test/Shell/helper/toolchain.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,6 @@ def use_lldb_substitutions(config):
156156
extra_args=["platform"],
157157
unresolved="ignore",
158158
),
159-
ToolSubst(
160-
"%lldb-rpc-gen",
161-
command=FindTool("lldb-rpc-gen"),
162-
# We need the LLDB build directory root to pass into the tool, not the test build root.
163-
extra_args=[
164-
"-p " + config.lldb_build_directory + "/..",
165-
'--extra-arg="-resource-dir=' + config.clang_resource_dir + '"',
166-
],
167-
unresolved="ignore",
168-
),
169159
"lldb-test",
170160
"lldb-dap",
171161
ToolSubst(

lldb/test/Shell/lit.site.cfg.py.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ config.lldb_build_directory = "@LLDB_TEST_BUILD_DIRECTORY@"
3333
config.have_lldb_server = @LLDB_TOOL_LLDB_SERVER_BUILD@
3434
config.lldb_system_debugserver = @LLDB_USE_SYSTEM_DEBUGSERVER@
3535
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
36-
config.lldb_has_lldbrpc = @LLDB_BUILD_LLDBRPC@
3736
# The shell tests use their own module caches.
3837
config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-shell")
3938
config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-shell")

lldb/tools/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ add_subdirectory(lldb-fuzzer EXCLUDE_FROM_ALL)
1010

1111
add_lldb_tool_subdirectory(lldb-instr)
1212
add_lldb_tool_subdirectory(lldb-dap)
13-
if (LLDB_BUILD_LLDBRPC)
14-
add_lldb_tool_subdirectory(lldb-rpc)
15-
endif()
1613

1714
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
1815
add_lldb_tool_subdirectory(darwin-debug)

lldb/tools/lldb-rpc/CMakeLists.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

lldb/tools/lldb-rpc/LLDBRPCGeneration.cmake

Lines changed: 0 additions & 60 deletions
This file was deleted.

lldb/tools/lldb-rpc/LLDBRPCHeaders.cmake

Lines changed: 0 additions & 101 deletions
This file was deleted.

lldb/tools/lldb-rpc/lldb-rpc-gen/CMakeLists.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)