Skip to content

[LLDB, FreeBSD, x86] Fix empty register set when trying to get size of register #162890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −4
Open

[LLDB, FreeBSD, x86] Fix empty register set when trying to get size of register #162890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions lldb/source/Host/freebsd/Host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include <dlfcn.h>
#include <execinfo.h>

#include "llvm/Object/ELF.h"

#include "lldb/Host/FileSystem.h"
#include "lldb/Host/Host.h"
#include "lldb/Host/HostInfo.h"
Expand All @@ -32,6 +30,7 @@
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StreamString.h"

#include "llvm/Object/ELF.h"
#include "llvm/TargetParser/Host.h"

namespace lldb_private {
Expand Down
6 changes: 4 additions & 2 deletions lldb/source/Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ static std::vector<lldb_private::RegisterInfo> &GetSharedRegisterInfoVector() {

static const RegisterInfo *
GetRegisterInfo_i386(const lldb_private::ArchSpec &arch) {
static std::vector<lldb_private::RegisterInfo> g_register_infos(
GetSharedRegisterInfoVector());
static std::vector<lldb_private::RegisterInfo> g_register_infos;

// Allocate RegisterInfo only once
if (g_register_infos.empty()) {
Expand All @@ -93,6 +92,9 @@ GetRegisterInfo_i386(const lldb_private::ArchSpec &arch) {
#define UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
#include "RegisterInfos_x86_64.h"
#undef UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
std::vector<lldb_private::RegisterInfo> &shared_regs =
GetSharedRegisterInfoVector();
shared_regs = g_register_infos;
}

return &g_register_infos[0];
Expand Down
26 changes: 26 additions & 0 deletions lldb/test/Shell/Breakpoint/debug_x86_over_amd64.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# REQUIRES: target-x86_64
# XFAIL: system-windows

# RUN: mkdir -p %t
# RUN: cd %t
# RUN: %clang_host -m32 %p/Inputs/dummy-target.c -o dummy.out
# RUN: %lldb -b -s %s dummy.out | FileCheck %s

breakpoint set -D -n main
# CHECK: Breakpoint {{[0-9]}}: no locations (pending).
# CHECK: Breakpoint set in dummy target

breakpoint list
# CHECK: No breakpoints currently set

breakpoint list -D
# CHECK: name = 'main', locations = 0 (pending)

target delete
# CHECK: 1 targets deleted

target create dummy.out
# CHECK: Current executable set to {{.*}}dummy.out

breakpoint list
# CHECK: name = 'main', locations = {{[1-9]}}
Loading