Optimizer: fix ModulePassContext.mangle(withDeadArguments:)

If mangled the wrong argument indices.

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/PassManager/ModulePassContext.swift

@@ -201,12 +201,8 @@ struct ModulePassContext : Context, CustomStringConvertible {
   }
 
   func mangle(withDeadArguments: [Int], from function: Function) -> String {
-    withDeadArguments.withUnsafeBufferPointer { bufPtr in
-      bufPtr.withMemoryRebound(to: Int.self) { valPtr in
-        String(taking: _bridged.mangleWithDeadArgs(valPtr.baseAddress,
-                                                   withDeadArguments.count,
-                                                   function.bridged))
-      }
+    withDeadArguments.withBridgedArrayRef { bridgedArgIndices in
+      String(taking: _bridged.mangleWithDeadArgs(bridgedArgIndices, function.bridged))
     }
   }
 

include/swift/SILOptimizer/OptimizerBridging.h

@@ -250,9 +250,7 @@ struct BridgedPassContext {
   bool specializeAppliesInFunction(BridgedFunction function, bool isMandatory) const;
   BridgedOwnedString mangleOutlinedVariable(BridgedFunction function) const;
   BridgedOwnedString mangleAsyncRemoved(BridgedFunction function) const;
-  BridgedOwnedString mangleWithDeadArgs(const SwiftInt * _Nullable deadArgs,
-                                                            SwiftInt numDeadArgs,
-                                                            BridgedFunction function) const;
+  BridgedOwnedString mangleWithDeadArgs(BridgedArrayRef bridgedDeadArgIndices, BridgedFunction function) const;
   BridgedOwnedString mangleWithClosureArgs(BridgedValueArray closureArgs,
                                                                BridgedArrayRef closureArgIndices,
                                                                BridgedFunction applySiteCallee) const;

lib/SILOptimizer/Utils/OptimizerBridging.cpp

@@ -290,14 +290,13 @@ BridgedOwnedString BridgedPassContext::mangleAsyncRemoved(BridgedFunction functi
   return BridgedOwnedString(Mangler.mangle());
 }
 
-BridgedOwnedString BridgedPassContext::mangleWithDeadArgs(const SwiftInt * _Nullable deadArgs,
-                                                          SwiftInt numDeadArgs,
+BridgedOwnedString BridgedPassContext::mangleWithDeadArgs(BridgedArrayRef bridgedDeadArgIndices,
                                                           BridgedFunction function) const {
   SILFunction *f = function.getFunction();
   Mangle::FunctionSignatureSpecializationMangler Mangler(f->getASTContext(),
       Demangle::SpecializationPass::FunctionSignatureOpts,
       f->getSerializedKind(), f);
-  for (SwiftInt idx = 0; idx < numDeadArgs; idx++) {
+  for (SwiftInt idx : bridgedDeadArgIndices.unbridged<SwiftInt>()) {
     Mangler.setArgumentDead((unsigned)idx);
   }
   return BridgedOwnedString(Mangler.mangle());

test/SILOptimizer/mandatory_performance_optimizations.sil

@@ -203,7 +203,7 @@ bb3:
 }
 
 // CHECK-LABEL: sil [no_locks] [perf_constraint] [ossa] @remove_metatype_arg :
-// CHECK:         [[F:%.*]] = function_ref @$s12metatype_argTf4dnn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> @owned Builtin.NativeObject
+// CHECK:         [[F:%.*]] = function_ref @$s12metatype_argTf4ndn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> @owned Builtin.NativeObject
 // CHECK:         [[A:%.*]] = apply [[F]](%0, %1) : $@convention(thin) (Int, @owned Builtin.NativeObject) -> @owned Builtin.NativeObject
 // CHECK:         return [[A]]
 // CHECK:       } // end sil function 'remove_metatype_arg'
@@ -223,7 +223,7 @@ bb0(%0 : $Int, %1 : $@thick Int.Type, %2 : @owned $Builtin.NativeObject):
 }
 
 // CHECK-LABEL: sil [no_locks] [perf_constraint] [ossa] @remove_metatype_arg_throws :
-// CHECK:         [[F:%.*]] = function_ref @$s19metatype_arg_throwsTf4dnn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> (@owned Builtin.NativeObject, @error any Error)
+// CHECK:         [[F:%.*]] = function_ref @$s19metatype_arg_throwsTf4ndn_n : $@convention(thin) (Int, @owned Builtin.NativeObject) -> (@owned Builtin.NativeObject, @error any Error)
 // CHECK:         try_apply [[F]](%0, %1) : $@convention(thin) (Int, @owned Builtin.NativeObject) -> (@owned Builtin.NativeObject, @error any Error), normal bb1, error bb2
 // CHECK:       bb1([[R:%.*]] : @owned $Builtin.NativeObject):
 // CHECK:         return [[R]]