Skip to content

Revert "Cherrypick commits to synchronize the debugger output and error stream" #10369

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.

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

Merged

Conversation

DougGregor
Copy link
Member

Reverts #10368

@DougGregor DougGregor requested a review from a team as a code owner March 28, 2025 14:01
@DougGregor
Copy link
Member Author

@swift-ci please test

@DougGregor
Copy link
Member Author

Note: the pull request broke Windows CI:

FAILED: tools/lldb/source/Plugins/ScriptInterpreter/Python/CMakeFiles/lldbPluginScriptInterpreterPython.dir/ScriptInterpreterPython.cpp.obj 
C:\PROGRA~1\MICROS~2\2022\COMMUN~1\VC\Tools\MSVC\1442~1.344\bin\Hostx64\x64\cl.exe  /nologo /TP -DGTEST_HAS_RTTI=0 -DLIBXML_STATIC -DLLDB_ENABLE_SWIFT -DLLDB_PYTHON_EXE_RELATIVE_PATH=\"python.exe\" -DLLDB_PYTHON_RELATIVE_LIBDIR=\"lib/site-packages\" -DSWIFT_BUILD_REGEX_PARSER_IN_COMPILER -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_ENABLE_EXTENDED_ALIGNED_STORAGE -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IT:\5\tools\lldb\source\Plugins\ScriptInterpreter\Python -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\lldb\source\Plugins\ScriptInterpreter\Python -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\lldb\include -IT:\5\tools\lldb\include -IT:\5\include -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\llvm\include -IT:\PythonAMD64-3.9.10\tools\include -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\llvm\..\clang\include -IT:\5\tools\lldb\..\clang\include -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\swift\include -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\swift\stdlib\public\SwiftShims -IT:\5\tools\lldb\..\swift\include -IC:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\lldb\source -IT:\5\tools\lldb\source -external:IT:\Library\libxml2-2.11.5\usr\include\libxml2 -external:W0 /GS- /Gw /Gy /Oi /Oy /Zc:inline /Zc:__cplusplus /Zc:inline /Zc:preprocessor /Zc:__cplusplus /Oi /bigobj /permissive- /W4 -wd4141 -wd4146 -wd4244 -wd4267 -wd4291 -wd4351 -wd4456 -wd4457 -wd4458 -wd4459 -wd4503 -wd4624 -wd4722 -wd4100 -wd4127 -wd4512 -wd4505 -wd4610 -wd4510 -wd4702 -wd4245 -wd4706 -wd4310 -wd4701 -wd4703 -wd4389 -wd4611 -wd4805 -wd4204 -wd4577 -wd4091 -wd4592 -wd4319 -wd4709 -wd5105 -wd4324 -w14062 -we4238 /Gw /O2 /Ob2  -std:c++17 -MD   -wd4018 -wd4068 -wd4150 -wd4201 -wd4251 -wd4521 -wd4530 -wd4589  /EHs-c- /GR- -UNDEBUG /showIncludes /Fotools\lldb\source\Plugins\ScriptInterpreter\Python\CMakeFiles\lldbPluginScriptInterpreterPython.dir\ScriptInterpreterPython.cpp.obj /Fdtools\lldb\source\Plugins\ScriptInterpreter\Python\CMakeFiles\lldbPluginScriptInterpreterPython.dir\lldbPluginScriptInterpreterPython.pdb /FS -c C:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\lldb\source\Plugins\ScriptInterpreter\Python\ScriptInterpreterPython.cpp
T:\PythonAMD64-3.9.10\tools\include\pyconfig.h(190): error C2371: 'pid_t': redefinition; different basic types
C:\Users\swift-ci\jenkins\workspace\swift-syntax-PR-windows\llvm-project\lldb\include\lldb/Host/windows/PosixApi.h(80): note: see declaration of 'pid_t'

@milseman milseman merged commit 30c69c2 into stable/20240723 Mar 28, 2025
0 of 3 checks passed
@milseman milseman deleted the revert-10368-cherrypick-output-error-stream-locking branch March 28, 2025 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants