Skip to content

Commit 773cd93

Browse files
authored
Merge pull request #16042 from benlangmuir/sourcekitd-warnings
[sourcekitd] Fix some compiler warnings
2 parents df1ad0c + 0aa11cb commit 773cd93

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,6 @@ static bool canonicalizeFilterName(const char *origName,
865865
continue;
866866
}
867867
}
868-
llvm_unreachable("exit is on null byte");
869868
}
870869

871870
static void translateFilterRules(ArrayRef<FilterRule> rawFilterRules,

tools/SourceKit/tools/sourcekitd/include/sourcekitd/sourcekitd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ SOURCEKITD_PUBLIC SOURCEKITD_NONNULL1 SOURCEKITD_WARN_RESULT
351351
sourcekitd_variant_t
352352
sourcekitd_response_get_value(sourcekitd_response_t resp);
353353

354-
SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL SOURCEKITD_WARN_RESULT
354+
SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
355355
sourcekitd_variant_type_t
356356
sourcekitd_variant_get_type(sourcekitd_variant_t obj);
357357

tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-XPC.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,9 @@ sourcekitd_response_get_value(sourcekitd_response_t resp) {
583583
#define XPC_OBJ(var) ((xpc_object_t)(var).data[1])
584584

585585
#define CUSTOM_BUF_KIND(xobj) \
586-
((CustomBufferKind)*(uint64_t*)xpc_data_get_bytes_ptr(xobj))
586+
((CustomBufferKind)*(const uint64_t*)xpc_data_get_bytes_ptr(xobj))
587587
#define CUSTOM_BUF_START(xobj) \
588-
((void*)(((uint64_t*)xpc_data_get_bytes_ptr(xobj))+1))
588+
((const void*)(((const uint64_t*)xpc_data_get_bytes_ptr(xobj))+1))
589589

590590
static sourcekitd_variant_type_t XPCVar_get_type(sourcekitd_variant_t var) {
591591
xpc_object_t obj = XPC_OBJ(var);

0 commit comments

Comments
 (0)