This is an archive of the discontinued LLVM Phabricator instance.

Differential D112972

[lldb] use EXT_SUFFIX for python extension
ClosedPublic

Authored by lawrence_danna on Nov 1 2021, 4:55 PM.

Details

Reviewers
jasonmolenda
JDevlieghere
jingham
Commits
rGae389b2450bd: [lldb] use EXT_SUFFIX for python extension
Summary

LLDB doesn't use only the python stable ABI, which means loading
it into an incompatible python can cause the process to crash.
_lldb.so should be named with the full EXT_SUFFIX from sysconfig

  • such as _lldb.cpython-39-darwin.so -- so this doesn't happen.

Diff Detail

Revision Contents

PathSize
lldb/
4 lines
bindings/
python/
10 lines
3 lines

Diff 387765

lldb/CMakeLists.txt

Show All 29 Linesif (WIN32)
add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
endif() endif()
if (LLDB_ENABLE_PYTHON) if (LLDB_ENABLE_PYTHON)
set(cachestring_LLDB_PYTHON_RELATIVE_PATH set(cachestring_LLDB_PYTHON_RELATIVE_PATH
"Path where Python modules are installed, relative to install prefix") "Path where Python modules are installed, relative to install prefix")
set(cachestring_LLDB_PYTHON_EXE_RELATIVE_PATH set(cachestring_LLDB_PYTHON_EXE_RELATIVE_PATH
"Path to python interpreter exectuable, relative to install prefix") "Path to python interpreter exectuable, relative to install prefix")
set(cachestring_LLDB_PYTHON_EXT_SUFFIX
"Filename extension for native code python modules")
foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH) foreach(var LLDB_PYTHON_RELATIVE_PATH LLDB_PYTHON_EXE_RELATIVE_PATH LLDB_PYTHON_EXT_SUFFIX)
if(NOT DEFINED ${var} AND NOT CMAKE_CROSSCOMPILING) if(NOT DEFINED ${var} AND NOT CMAKE_CROSSCOMPILING)
execute_process( execute_process(
COMMAND ${Python3_EXECUTABLE} COMMAND ${Python3_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/bindings/python/get-python-config.py ${CMAKE_CURRENT_SOURCE_DIR}/bindings/python/get-python-config.py
${var} ${var}
OUTPUT_VARIABLE value OUTPUT_VARIABLE value
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
file(TO_CMAKE_PATH "${value}" value) file(TO_CMAKE_PATH "${value}" value)
▲ Show 20 Lines • Show All 80 Lines • Show Last 20 Lines

lldb/bindings/python/CMakeLists.txt

Show First 20 Lines • Show All 143 Lines • ▼ Show 20 Lines create_python_package(
"${LLDB_SOURCE_DIR}/examples/python/diagnose_nsstring.py") "${LLDB_SOURCE_DIR}/examples/python/diagnose_nsstring.py")
endif() endif()
if(LLDB_BUILD_FRAMEWORK) if(LLDB_BUILD_FRAMEWORK)
set(LIBLLDB_SYMLINK_DEST "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/LLDB") set(LIBLLDB_SYMLINK_DEST "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/LLDB")
else() else()
set(LIBLLDB_SYMLINK_DEST "${LLVM_SHLIB_OUTPUT_INTDIR}/liblldb${CMAKE_SHARED_LIBRARY_SUFFIX}") set(LIBLLDB_SYMLINK_DEST "${LLVM_SHLIB_OUTPUT_INTDIR}/liblldb${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif() endif()
if(WIN32) set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb${LLDB_PYTHON_EXT_SUFFIX}")
if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb_d.pyd")
else()
set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.pyd")
endif()
else()
set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.so")
endif()
create_relative_symlink(${swig_target} ${LIBLLDB_SYMLINK_DEST} create_relative_symlink(${swig_target} ${LIBLLDB_SYMLINK_DEST}
${lldb_python_target_dir} ${LIBLLDB_SYMLINK_OUTPUT_FILE}) ${lldb_python_target_dir} ${LIBLLDB_SYMLINK_OUTPUT_FILE})
if (NOT WIN32) if (NOT WIN32)
add_dependencies(${swig_target} lldb-python-wrapper) add_dependencies(${swig_target} lldb-python-wrapper)
endif() endif()
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

lldb/bindings/python/get-python-config.py

Show All 33 Lines elif args.variable_name == "LLDB_PYTHON_EXE_RELATIVE_PATH":
exe = os.path.join(os.path.dirname(exe), os.readlink(exe)) exe = os.path.join(os.path.dirname(exe), os.readlink(exe))
continue continue
else: else:
print("Could not find a relative path to sys.executable under sys.prefix", file=sys.stderr) print("Could not find a relative path to sys.executable under sys.prefix", file=sys.stderr)
for e in tried: for e in tried:
print("tried:", e, file=sys.stderr) print("tried:", e, file=sys.stderr)
print("sys.prefix:", sys.prefix, file=sys.stderr) print("sys.prefix:", sys.prefix, file=sys.stderr)
sys.exit(1) sys.exit(1)
elif args.variable_name == "LLDB_PYTHON_EXT_SUFFIX":
print(sysconfig.get_config_var('EXT_SUFFIX'))
else: else:
parser.error(f"unknown variable {args.variable_name}") parser.error(f"unknown variable {args.variable_name}")
if __name__ == '__main__': if __name__ == '__main__':
main() main()
No newline at end of file No newline at end of file