Merge pull request #14385 from DougGregor/conformance-location-sr-6839

Author: swift-ci

CHANGELOG.md

@@ -33,7 +33,7 @@ Swift 5.0
 
 	Runtime query of conditional conformances is now implemented. Therefore,
 	a dynamic cast such as `value as? P`, where the dynamic type of `value`
-	conditional conforms to `P`, will succeed when the conditional
+	conditionally conforms to `P`, will succeed when the conditional
 	requirements are met.
 
 Swift 4.1

include/swift/AST/DeclContext.h

@@ -120,8 +120,8 @@ enum class LocalDeclContextKind : uint8_t {
 ///
 /// The enumerators are ordered in terms of decreasing preference:
 /// an inherited conformance is best, followed by explicit
-/// conformances, then implied conformances. Earlier conformance
-/// kinds supersede later conformance kinds, possibly with a
+/// conformances, then synthesized and implied conformances. Earlier
+/// conformance kinds supersede later conformance kinds, possibly with a
 /// diagnostic (e.g., if an inherited conformance supersedes an
 /// explicit conformance).
 enum class ConformanceEntryKind : unsigned {
@@ -131,11 +131,11 @@ enum class ConformanceEntryKind : unsigned {
   /// Explicitly specified.
   Explicit,
 
-  /// Implied by an explicitly-specified conformance.
-  Implied,
-
   /// Implicitly synthesized.
   Synthesized,
+
+  /// Implied by an explicitly-specified conformance.
+  Implied,
 };
 
 /// Describes the kind of conformance lookup desired.

test/multifile/Inputs/protocol-conformance-sr6839-other.swift

@@ -0,0 +1,4 @@
+class EnumValueConstructor<EnumType : EnumValueType> where EnumType.RawValue : Hashable {}
+class _PositionRelation_GeneratedWrapperConstructor : EnumValueConstructor<_PositionRelation> {}
+extension _PositionRelation : EnumValueType {}
+protocol EnumValueType : RawRepresentable {}

test/multifile/protocol-conformance-sr6839.swift

@@ -0,0 +1,10 @@
+// RUN: %target-swift-frontend -emit-sil -module-name main -primary-file %s %S/Inputs/protocol-conformance-sr6839-other.swift | %FileCheck -check-prefix CHECK-FIRST %s
+// RUN: %target-swift-frontend -emit-sil -module-name main %s -primary-file %S/Inputs/protocol-conformance-sr6839-other.swift | %FileCheck -check-prefix CHECK-SECOND %s
+
+// We need to consistently pick where the witness table for _PositionRelation :
+// RawRepresentable goes.
+// CHECK-FIRST: sil_witness_table hidden _PositionRelation: RawRepresentable
+// CHECK-SECOND-NOT: sil_witness_table hidden _PositionRelation: RawRepresentable
+enum _PositionRelation: Int {
+  case before = 0
+}