Merge remote-tracking branch 'origin/master' into master-rebranch

swift-ci · swift-ci · commit 29ca77ebcb07 · 2019-08-09T09:43:42.000-07:00
diff --git a/lib/IDE/IDERequests.cpp b/lib/IDE/IDERequests.cpp
@@ -111,9 +111,8 @@ bool CursorInfoResolver::tryResolve(ValueDecl *D, TypeDecl *CtorTyRef,
     // Handle references to the implicitly generated vars in case statements
     // matching multiple patterns
     if (VD->isImplicit()) {
-      if (auto * Parent = VD->getParentVarDecl()) {
+      if (auto *Parent = VD->getParentVarDecl()) {
         D = Parent;
-        VD = Parent;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,8 @@ bool CursorInfoResolver::tryResolve(ValueDecl D, TypeDecl CtorTyRef,`
`111`	`111`	`// Handle references to the implicitly generated vars in case statements`
`112`	`112`	`// matching multiple patterns`
`113`	`113`	`if (VD->isImplicit()) {`
`114`		`- if (auto * Parent = VD->getParentVarDecl()) {`
	`114`	`+ if (auto *Parent = VD->getParentVarDecl()) {`
`115`	`115`	`D = Parent;`
`116`		`- VD = Parent;`
`117`	`116`	`}`
`118`	`117`	`}`
`119`	`118`	`}`