Skip to content

Commit 16dd929

Browse files
committed
[sourcekit] Fix InProc exports on Windows
We only need the C++ symbols on Darwin, so avoid the issue of different manglings.
1 parent d4a52b8 commit 16dd929

File tree

3 files changed

+87
-15
lines changed

3 files changed

+87
-15
lines changed

tools/SourceKit/tools/sourcekitd/bin/InProc/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
set(EXPORTED_SYMBOL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sourcekitdInProc.exports")
1+
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
2+
set(EXPORTED_SYMBOL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sourcekitdInProc-darwin.exports")
3+
else()
4+
set(EXPORTED_SYMBOL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/sourcekitdInProc.exports")
5+
endif()
26

37
option(SOURCEKITD_BUILD_STATIC_INPROC
48
"Build sourcekitdInProc as a static library (in addition to a shared one)" OFF)
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
sourcekitd_cancel_request
2+
sourcekitd_initialize
3+
sourcekitd_request_array_create
4+
sourcekitd_request_array_set_int64
5+
sourcekitd_request_array_set_string
6+
sourcekitd_request_array_set_stringbuf
7+
sourcekitd_request_array_set_uid
8+
sourcekitd_request_array_set_value
9+
sourcekitd_request_create_from_yaml
10+
sourcekitd_request_description_copy
11+
sourcekitd_request_description_dump
12+
sourcekitd_request_dictionary_create
13+
sourcekitd_request_dictionary_set_int64
14+
sourcekitd_request_dictionary_set_string
15+
sourcekitd_request_dictionary_set_stringbuf
16+
sourcekitd_request_dictionary_set_uid
17+
sourcekitd_request_dictionary_set_value
18+
sourcekitd_request_int64_create
19+
sourcekitd_request_retain
20+
sourcekitd_request_release
21+
sourcekitd_request_string_create
22+
sourcekitd_request_uid_create
23+
sourcekitd_response_description_copy
24+
sourcekitd_response_description_dump
25+
sourcekitd_response_description_dump_filedesc
26+
sourcekitd_response_dispose
27+
sourcekitd_response_error_get_description
28+
sourcekitd_response_error_get_kind
29+
sourcekitd_response_get_value
30+
sourcekitd_response_is_error
31+
sourcekitd_send_request
32+
sourcekitd_send_request_sync
33+
sourcekitd_set_interrupted_connection_handler
34+
sourcekitd_set_notification_handler
35+
sourcekitd_set_uid_handler
36+
sourcekitd_set_uid_handlers
37+
sourcekitd_shutdown
38+
sourcekitd_uid_get_from_buf
39+
sourcekitd_uid_get_from_cstr
40+
sourcekitd_uid_get_length
41+
sourcekitd_uid_get_string_ptr
42+
sourcekitd_variant_array_apply
43+
sourcekitd_variant_array_apply_f
44+
sourcekitd_variant_array_get_bool
45+
sourcekitd_variant_array_get_count
46+
sourcekitd_variant_array_get_int64
47+
sourcekitd_variant_array_get_string
48+
sourcekitd_variant_array_get_uid
49+
sourcekitd_variant_array_get_value
50+
sourcekitd_variant_bool_get_value
51+
sourcekitd_variant_description_copy
52+
sourcekitd_variant_description_dump
53+
sourcekitd_variant_description_dump_filedesc
54+
sourcekitd_variant_dictionary_apply
55+
sourcekitd_variant_dictionary_apply_f
56+
sourcekitd_variant_dictionary_get_bool
57+
sourcekitd_variant_dictionary_get_int64
58+
sourcekitd_variant_dictionary_get_string
59+
sourcekitd_variant_dictionary_get_value
60+
sourcekitd_variant_dictionary_get_uid
61+
sourcekitd_variant_get_type
62+
sourcekitd_variant_json_description_copy
63+
sourcekitd_variant_string_get_length
64+
sourcekitd_variant_string_get_ptr
65+
sourcekitd_variant_data_get_size
66+
sourcekitd_variant_data_get_ptr
67+
sourcekitd_variant_int64_get_value
68+
sourcekitd_variant_uid_get_value
69+
_ZN10sourcekitd13enableLoggingEN4llvm9StringRefE
70+
_ZN10sourcekitd13handleRequestEPvNSt3__18functionIFvS0_EEE
71+
_ZN10sourcekitd17initializeServiceEN4llvm9StringRefES1_NSt3__18functionIFvPvEEE
72+
_ZN10sourcekitd24createErrorRequestFailedEN4llvm9StringRefE
73+
_ZN9SourceKit6Logger12LoggingLevelE
74+
_ZN9SourceKit6LoggerD1Ev
75+
_ZN9SourceKit6UIdent6setTagEPv
76+
_ZN9SourceKit6UIdentC1EN4llvm9StringRefE
77+
_ZN9SourceKit9WorkQueue4Impl12dispatchSyncEPvRKNS0_12DispatchDataE
78+
_ZN9SourceKit9WorkQueue4Impl15dispatchBarrierEPvRKNS0_12DispatchDataE
79+
_ZN9SourceKit9WorkQueue4Impl6createENS0_9DequeuingENS0_8PriorityEN4llvm9StringRefE
80+
_ZN9SourceKit9WorkQueue4Impl7releaseEPv
81+
_ZNK9SourceKit6UIdent5c_strEv
82+
_ZNK9SourceKit6UIdent6getTagEv

tools/SourceKit/tools/sourcekitd/bin/InProc/sourcekitdInProc.exports

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,3 @@ sourcekitd_variant_data_get_size
6666
sourcekitd_variant_data_get_ptr
6767
sourcekitd_variant_int64_get_value
6868
sourcekitd_variant_uid_get_value
69-
_ZN10sourcekitd13enableLoggingEN4llvm9StringRefE
70-
_ZN10sourcekitd13handleRequestEPvNSt3__18functionIFvS0_EEE
71-
_ZN10sourcekitd17initializeServiceEN4llvm9StringRefES1_NSt3__18functionIFvPvEEE
72-
_ZN10sourcekitd24createErrorRequestFailedEN4llvm9StringRefE
73-
_ZN9SourceKit6Logger12LoggingLevelE
74-
_ZN9SourceKit6LoggerD1Ev
75-
_ZN9SourceKit6UIdent6setTagEPv
76-
_ZN9SourceKit6UIdentC1EN4llvm9StringRefE
77-
_ZN9SourceKit9WorkQueue4Impl12dispatchSyncEPvRKNS0_12DispatchDataE
78-
_ZN9SourceKit9WorkQueue4Impl15dispatchBarrierEPvRKNS0_12DispatchDataE
79-
_ZN9SourceKit9WorkQueue4Impl6createENS0_9DequeuingENS0_8PriorityEN4llvm9StringRefE
80-
_ZN9SourceKit9WorkQueue4Impl7releaseEPv
81-
_ZNK9SourceKit6UIdent5c_strEv
82-
_ZNK9SourceKit6UIdent6getTagEv

0 commit comments

Comments
 (0)