Merge pull request #4040 from rudkx/fix-27671033

swift-ci · web-flow · commit 70ec679ee441 · 2016-08-05T02:00:22.000-07:00
diff --git a/test/decl/var/properties.swift b/test/decl/var/properties.swift
@@ -1133,6 +1133,13 @@ extension rdar17391625derived {
   }
 }
 
+// <rdar://problem/27671033> Crash when defining property inside an invalid extension
+public protocol rdar27671033P {}
+struct rdar27671033S<Key, Value> {}
+extension rdar27671033S : rdar27671033P where Key == String { // expected-error {{extension of type 'rdar27671033S' with constraints cannot have an inheritance clause}}
+  // expected-error@-1 {{same-type requirement makes generic parameter 'Key' non-generic}}
+  let d = rdar27671033S<Int, Int>() // expected-error {{extensions may not contain stored properties}}
+}
 
 // <rdar://problem/19874152> struct memberwise initializer violates new sanctity of previously set `let` property
 struct r19874152S1 {

Original file line number	Diff line number	Diff line change
`@@ -1133,6 +1133,13 @@ extension rdar17391625derived {`
`1133`	`1133`	`}`
`1134`	`1134`	`}`
`1135`	`1135`
	`1136`	`+// <rdar://problem/27671033> Crash when defining property inside an invalid extension`
	`1137`	`+public protocol rdar27671033P {}`
	`1138`	`+struct rdar27671033S<Key, Value> {}`
	`1139`	`+extension rdar27671033S : rdar27671033P where Key == String { // expected-error {{extension of type 'rdar27671033S' with constraints cannot have an inheritance clause}}`
	`1140`	`+ // expected-error@-1 {{same-type requirement makes generic parameter 'Key' non-generic}}`
	`1141`	`+ let d = rdar27671033S<Int, Int>() // expected-error {{extensions may not contain stored properties}}`
	`1142`	`+}`
`1136`	`1143`
`1137`	`1144`	// <rdar://problem/19874152> struct memberwise initializer violates new sanctity of previously set `let` property
`1138`	`1145`	`struct r19874152S1 {`