Changeset 288510 in webkit

Timestamp:

Jan 24, 2022, 5:55:32 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r288105. rdar://problem/87656387

REGRESSION (r286603): rx::ProgramMtl::getSpecializedShader() leaks MTLFunctionConstantValues object due early return when an error occurs in ANGLE_TRY() macro
<​https://webkit.org/b/235281>
<rdar://problem/87656387>

Reviewed by Darin Adler.

• src/libANGLE/renderer/metal/ProgramMtl.mm: (rx::ProgramMtl::getSpecializedShader):
• Use mtl::AutoObjCObj<> to release MTLFunctionConstantValues object on early return.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@288105 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/libANGLE/renderer/metal/ProgramMtl.mm (modified) (4 diffs)

branches/safari-613-branch/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2022-01-24  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r288105. rdar://problem/87656387
+
+    REGRESSION (r286603): rx::ProgramMtl::getSpecializedShader() leaks MTLFunctionConstantValues object due early return when an error occurs in ANGLE_TRY() macro
+    <https://webkit.org/b/235281>
+    <rdar://problem/87656387>
+    
+    Reviewed by Darin Adler.
+    
+    * src/libANGLE/renderer/metal/ProgramMtl.mm:
+    (rx::ProgramMtl::getSpecializedShader):
+    - Use mtl::AutoObjCObj<> to release MTLFunctionConstantValues
+      object on early return.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-01-17  David Kilzer  <ddkilzer@apple.com>
+
+            REGRESSION (r286603): rx::ProgramMtl::getSpecializedShader() leaks MTLFunctionConstantValues object due early return when an error occurs in ANGLE_TRY() macro
+            <https://webkit.org/b/235281>
+            <rdar://problem/87656387>
+
+            Reviewed by Darin Adler.
+
+            * src/libANGLE/renderer/metal/ProgramMtl.mm:
+            (rx::ProgramMtl::getSpecializedShader):
+            - Use mtl::AutoObjCObj<> to release MTLFunctionConstantValues
+              object on early return.
+
 2022-01-24  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ProgramMtl.mm

@@ -590 +590 @@
     mtl::TranslatedShaderInfo *translatedMslInfo = &mMslShaderTranslateInfo[shaderType];
     ProgramShaderObjVariantMtl *shaderVariant;
-    MTLFunctionConstantValues *funcConstants = nil;
+    mtl::AutoObjCObj<MTLFunctionConstantValues> funcConstants;
 
     if (shaderType == gl::ShaderType::Vertex)
@@ -640 +640 @@
             }
 
-            funcConstants = [[MTLFunctionConstantValues alloc] init];
+            funcConstants = mtl::adoptObjCObj([[MTLFunctionConstantValues alloc] init]);
             [funcConstants setConstantValue:&emulateDiscard
                                        type:MTLDataTypeBool
@@ -676 +676 @@
             }
 
-            funcConstants = [[MTLFunctionConstantValues alloc] init];
+            funcConstants = mtl::adoptObjCObj([[MTLFunctionConstantValues alloc] init]);
             [funcConstants setConstantValue:&emulateCoverageMask
                                        type:MTLDataTypeBool
@@ -696 +696 @@
                     type:MTLDataTypeBool
                 withName:@"ANGLEUseSampleCompareLod"];
+
     // Create Metal shader object
     ANGLE_MTL_OBJC_SCOPE
     {
         ANGLE_TRY(CreateMslShader(context, translatedMslInfo->metalLibrary, SHADER_ENTRY_NAME,
-                                  funcConstants, &shaderVariant->metalShader));
-        [funcConstants ANGLE_MTL_AUTORELEASE];
+                                  funcConstants.get(), &shaderVariant->metalShader));
     }