Skip to content

Commit 230c7d8

Browse files
keithjpsimmarcosgriselli
authored
Update LLVM and Swift files for Swift 6 (#64)
Pulls in #62 and #63 --------- Signed-off-by: JP Simard <[email protected]> Signed-off-by: Marcos Griselli <[email protected]> Signed-off-by: Keith Smiley <[email protected]> Co-authored-by: JP Simard <[email protected]> Co-authored-by: Marcos Griselli <[email protected]>
1 parent 53a322b commit 230c7d8

File tree

8 files changed

+286
-69
lines changed

8 files changed

+286
-69
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66
- main
77
jobs:
88
test-bazel:
9-
runs-on: macos-13
9+
runs-on: macos-14
1010
steps:
1111
- uses: actions/checkout@v3
12-
- run: sudo xcode-select -s /Applications/Xcode_15.0.app
12+
- run: sudo xcode-select -s /Applications/Xcode_16.2.app
1313
- run: bazelisk build //...
1414
- run: bazelisk test //...
1515
test-swiftpm:
16-
runs-on: macos-13
16+
runs-on: macos-14
1717
steps:
1818
- uses: actions/checkout@v3
19-
- run: sudo xcode-select -s /Applications/Xcode_15.0.app
19+
- run: sudo xcode-select -s /Applications/Xcode_16.2.app
2020
- run: swift build
2121
- run: swift test

Sources/CIndexStore/include/indexstore.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* INDEXSTORE_VERSION_MAJOR is intended for "major" source/ABI breaking changes.
2626
*/
2727
#define INDEXSTORE_VERSION_MAJOR 0
28-
#define INDEXSTORE_VERSION_MINOR 13
28+
#define INDEXSTORE_VERSION_MINOR 15 /* added Swift init accessor sub-symbol */
2929

3030
#define INDEXSTORE_VERSION_ENCODE(major, minor) ( \
3131
((major) * 10000) \
@@ -128,6 +128,8 @@ typedef struct {
128128
INDEXSTORE_PUBLIC unsigned
129129
indexstore_format_version(void);
130130

131+
INDEXSTORE_PUBLIC unsigned indexstore_version(void);
132+
131133
typedef void *indexstore_t;
132134
typedef void *indexstore_creation_options_t;
133135

@@ -280,6 +282,7 @@ typedef enum {
280282
INDEXSTORE_SYMBOL_KIND_CONVERSIONFUNCTION = 24,
281283
INDEXSTORE_SYMBOL_KIND_PARAMETER = 25,
282284
INDEXSTORE_SYMBOL_KIND_USING = 26,
285+
INDEXSTORE_SYMBOL_KIND_CONCEPT = 27,
283286

284287
INDEXSTORE_SYMBOL_KIND_COMMENTTAG = 1000,
285288
} indexstore_symbol_kind_t;
@@ -310,6 +313,7 @@ typedef enum {
310313
INDEXSTORE_SYMBOL_SUBKIND_SWIFTGENERICTYPEPARAM = 1013,
311314
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORREAD = 1014,
312315
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORMODIFY = 1015,
316+
INDEXSTORE_SYMBOL_SUBKIND_SWIFTACCESSORINIT = 1016,
313317
} indexstore_symbol_subkind_t;
314318

315319
INDEXSTORE_OPTIONS(uint64_t, indexstore_symbol_property_t) {

0 commit comments

Comments
 (0)