Fix warnings about sending nullable pointers to non-null APIs.

johnstiles-google · SkCQ · commit e238cde8581d · 2023-02-09T18:41:46.000Z
Using the latest Xcode 14.2, these calls were generating warnings. (It's a valid report; if the buffer we send is not UTF-8, -init will in fact return null.) Explicitly casting the pointers to _Nonnull works around it; I also added proper null checks. Change-Id: I54d6c7e6b1b9728d522084250044f2f1f5cbb16b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/641056 Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com> Commit-Queue: John Stiles <johnstiles@google.com>
diff --git a/src/gpu/ganesh/mtl/GrMtlUtil.mm b/src/gpu/ganesh/mtl/GrMtlUtil.mm
@@ -100,10 +100,13 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
                                          const std::string& msl,
                                          GrContextOptions::ShaderErrorHandler* errorHandler) {
     TRACE_EVENT0("skia.shaders", "driver_compile_shader");
-    auto nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
-                                                   length:msl.size()
-                                                 encoding:NSUTF8StringEncoding
-                                             freeWhenDone:NO];
+    NSString* nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
+                                                        length:msl.size()
+                                                      encoding:NSUTF8StringEncoding
+                                                  freeWhenDone:NO];
+    if (!nsSource) {
+        return nil;
+    }
     MTLCompileOptions* options = [[MTLCompileOptions alloc] init];
     // array<> is supported in MSL 2.0 on MacOS 10.13+ and iOS 11+,
     // and in MSL 1.2 on iOS 10+ (but not MacOS).
@@ -119,11 +122,12 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
     NSError* error = nil;
     id<MTLLibrary> compiledLibrary;
     if (@available(macOS 10.15, *)) {
-        compiledLibrary = [gpu->device() newLibraryWithSource:nsSource
+        compiledLibrary = [gpu->device() newLibraryWithSource:(NSString* _Nonnull)nsSource
                                                       options:options
                                                         error:&error];
     } else {
-        compiledLibrary = GrMtlNewLibraryWithSource(gpu->device(), nsSource, options, &error);
+        compiledLibrary = GrMtlNewLibraryWithSource(gpu->device(), (NSString* _Nonnull)nsSource,
+                                                    options, &error);
     }
     if (!compiledLibrary) {
         errorHandler->compileError(msl.c_str(), error.debugDescription.UTF8String);
@@ -135,15 +139,17 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
 
 void GrPrecompileMtlShaderLibrary(const GrMtlGpu* gpu,
                                   const std::string& msl) {
-    auto nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
-                                                   length:msl.size()
-                                                 encoding:NSUTF8StringEncoding
-                                             freeWhenDone:NO];
+    NSString* nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
+                                                        length:msl.size()
+                                                      encoding:NSUTF8StringEncoding
+                                                  freeWhenDone:NO];
+    if (!nsSource) {
+        return;
+    }
     // Do nothing after completion for now.
     // TODO: cache the result somewhere so we can use it later.
-    MTLNewLibraryCompletionHandler completionHandler =
-            ^(id<MTLLibrary> library, NSError* error) {};
-    [gpu->device() newLibraryWithSource:nsSource
+    MTLNewLibraryCompletionHandler completionHandler = ^(id<MTLLibrary> library, NSError* error) {};
+    [gpu->device() newLibraryWithSource:(NSString* _Nonnull)nsSource
                                 options:nil
                       completionHandler:completionHandler];
 }
diff --git a/src/gpu/graphite/mtl/MtlUtils.mm b/src/gpu/graphite/mtl/MtlUtils.mm
@@ -148,10 +148,13 @@ bool SkSLToMSL(SkSL::Compiler* compiler,
                                                const std::string& msl,
                                                ShaderErrorHandler* errorHandler) {
     TRACE_EVENT0("skia.shaders", "driver_compile_shader");
-    auto nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
-                                                   length:msl.size()
-                                                 encoding:NSUTF8StringEncoding
-                                             freeWhenDone:NO];
+    NSString* nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
+                                                        length:msl.size()
+                                                      encoding:NSUTF8StringEncoding
+                                                  freeWhenDone:NO];
+    if (!nsSource) {
+        return nil;
+    }
     MTLCompileOptions* options = [[MTLCompileOptions alloc] init];
     // array<> is supported in MSL 2.0 on MacOS 10.13+ and iOS 11+,
     // and in MSL 1.2 on iOS 10+ (but not MacOS).
@@ -165,9 +168,10 @@ bool SkSLToMSL(SkSL::Compiler* compiler,
 
     NSError* error = nil;
     // TODO: do we need a version with a timeout?
-    sk_cfp<id<MTLLibrary>> compiledLibrary([sharedContext->device() newLibraryWithSource:nsSource
-                                                                                 options:options
-                                                                                   error:&error]);
+    sk_cfp<id<MTLLibrary>> compiledLibrary(
+            [sharedContext->device() newLibraryWithSource:(NSString* _Nonnull)nsSource
+                                                  options:options
+                                                    error:&error]);
     if (!compiledLibrary) {
         errorHandler->compileError(msl.c_str(), error.debugDescription.UTF8String);
         return nil;
