shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[lldb][Module] Don't try to locate scripting resources without a ScriptInterpreter (#187091)

Browse Source 
I'm in the process of moving `SanitizedScriptingModuleName` into
`ScriptInterpreter` as a `virtual` API. The nullptr check inside the
constructor made that more difficult because it implied we may not have
a `ScriptInterpreter` available to call the sanitization API on. Really
the `nullptr` check is redundant because even if we succesfully sanitize
and then locate some scripts, `Module::LoadScriptingResourceInTarget`
bails out if we don't have a `ScriptInterpreter`.

This patch moves the early exit in `LoadScriptingResourceInTarget` to
before we make the call to `LocateExecutableScriptingResources`. That
way we ensure we never get to `SanitizedScriptingModuleName` without a
valid `ScriptInterpreter`.
This commit is contained in:
Michael Buch 2026-03-18 00:09:15 +00:00 committed by GitHub
parent 3482480087
commit d9eba8b355
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/source/Core/Module.cpp
View File

@ -1440,6 +1440,12 @@ bool Module::LoadScriptingResourceInTarget(Target *target, Status &error) {
if (script_language == eScriptLanguageNone)
return true;
ScriptInterpreter *script_interpreter = debugger.GetScriptInterpreter();
if (!script_interpreter) {
error = Status::FromErrorString("invalid ScriptInterpreter");
return false;
}
PlatformSP platform_sp(target->GetPlatform());
if (!platform_sp) {
@ -1458,12 +1464,6 @@ bool Module::LoadScriptingResourceInTarget(Target *target, Status &error) {
if (num_specs == 0)
return true;
ScriptInterpreter *script_interpreter = debugger.GetScriptInterpreter();
if (!script_interpreter) {
error = Status::FromErrorString("invalid ScriptInterpreter");
return false;
}
for (uint32_t i = 0; i < num_specs; ++i) {
FileSpec scripting_fspec(file_specs.GetFileSpecAtIndex(i));
if (!scripting_fspec && !FileSystem::Instance().Exists(scripting_fspec))

12
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
View File

@ -91,7 +91,7 @@ namespace {
class SanitizedScriptingModuleName {
public:
SanitizedScriptingModuleName(llvm::StringRef name,
ScriptInterpreter *script_interpreter)
ScriptInterpreter &script_interpreter)
: m_original_name(name), m_sanitized_name(name.str()) {
// FIXME: for Python, don't allow certain characters in imported module
// filenames. Theoretically, different scripting languages may have
@ -104,8 +104,7 @@ public:
llvm::replace(m_sanitized_name, '-', '_');
llvm::replace(m_sanitized_name, '+', 'x');
if (script_interpreter &&
script_interpreter->IsReservedWord(m_sanitized_name.c_str())) {
if (script_interpreter.IsReservedWord(m_sanitized_name.c_str())) {
m_conflicting_keyword = m_sanitized_name;
m_sanitized_name.insert(m_sanitized_name.begin(), '_');
}
@ -291,11 +290,16 @@ PlatformDarwin::PutFile(const lldb_private::FileSpec &source,
FileSpecList PlatformDarwin::LocateExecutableScriptingResourcesFromDSYM(
Stream &feedback_stream, FileSpec module_spec, const Target &target,
const FileSpec &symfile_spec) {
assert(target.GetDebugger().GetScriptInterpreter() &&
"Trying to locate scripting resources but no ScriptInterpreter is "
"available.");
FileSpecList file_list;
while (module_spec.GetFilename()) {
SanitizedScriptingModuleName sanitized_name(
module_spec.GetFilename().GetStringRef(),
target.GetDebugger().GetScriptInterpreter());
*target.GetDebugger().GetScriptInterpreter());
StreamString path_string;
StreamString original_path_string;