Skip to content
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

[lldb] Include SBLanguages in the SWIG bindings #92470

Merged
merged 2 commits into from
May 17, 2024

Conversation

JDevlieghere
Copy link
Member

No description provided.

@llvmbot
Copy link
Collaborator

llvmbot commented May 16, 2024

@llvm/pr-subscribers-lldb

Author: Jonas Devlieghere (JDevlieghere)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/92470.diff

3 Files Affected:

  • (modified) lldb/bindings/CMakeLists.txt (+2)
  • (modified) lldb/bindings/headers.swig (+1)
  • (modified) lldb/bindings/interfaces.swig (+1)
diff --git a/lldb/bindings/CMakeLists.txt b/lldb/bindings/CMakeLists.txt
index 296eae1ae77f8..438643004c3fa 100644
--- a/lldb/bindings/CMakeLists.txt
+++ b/lldb/bindings/CMakeLists.txt
@@ -2,6 +2,7 @@ file(GLOB SWIG_INTERFACES interface/*.i)
 file(GLOB_RECURSE SWIG_SOURCES *.swig)
 file(GLOB SWIG_HEADERS
   ${LLDB_SOURCE_DIR}/include/lldb/API/*.h
+  ${LLDB_BINARY_DIR}/include/lldb/API/*.h
   ${LLDB_SOURCE_DIR}/include/lldb/*.h
 )
 file(GLOB SWIG_PRIVATE_HEADERS
@@ -30,6 +31,7 @@ set(SWIG_COMMON_FLAGS
   -w361,362,509
   -features autodoc
   -I${LLDB_SOURCE_DIR}/include
+  -I${LLDB_BINARY_DIR}/include
   -I${CMAKE_CURRENT_SOURCE_DIR}
   ${DARWIN_EXTRAS}
 )
diff --git a/lldb/bindings/headers.swig b/lldb/bindings/headers.swig
index e8d0cda288141..ffdc3c31ec883 100644
--- a/lldb/bindings/headers.swig
+++ b/lldb/bindings/headers.swig
@@ -36,6 +36,7 @@
 #include "lldb/API/SBHostOS.h"
 #include "lldb/API/SBInstruction.h"
 #include "lldb/API/SBInstructionList.h"
+#include "lldb/API/SBLanguages.h"
 #include "lldb/API/SBLanguageRuntime.h"
 #include "lldb/API/SBLaunchInfo.h"
 #include "lldb/API/SBLineEntry.h"
diff --git a/lldb/bindings/interfaces.swig b/lldb/bindings/interfaces.swig
index a31a0b4af1eb6..2a29a8dd7ef0b 100644
--- a/lldb/bindings/interfaces.swig
+++ b/lldb/bindings/interfaces.swig
@@ -114,6 +114,7 @@
 %include "lldb/API/SBHostOS.h"
 %include "lldb/API/SBInstruction.h"
 %include "lldb/API/SBInstructionList.h"
+%include "lldb/API/SBLanguages.h"
 %include "lldb/API/SBLanguageRuntime.h"
 %include "lldb/API/SBLaunchInfo.h"
 %include "lldb/API/SBLineEntry.h"

Copy link
Member

@bulbazord bulbazord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this has no dependency tracking. You'll need to add that for this to work every time.

@JDevlieghere
Copy link
Member Author

JDevlieghere commented May 16, 2024

Actually, this has no dependency tracking. You'll need to add that for this to work every time.

It does actually, that's what the SWIG_HEADERS glob is used for.

EDIT: Ah but the glob could run before the generated header exists. I see the issue. I'll just hardcode it.

Copy link
Member

@bulbazord bulbazord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, that should work. CMake knows about SBLanguages.h since there are rules to generate it.

@JDevlieghere JDevlieghere merged commit ebf2831 into llvm:main May 17, 2024
4 checks passed
JDevlieghere added a commit that referenced this pull request May 17, 2024
@JDevlieghere JDevlieghere deleted the SBLanguages-SWIG branch May 17, 2024 02:59
JDevlieghere added a commit to swiftlang/llvm-project that referenced this pull request May 17, 2024
adrian-prantl pushed a commit to adrian-prantl/llvm-project that referenced this pull request Jun 12, 2024
(cherry picked from commit d74bc82)
(cherry picked from commit 19ef747)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants