Merge pull request #14192 from apple/sema_cherrypick

Joe Shajrawi · web-flow · commit cf74460db8b4 · 2018-01-26T13:30:29.000-08:00
Merge pull request #14170 from shajrawi/buffix_class_offset2
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -1481,6 +1481,7 @@ namespace {
       }
       
       auto subscript = cast<SubscriptDecl>(choice.getDecl());
+      cs.TC.requestMemberLayout(subscript);
 
       auto &tc = cs.getTypeChecker();
       auto baseTy = cs.getType(base)->getRValueType();

Original file line number	Diff line number	Diff line change
`@@ -1481,6 +1481,7 @@ namespace {`
`1481`	`1481`	`}`
`1482`	`1482`
`1483`	`1483`	`auto subscript = cast<SubscriptDecl>(choice.getDecl());`
	`1484`	`+ cs.TC.requestMemberLayout(subscript);`
`1484`	`1485`
`1485`	`1486`	`auto &tc = cs.getTypeChecker();`
`1486`	`1487`	`auto baseTy = cs.getType(base)->getRValueType();`