[sourcekitd] Fix some compiler warnings

* remove nullability attribute from a non-pointer argument
* const-correctness on custom buffer casts
* remove statically unreachable code
This commit is contained in:
Ben Langmuir
2018-04-19 14:20:51 -07:00
parent 1d66f0ab50
commit 0aa11cb6b2
3 changed files with 3 additions and 4 deletions

View File

@@ -865,7 +865,6 @@ static bool canonicalizeFilterName(const char *origName,
continue; continue;
} }
} }
llvm_unreachable("exit is on null byte");
} }
static void translateFilterRules(ArrayRef<FilterRule> rawFilterRules, static void translateFilterRules(ArrayRef<FilterRule> rawFilterRules,

View File

@@ -351,7 +351,7 @@ SOURCEKITD_PUBLIC SOURCEKITD_NONNULL1 SOURCEKITD_WARN_RESULT
sourcekitd_variant_t sourcekitd_variant_t
sourcekitd_response_get_value(sourcekitd_response_t resp); sourcekitd_response_get_value(sourcekitd_response_t resp);
SOURCEKITD_PUBLIC SOURCEKITD_NONNULL_ALL SOURCEKITD_WARN_RESULT SOURCEKITD_PUBLIC SOURCEKITD_WARN_RESULT
sourcekitd_variant_type_t sourcekitd_variant_type_t
sourcekitd_variant_get_type(sourcekitd_variant_t obj); sourcekitd_variant_get_type(sourcekitd_variant_t obj);

View File

@@ -583,9 +583,9 @@ sourcekitd_response_get_value(sourcekitd_response_t resp) {
#define XPC_OBJ(var) ((xpc_object_t)(var).data[1]) #define XPC_OBJ(var) ((xpc_object_t)(var).data[1])
#define CUSTOM_BUF_KIND(xobj) \ #define CUSTOM_BUF_KIND(xobj) \
((CustomBufferKind)*(uint64_t*)xpc_data_get_bytes_ptr(xobj)) ((CustomBufferKind)*(const uint64_t*)xpc_data_get_bytes_ptr(xobj))
#define CUSTOM_BUF_START(xobj) \ #define CUSTOM_BUF_START(xobj) \
((void*)(((uint64_t*)xpc_data_get_bytes_ptr(xobj))+1)) ((const void*)(((const uint64_t*)xpc_data_get_bytes_ptr(xobj))+1))
static sourcekitd_variant_type_t XPCVar_get_type(sourcekitd_variant_t var) { static sourcekitd_variant_type_t XPCVar_get_type(sourcekitd_variant_t var) {
xpc_object_t obj = XPC_OBJ(var); xpc_object_t obj = XPC_OBJ(var);