OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[lldb/Plugins] Move member template specialization out of class 

This patch should fix the build failure that surfaced when build llvm
with GCC: https://lab.llvm.org/staging/#/builders/16/builds/10450

GCC complained that I explicitely specialized
 `ScriptedPythonInterface::ExtractValueFromPythonObject` in a
in non-namespace scope, which is tolerated by Clang.

To solve this issue, the specialization were declared out of the class
and implemented in the source file.

Signed-off-by: Med Ismail Bennani <medismail.bennani@gmail.com>
This commit is contained in:
Med Ismail Bennani 2021-09-03 22:03:06 +00:00
parent b989662eb0
commit 5f6f33da9e
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lldb/source/Plugins/ScriptInterpreter/Python/ScriptedPythonInterface.cpp
View File

@ -35,4 +35,31 @@ ScriptedPythonInterface::GetStatusFromMethod(llvm::StringRef method_name) {
return error; return error;
} }
template <>
Status ScriptedPythonInterface::ExtractValueFromPythonObject<Status>(
python::PythonObject &p, Status &error) {
if (lldb::SBError *sb_error = reinterpret_cast<lldb::SBError *>(
LLDBSWIGPython_CastPyObjectToSBError(p.get())))
error = m_interpreter.GetStatusFromSBError(*sb_error);
else
error.SetErrorString("Couldn't cast lldb::SBError to lldb::Status.");
return error;
}
template <>
lldb::DataExtractorSP
ScriptedPythonInterface::ExtractValueFromPythonObject<lldb::DataExtractorSP>(
python::PythonObject &p, Status &error) {
lldb::SBData *sb_data = reinterpret_cast<lldb::SBData *>(
LLDBSWIGPython_CastPyObjectToSBData(p.get()));
if (!sb_data) {
error.SetErrorString("Couldn't cast lldb::SBError to lldb::Status.");
return nullptr;
}
return m_interpreter.GetDataExtractorFromSBData(*sb_data);
}
#endif #endif

37
lldb/source/Plugins/ScriptInterpreter/Python/ScriptedPythonInterface.h
View File

@ -33,33 +33,6 @@ protected:
return p.CreateStructuredObject(); return p.CreateStructuredObject();
} }
template <>
Status ExtractValueFromPythonObject<Status>(python::PythonObject &p,
Status &error) {
if (lldb::SBError *sb_error = reinterpret_cast<lldb::SBError *>(
LLDBSWIGPython_CastPyObjectToSBError(p.get())))
error = m_interpreter.GetStatusFromSBError(*sb_error);
else
error.SetErrorString("Couldn't cast lldb::SBError to lldb::Status.");
return error;
}
template <>
lldb::DataExtractorSP
ExtractValueFromPythonObject<lldb::DataExtractorSP>(python::PythonObject &p,
Status &error) {
lldb::SBData *sb_data = reinterpret_cast<lldb::SBData *>(
LLDBSWIGPython_CastPyObjectToSBData(p.get()));
if (!sb_data) {
error.SetErrorString("Couldn't cast lldb::SBError to lldb::Status.");
return nullptr;
}
return m_interpreter.GetDataExtractorFromSBData(*sb_data);
}
template <typename T = StructuredData::ObjectSP, typename... Args> template <typename T = StructuredData::ObjectSP, typename... Args>
T Dispatch(llvm::StringRef method_name, Status &error, Args... args) { T Dispatch(llvm::StringRef method_name, Status &error, Args... args) {
using namespace python; using namespace python;
@ -149,6 +122,16 @@ protected:
// The lifetime is managed by the ScriptInterpreter // The lifetime is managed by the ScriptInterpreter
ScriptInterpreterPythonImpl &m_interpreter; ScriptInterpreterPythonImpl &m_interpreter;
}; };
template <>
Status ScriptedPythonInterface::ExtractValueFromPythonObject<Status>(
python::PythonObject &p, Status &error);
template <>
lldb::DataExtractorSP
ScriptedPythonInterface::ExtractValueFromPythonObject<lldb::DataExtractorSP>(
python::PythonObject &p, Status &error);
} // namespace lldb_private } // namespace lldb_private
#endif // LLDB_ENABLE_PYTHON #endif // LLDB_ENABLE_PYTHON