---

yaml
---
r: 349245
b: refs/heads/master-next
c: 9182051
h: refs/heads/master
i:
  349243: 827a9da

Author: jckarter

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 8db900634dd7a671e2627883f02d449a1f85650e
+refs/heads/master-next: 9182051d34f267fadd2cf025f5fff520462e38e9
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/CSSimplify.cpp

@@ -837,20 +837,20 @@ class ArgumentFailureTracker : public MatchCallArgumentListener {
     const auto &param = Parameters[paramIdx];
 
     unsigned newArgIdx = Arguments.size();
-    auto argLoc =
+    auto *argLoc = CS.getConstraintLocator(
         Locator
             .withPathElement(LocatorPathElt::ApplyArgToParam(
                 newArgIdx, paramIdx, param.getParameterFlags()))
-            .withPathElement(LocatorPathElt::SynthesizedArgument(newArgIdx));
+            .withPathElement(LocatorPathElt::SynthesizedArgument(newArgIdx)));
 
-    auto *argType = CS.createTypeVariable(
-        CS.getConstraintLocator(argLoc),
-        TVO_CanBindToInOut | TVO_CanBindToLValue | TVO_CanBindToNoEscape);
+    auto *argType =
+        CS.createTypeVariable(argLoc, TVO_CanBindToInOut | TVO_CanBindToLValue |
+                                          TVO_CanBindToNoEscape);
 
     CS.recordHole(argType);
-    CS.addUnsolvedConstraint(Constraint::create(
-        CS, ConstraintKind::Defaultable, argType, CS.getASTContext().TheAnyType,
-        CS.getConstraintLocator(argLoc)));
+    CS.addUnsolvedConstraint(
+        Constraint::create(CS, ConstraintKind::Defaultable, argType,
+                           CS.getASTContext().TheAnyType, argLoc));
 
     Arguments.push_back(param.withType(argType));
     ++NumSynthesizedArgs;

branches/master-next/test/api-digester/Outputs/stability-stdlib-abi.asserts.additional.swift.expected

@@ -1,5 +1,3 @@
-Class _SwiftNSMutableArray is a new API without @available attribute
-Class _SwiftNativeNSMutableArray is a new API without @available attribute
 Func _collectReferencesInsideObject(_:) is a new API without @available attribute
 Func _loadDestroyTLSCounter() is a new API without @available attribute
 Protocol _RuntimeFunctionCountersStats is a new API without @available attribute

branches/master-next/test/api-digester/Outputs/stability-stdlib-abi.without.asserts.swift.expected

@@ -0,0 +1,2 @@
+Class _SwiftNSMutableArray is a new API without @available attribute
+Class _SwiftNativeNSMutableArray is a new API without @available attribute