Skip to content

Commit 0680f71

Browse files
committed
---
yaml --- r: 278495 b: refs/heads/swift-5.1-old-llvm-branch c: 76c7b63 h: refs/heads/master i: 278493: bdd6382 278491: 2e5091c 278487: 377111a 278479: b7caa41 278463: 92fe4de
1 parent ec0a1b2 commit 0680f71

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-01-24-a: b6f62823aa5010b2ae53f15f72a57
12411241
refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e0
12421242
refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
12431243
refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
1244-
refs/heads/swift-5.1-old-llvm-branch: 202d52135d33c877f796f0c4ff9c171032cd82c0
1244+
refs/heads/swift-5.1-old-llvm-branch: 76c7b63fa494cdbdf76462f58f0cfe9c9b355de9
12451245
refs/heads/swift-5.1-branch: 8060872acb4105d9655e020fe047e1ebcd77d0fb
12461246
refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
12471247
refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e

branches/swift-5.1-old-llvm-branch/lib/Sema/ConstraintSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,7 +1791,7 @@ class CommonTypeVisitor : public TypeVisitor<CommonTypeVisitor, Type, Type> {
17911791
}
17921792

17931793
Type ConstraintSystem::findCommonResultType(ArrayRef<OverloadChoice> choices) {
1794-
// Local function to consider this s new overload choice, updating the
1794+
// Local function to consider this new overload choice, updating the
17951795
// "common type". Returns true if this overload cannot be integrated into
17961796
// the common type, at which point there is no "common type".
17971797
Type commonType;
@@ -1842,7 +1842,7 @@ Type ConstraintSystem::findCommonOverloadType(
18421842
ArrayRef<OverloadChoice> choices,
18431843
ArrayRef<OverloadChoice> outerAlternatives,
18441844
ConstraintLocator *locator) {
1845-
// Local function to consider this s new overload choice, updating the
1845+
// Local function to consider this new overload choice, updating the
18461846
// "common type". Returns true if this overload cannot be integrated into
18471847
// the common type, at which point there is no "common type".
18481848
Type commonType;

0 commit comments

Comments
 (0)