[ABI] Fix encoding of new generic environments metadata.

DougGregor · DougGregor · commit b206bd610ad8 · 2018-11-16T10:13:06.000-08:00
A paste-o in GenericEnvironmentFlags meant we didn’t have well-formed
metadata.
diff --git a/include/swift/ABI/MetadataValues.h b/include/swift/ABI/MetadataValues.h
@@ -1530,7 +1530,7 @@ class GenericEnvironmentFlags {
 
   constexpr GenericEnvironmentFlags
   withNumGenericRequirements(uint16_t numGenericRequirements) const {
-    return GenericEnvironmentFlags((Value &~ NumGenericParameterLevelsMask)
+    return GenericEnvironmentFlags((Value &~ NumGenericRequirementsMask)
              | (numGenericRequirements << NumGenericRequirementsShift));
   }
 
diff --git a/test/IRGen/keypaths.sil b/test/IRGen/keypaths.sil
@@ -206,7 +206,7 @@ sil_vtable C2 {}
 // CHECK-64-SAME: i32 36 }>
 
 // CHECK-LABEL: @"generic environment SHRzSHR_r0_l" = linkonce_odr hidden constant
-// CHECK-SAME: i32 8192, i16 2, i8 -128, i8 -128, i32 128
+// CHECK-SAME: i32 8193, i16 2, i8 -128, i8 -128, i32 128
 
 // -- %t
 // CHECK: [[KP_T:@keypath(\..*)?]] = private global <{ {{.*}} }> <{ {{.*}} i32 1, {{.*}} @"got.$s8keypaths1GV1xxvpMV"

Original file line number	Diff line number	Diff line change
`@@ -1530,7 +1530,7 @@ class GenericEnvironmentFlags {`
`1530`	`1530`
`1531`	`1531`	`constexpr GenericEnvironmentFlags`
`1532`	`1532`	`withNumGenericRequirements(uint16_t numGenericRequirements) const {`
`1533`		`- return GenericEnvironmentFlags((Value &~ NumGenericParameterLevelsMask)`
	`1533`	`+ return GenericEnvironmentFlags((Value &~ NumGenericRequirementsMask)`
`1534`	`1534`	`\| (numGenericRequirements << NumGenericRequirementsShift));`
`1535`	`1535`	`}`
`1536`	`1536`