commit 610f184fd932ded1756fb9a117fb692382c8d37d
author Corentin Wallez <cwallez@chromium.org> Mon Nov 15 17:34:14 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 15 17:34:14 2021 +0000
tree 7771b9f78f6b6f0d225cc3930bcd26f572d72a1b
parent 3e9f30411c0dabb8c708b0b4e4f1821023b61f8a

Add a guard for MTLDevice.counterSets being null.

This is a tentative fix for a segfault that's happening on
metal::Adapter initialization on some systems.

Bug: dawn:1102
Change-Id: Iff31e46420e60cd76ecbbfa92bd5b5906ca89cf4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/69340
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/metal/BackendMTL.mm

diff --git a/src/dawn_native/metal/BackendMTL.mm b/src/dawn_native/metal/BackendMTL.mm
index ccbc467..9475020 100644
--- a/src/dawn_native/metal/BackendMTL.mm
+++ b/src/dawn_native/metal/BackendMTL.mm
@@ -194,10 +194,12 @@
             // MTLDevice’s counterSets property declares which counter sets it supports. Check
             // whether it's available on the device before requesting a counter set.
             id<MTLCounterSet> counterSet = nil;
-            for (id<MTLCounterSet> set in device.counterSets) {
-                if ([set.name caseInsensitiveCompare:counterSetName] == NSOrderedSame) {
-                    counterSet = set;
-                    break;
+            if (device.counterSets != nil) {
+                for (id<MTLCounterSet> set in device.counterSets) {
+                    if ([set.name caseInsensitiveCompare:counterSetName] == NSOrderedSame) {
+                        counterSet = set;
+                        break;
+                    }
                 }
             }