Revert "[LLDB] DebugInfoD tests: attempt to fix Fuchsia build" #98101
+22
−545
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lldb Author: Kevin Frei (kevinfrei) ChangesReverts llvm/llvm-project#96802 Attempt #5 fails. It's been 6 months. I despise Makefile.rules and have no ability to even detect these failures without landing a diff. In the mean time, we have no testing for DWP files at all (and a regression that was introduced, that I fix with this diff) so I'm going to just remove some of the tests and try to land it again, but with less testing I guess. Patch is 27.92 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/98101.diff 13 Files Affected:
diff --git a/lldb/include/lldb/Host/Config.h.cmake b/lldb/include/lldb/Host/Config.h.cmake
index 9e538534086a2..3defa454f6d42 100644
--- a/lldb/include/lldb/Host/Config.h.cmake
+++ b/lldb/include/lldb/Host/Config.h.cmake
@@ -33,8 +33,6 @@
#cmakedefine01 LLDB_ENABLE_LZMA
-#cmakedefine01 LLVM_ENABLE_CURL
-
#cmakedefine01 LLDB_ENABLE_CURSES
#cmakedefine01 CURSES_HAVE_NCURSES_CURSES_H
diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py
index 0e8ca159efd55..ecc7b81035f11 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -1053,10 +1053,6 @@ def _get_bool_config_skip_if_decorator(key):
return unittest.skipIf(not have, "requires " + key)
-def skipIfCurlSupportMissing(func):
- return _get_bool_config_skip_if_decorator("curl")(func)
-
-
def skipIfCursesSupportMissing(func):
return _get_bool_config_skip_if_decorator("curses")(func)
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index a7d9d34509f5d..bd8eea3d6f5a0 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -51,7 +51,7 @@ LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../
#
# GNUWin32 uname gives "windows32" or "server version windows32" while
# some versions of MSYS uname return "MSYS_NT*", but most environments
-# standardize on "Windows_NT", so we'll make it consistent here.
+# standardize on "Windows_NT", so we'll make it consistent here.
# When running tests from Visual Studio, the environment variable isn't
# inherited all the way down to the process spawned for make.
#----------------------------------------------------------------------
@@ -210,12 +210,6 @@ else
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
DSYM = $(EXE).debug
endif
-
- ifeq "$(MAKE_DWP)" "YES"
- MAKE_DWO := YES
- DWP_NAME = $(EXE).dwp
- DYLIB_DWP_NAME = $(DYLIB_NAME).dwp
- endif
endif
LIMIT_DEBUG_INFO_FLAGS =
@@ -364,17 +358,6 @@ ifneq "$(OS)" "Darwin"
OBJCOPY ?= $(call replace_cc_with,objcopy)
ARCHIVER ?= $(call replace_cc_with,ar)
- # Look for llvm-dwp or gnu dwp
- DWP ?= $(call replace_cc_with,llvm-dwp)
- ifeq ($(wildcard $(DWP)),)
- DWP = $(call replace_cc_with,dwp)
- ifeq ($(wildcard $(DWP)),)
- DWP = $(shell command -v llvm-dwp 2> /dev/null)
- ifeq ($(wildcard $(DWP)),)
- DWP = $(shell command -v dwp 2> /dev/null)
- endif
- endif
- endif
override AR = $(ARCHIVER)
endif
@@ -545,10 +528,6 @@ ifneq "$(CXX)" ""
endif
endif
-ifeq "$(GEN_GNU_BUILD_ID)" "YES"
- LDFLAGS += -Wl,--build-id
-endif
-
#----------------------------------------------------------------------
# DYLIB_ONLY variable can be used to skip the building of a.out.
# See the sections below regarding dSYM file as well as the building of
@@ -587,18 +566,11 @@ else
endif
else
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
-ifeq "$(SAVE_FULL_DEBUG_BINARY)" "YES"
- cp "$(EXE)" "$(EXE).unstripped"
-endif
$(OBJCOPY) --only-keep-debug "$(EXE)" "$(DSYM)"
$(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DSYM)" "$(EXE)" "$(EXE)"
endif
-ifeq "$(MAKE_DWP)" "YES"
- $(DWP) -o "$(DWP_NAME)" $(DWOS)
-endif
endif
-
#----------------------------------------------------------------------
# Make the dylib
#----------------------------------------------------------------------
@@ -639,15 +611,9 @@ endif
else
$(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -shared -o "$(DYLIB_FILENAME)"
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
-ifeq "$(SAVE_FULL_DEBUG_BINARY)" "YES"
- cp "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).unstripped"
-endif
$(OBJCOPY) --only-keep-debug "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).debug"
$(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DYLIB_FILENAME).debug" "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME)"
endif
-ifeq "$(MAKE_DWP)" "YES"
- $(DWP) -o $(DYLIB_DWP_FILE) $(DYLIB_DWOS)
-endif
endif
#----------------------------------------------------------------------
diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp
index fb035a36e7d74..29da7d33dd80b 100644
--- a/lldb/source/API/SBDebugger.cpp
+++ b/lldb/source/API/SBDebugger.cpp
@@ -775,9 +775,6 @@ SBStructuredData SBDebugger::GetBuildConfiguration() {
AddBoolConfigEntry(
*config_up, "xml", XMLDocument::XMLEnabled(),
"A boolean value that indicates if XML support is enabled in LLDB");
- AddBoolConfigEntry(
- *config_up, "curl", LLVM_ENABLE_CURL,
- "A boolean value that indicates if CURL support is enabled in LLDB");
AddBoolConfigEntry(
*config_up, "curses", LLDB_ENABLE_CURSES,
"A boolean value that indicates if curses support is enabled in LLDB");
@@ -1727,20 +1724,20 @@ SBDebugger::LoadTraceFromFile(SBError &error,
void SBDebugger::RequestInterrupt() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
- m_opaque_sp->RequestInterrupt();
+ m_opaque_sp->RequestInterrupt();
}
void SBDebugger::CancelInterruptRequest() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
- m_opaque_sp->CancelInterruptRequest();
+ m_opaque_sp->CancelInterruptRequest();
}
bool SBDebugger::InterruptRequested() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
return m_opaque_sp->InterruptRequested();
return false;
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index e09c9a86478bb..f2ff3a8b259fa 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -4299,38 +4299,26 @@ const std::shared_ptr<SymbolFileDWARFDwo> &SymbolFileDWARF::GetDwpSymbolFile() {
FileSpecList search_paths = Target::GetDefaultDebugFileSearchPaths();
ModuleSpec module_spec;
module_spec.GetFileSpec() = m_objfile_sp->GetFileSpec();
- FileSpec dwp_filespec;
for (const auto &symfile : symfiles.files()) {
module_spec.GetSymbolFileSpec() =
FileSpec(symfile.GetPath() + ".dwp", symfile.GetPathStyle());
LLDB_LOG(log, "Searching for DWP using: \"{0}\"",
module_spec.GetSymbolFileSpec());
- dwp_filespec =
+ FileSpec dwp_filespec =
PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
if (FileSystem::Instance().Exists(dwp_filespec)) {
- break;
- }
- }
- if (!FileSystem::Instance().Exists(dwp_filespec)) {
- LLDB_LOG(log, "No DWP file found locally");
- // Fill in the UUID for the module we're trying to match for, so we can
- // find the correct DWP file, as the Debuginfod plugin uses *only* this
- // data to correctly match the DWP file with the binary.
- module_spec.GetUUID() = m_objfile_sp->GetUUID();
- dwp_filespec =
- PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
- }
- if (FileSystem::Instance().Exists(dwp_filespec)) {
- LLDB_LOG(log, "Found DWP file: \"{0}\"", dwp_filespec);
- DataBufferSP dwp_file_data_sp;
- lldb::offset_t dwp_file_data_offset = 0;
- ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
- GetObjectFile()->GetModule(), &dwp_filespec, 0,
- FileSystem::Instance().GetByteSize(dwp_filespec), dwp_file_data_sp,
- dwp_file_data_offset);
- if (dwp_obj_file) {
- m_dwp_symfile = std::make_shared<SymbolFileDWARFDwo>(
- *this, dwp_obj_file, DIERef::k_file_index_mask);
+ LLDB_LOG(log, "Found DWP file: \"{0}\"", dwp_filespec);
+ DataBufferSP dwp_file_data_sp;
+ lldb::offset_t dwp_file_data_offset = 0;
+ ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
+ GetObjectFile()->GetModule(), &dwp_filespec, 0,
+ FileSystem::Instance().GetByteSize(dwp_filespec), dwp_file_data_sp,
+ dwp_file_data_offset);
+ if (dwp_obj_file) {
+ m_dwp_symfile = std::make_shared<SymbolFileDWARFDwo>(
+ *this, dwp_obj_file, DIERef::k_file_index_mask);
+ break;
+ }
}
}
if (!m_dwp_symfile) {
diff --git a/lldb/source/Plugins/SymbolLocator/CMakeLists.txt b/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
index 3367022639ab8..ca969626f4ffc 100644
--- a/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolLocator/CMakeLists.txt
@@ -1,10 +1,5 @@
-# Order matters here: the first symbol locator prevents further searching.
-# For DWARF binaries that are both stripped and split, the Default plugin
-# will return the stripped binary when asked for the ObjectFile, which then
-# prevents an unstripped binary from being requested from the Debuginfod
-# provider.
-add_subdirectory(Debuginfod)
add_subdirectory(Default)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_subdirectory(DebugSymbols)
endif()
+add_subdirectory(Debuginfod)
diff --git a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
index f296e655cc466..b5fe35d71032a 100644
--- a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
+++ b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
@@ -44,24 +44,6 @@ llvm::StringRef SymbolVendorELF::GetPluginDescriptionStatic() {
"executables.";
}
-// If this is needed elsewhere, it can be exported/moved.
-static bool IsDwpSymbolFile(const lldb::ModuleSP &module_sp,
- const FileSpec &file_spec) {
- DataBufferSP dwp_file_data_sp;
- lldb::offset_t dwp_file_data_offset = 0;
- // Try to create an ObjectFile from the file_spec.
- ObjectFileSP dwp_obj_file = ObjectFile::FindPlugin(
- module_sp, &file_spec, 0, FileSystem::Instance().GetByteSize(file_spec),
- dwp_file_data_sp, dwp_file_data_offset);
- // The presence of a debug_cu_index section is the key identifying feature of
- // a DWP file. Make sure we don't fill in the section list on dwp_obj_file
- // (by calling GetSectionList(false)) as this function could be called before
- // we may have all the symbol files collected and available.
- return dwp_obj_file && ObjectFileELF::classof(dwp_obj_file.get()) &&
- dwp_obj_file->GetSectionList(false)->FindSectionByType(
- eSectionTypeDWARFDebugCuIndex, false);
-}
-
// CreateInstance
//
// Platforms can register a callback to use when creating symbol vendors to
@@ -105,15 +87,8 @@ SymbolVendorELF::CreateInstance(const lldb::ModuleSP &module_sp,
FileSpecList search_paths = Target::GetDefaultDebugFileSearchPaths();
FileSpec dsym_fspec =
PluginManager::LocateExecutableSymbolFile(module_spec, search_paths);
- if (!dsym_fspec || IsDwpSymbolFile(module_sp, dsym_fspec)) {
- // If we have a stripped binary or if we got a DWP file, we should prefer
- // symbols in the executable acquired through a plugin.
- ModuleSpec unstripped_spec =
- PluginManager::LocateExecutableObjectFile(module_spec);
- if (!unstripped_spec)
- return nullptr;
- dsym_fspec = unstripped_spec.GetFileSpec();
- }
+ if (!dsym_fspec)
+ return nullptr;
DataBufferSP dsym_file_data_sp;
lldb::offset_t dsym_file_data_offset = 0;
diff --git a/lldb/test/API/debuginfod/Normal/Makefile b/lldb/test/API/debuginfod/Normal/Makefile
deleted file mode 100644
index 54bd7adae241f..0000000000000
--- a/lldb/test/API/debuginfod/Normal/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-C_SOURCES := main.c
-
-# For normal (non DWP) Debuginfod tests, we need:
-
-# * The full binary: a.out.unstripped
-# Produced by Makefile.rules with SAVE_FULL_DEBUG_BINARY set to YES and
-# SPLIT_DEBUG_SYMBOLS set to YES
-
-# * The stripped binary (a.out)
-# Produced by Makefile.rules with SPLIT_DEBUG_SYMBOLS set to YES
-
-# * The 'only-keep-debug' binary (a.out.debug)
-# Produced below
-
-SPLIT_DEBUG_SYMBOLS := YES
-SAVE_FULL_DEBUG_BINARY := YES
-GEN_GNU_BUILD_ID := YES
-
-include Makefile.rules
diff --git a/lldb/test/API/debuginfod/Normal/TestDebuginfod.py b/lldb/test/API/debuginfod/Normal/TestDebuginfod.py
deleted file mode 100644
index 1860c56ef3e99..0000000000000
--- a/lldb/test/API/debuginfod/Normal/TestDebuginfod.py
+++ /dev/null
@@ -1,186 +0,0 @@
-import os
-import shutil
-import tempfile
-
-import lldb
-from lldbsuite.test.decorators import *
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-"""
-Test support for the DebugInfoD network symbol acquisition protocol.
-This one is for simple / no split-dwarf scenarios.
-
-For no-split-dwarf scenarios, there are 2 variations:
-1 - A stripped binary with it's corresponding unstripped binary:
-2 - A stripped binary with a corresponding --only-keep-debug symbols file
-"""
-
-
-class DebugInfodTests(TestBase):
- # No need to try every flavor of debug inf.
- NO_DEBUG_INFO_TESTCASE = True
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_no_symbols(self):
- """
- Validate behavior with no symbols or symbol locator.
- ('baseline negative' behavior)
- """
- test_root = self.config_test(["a.out"])
- self.try_breakpoint(False)
-
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_normal_default(self):
- """
- Validate behavior with symbols, but no symbol locator.
- ('baseline positive' behavior)
- """
- test_root = self.config_test(["a.out", "a.out.debug"])
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_symbols(self):
- """
- Test behavior with the full binary available from Debuginfod as
- 'debuginfo' from the plug-in.
- """
- test_root = self.config_test(["a.out"], "a.out.unstripped")
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_executable(self):
- """
- Test behavior with the full binary available from Debuginfod as
- 'executable' from the plug-in.
- """
- test_root = self.config_test(["a.out"], None, "a.out.unstripped")
- self.try_breakpoint(True)
-
- @skipIfCurlSupportMissing
- @skipUnlessPlatform(["linux", "freebsd"])
- def test_debuginfod_okd_symbols(self):
- """
- Test behavior with the 'only-keep-debug' symbols available from Debuginfod.
- """
- test_root = self.config_test(["a.out"], "a.out.debug")
- self.try_breakpoint(True)
-
- def try_breakpoint(self, should_have_loc):
- """
- This function creates a target from self.aout, sets a function-name
- breakpoint, and checks to see if we have a file/line location,
- as a way to validate that the symbols have been loaded.
- should_have_loc specifies if we're testing that symbols have or
- haven't been loaded.
- """
- target = self.dbg.CreateTarget(self.aout)
- self.assertTrue(target and target.IsValid(), "Target is valid")
-
- bp = target.BreakpointCreateByName("func")
- self.assertTrue(bp and bp.IsValid(), "Breakpoint is valid")
- self.assertEqual(bp.GetNumLocations(), 1)
-
- loc = bp.GetLocationAtIndex(0)
- self.assertTrue(loc and loc.IsValid(), "Location is valid")
- addr = loc.GetAddress()
- self.assertTrue(addr and addr.IsValid(), "Loc address is valid")
- line_entry = addr.GetLineEntry()
- self.assertEqual(
- should_have_loc,
- line_entry != None and line_entry.IsValid(),
- "Loc line entry is valid",
- )
- if should_have_loc:
- self.assertEqual(line_entry.GetLine(), 4)
- self.assertEqual(
- line_entry.GetFileSpec().GetFilename(),
- self.main_source_file.GetFilename(),
- )
- self.dbg.DeleteTarget(target)
- shutil.rmtree(self.tmp_dir)
-
- def config_test(self, local_files, debuginfo=None, executable=None):
- """
- Set up a test with local_files[] copied to a different location
- so that we control which files are, or are not, found in the file system.
- Also, create a stand-alone file-system 'hosted' debuginfod server with the
- provided debuginfo and executable files (if they exist)
-
- Make the filesystem look like:
-
- /tmp/<tmpdir>/test/[local_files]
-
- /tmp/<tmpdir>/cache (for lldb to use as a temp cache)
-
- /tmp/<tmpdir>/buildid/<uuid>/executable -> <executable>
- /tmp/<tmpdir>/buildid/<uuid>/debuginfo -> <debuginfo>
- Returns the /tmp/<tmpdir> path
- """
-
- self.build()
-
- uuid = self.getUUID("a.out")
- if not uuid:
- self.fail("Could not get UUID for a.out")
- return
- self.main_source_file = lldb.SBFileSpec("main.c")
- self.tmp_dir = tempfile.mkdtemp()
- test_dir = os.path.join(self.tmp_dir, "test")
- os.makedirs(test_dir)
-
- self.aout = ""
- # Copy the files used by the test:
- for f in local_files:
- shutil.copy(self.getBuildArtifact(f), test_dir)
- # The first item is the binary to be used for the test
- if self.aout == "":
- self.aout = os.path.join(test_dir, f)
-
- use_debuginfod = debuginfo != None or executable != None
-
- # Populated the 'file://... mocked' Debuginfod server:
- if use_debuginfod:
- os.makedirs(os.path.join(self.tmp_dir, "cache"))
- uuid_dir = os.path.join(self.tmp_dir, "buildid", uuid)
- os.makedirs(uuid_dir)
- if debuginfo:
- shutil.copy(
- self.getBuildArtifact(debuginfo),
- os.path.join(uuid_dir, "debuginfo"),
- )
- if executable:
- shutil.copy(
- self.getBuildArtifact(executable),
- os.path.join(uuid_dir, "executable"),
- )
-
- # Configure LLDB for the test:
- self.runCmd(
- "settings set symbols.enable-external-lookup %s"
- % str(use_debuginfod).lower()
- )
- self.runCmd("settings clear plugin.symbol-locator.debuginfod.server-urls")
- if use_debuginfod:
- self.runCmd(
- "settings set plugin.symbol-locator.debuginfod.cache-path %s/cache"
- % self.tmp_dir
- )
- self.runCmd(
- "settings insert-before plugin.symbol-locator.debuginfod.server-urls 0 file://%s"
- % self.tmp_dir
- )
-
- def getUUID(self, filename):
- try:
- spec = lldb.SBModuleSpec()
- spec.SetFileSpec(lldb.SBFileSpec(self.getBuildArtifact(filename)))
- module = lldb.SBModule(spec)
- uuid = module.GetUUIDString().replace("-", "").lower()
- # Don't want lldb's fake 32 bit CRC's for this one
- return uuid if len(uuid) > 8 else None
- except:
- return None
diff --git a/lldb/test/API/debuginfod/Normal/main.c b/lldb/test/API/debuginfod/Normal/main.c
deleted file mode 100644
index 4c7184609b453..0000000000000
--- a/lldb/test/API/debuginfod/Normal/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// This is a dump little pair of test files
-
-int func(int argc, const char *argv[]) {
- return (argc + 1) * (argv[argc][0] + 2);
-}
-
-int main(int argc, const char *argv[]) { return func(0, argv); }
diff --git a/lldb/test/API/debuginfod/SplitDWARF/Makefile b/lldb/test/API/debuginfod/SplitDWARF/Makefile
deleted file mode 100644
index 3ab9a969e5a44..0000000000000
--- a/lldb/test/API/debuginfod/SplitDWARF/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-C_SOURCES := main.c
-
-# For split-dwarf Debuginfod tests, we need:
-
-# * A .DWP file (a.out.dwp)
-# Produced by Makefile.rules with MAKE_DWP set to YES
-
-# * The "full" binary (missing things that live in .dwo's) (a.out.unstripped)
-# Produced by Makefile.rules with SAVE_FULL_DEBUG_BINARY set to YES and
-# SPLIT_DEBUG_SYMBOLS set to YES
-
-# * The stripped binary (a.out)
-# Produced by Makefile.rules
-
-# * The 'only-keep-debug' binary (a.out.debug)
-# Produced below
-
-MAKE_DWP := YES
-SPLIT_DEBUG_SYMBOLS := YES
-SAVE_FULL_DEBUG_BINARY := YES
-GEN_GNU_BUILD_ID := YES
-
-include Makefile.rules
diff --git a/...
[truncated]
|
You can test this locally with the following command:git-clang-format --diff f6eda6fb7a335861d8a8ce32ea805830685f218d 76f102112c8a8a1292929b65ebb7db8b033ee344 -- lldb/source/API/SBDebugger.cpp lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cppView the diff from clang-format here.diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp
index 29da7d33dd..683cee0878 100644
--- a/lldb/source/API/SBDebugger.cpp
+++ b/lldb/source/API/SBDebugger.cpp
@@ -1724,20 +1724,20 @@ SBDebugger::LoadTraceFromFile(SBError &error,
void SBDebugger::RequestInterrupt() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
- m_opaque_sp->RequestInterrupt();
+ m_opaque_sp->RequestInterrupt();
}
void SBDebugger::CancelInterruptRequest() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
- m_opaque_sp->CancelInterruptRequest();
+ m_opaque_sp->CancelInterruptRequest();
}
bool SBDebugger::InterruptRequested() {
LLDB_INSTRUMENT_VA(this);
-
+
if (m_opaque_sp)
return m_opaque_sp->InterruptRequested();
return false;
|
clayborg
approved these changes
Jul 9, 2024
aaryanshukla
pushed a commit
to aaryanshukla/llvm-project
that referenced
this pull request
Jul 14, 2024
…98101) Reverts llvm#96802 Attempt llvm#5 fails. It's been 6 months. I despise Makefile.rules and have no ability to even *detect* these failures without _landing_ a diff. In the mean time, we have no testing for DWP files at all (and a regression that was introduced, that I fix with this diff) so I'm going to just remove some of the tests and try to land it again, but with less testing I guess.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #96802
Attempt #5 fails. It's been 6 months. I despise Makefile.rules and have no ability to even detect these failures without landing a diff. In the mean time, we have no testing for DWP files at all (and a regression that was introduced, that I fix with this diff) so I'm going to just remove some of the tests and try to land it again, but with less testing I guess.