tag b650f115661ac9ea1f38a38239e944f2bf64b508
tagger Swift Automation <swift_jenkins@apple.com> Mon Apr 25 23:53:38 2016 -0500
object 81d0486fb27da529eaec9bc42e403261517f03f1

Tag build swift-2.2.1-SNAPSHOT-2016-04-23-a

commit 81d0486fb27da529eaec9bc42e403261517f03f1
author Devin Coughlin <dcoughlin@apple.com> Fri Apr 01 03:24:13 2016 +0000
committer Devin Coughlin <dcoughlin@apple.com> Fri Apr 01 10:18:41 2016 -0700
tree 90ccde2f0a67f12f4066f66e06fc106a39b6bb48
parent b57d2f9f38a8610527d243df550cfbdc44e38660

[analyzer] Prefer accessor method in extension over category in CallEvent.

In ObjCMethodCall:getRuntimeDefinition(), if the method is an accessor in a
category, and it doesn't have a self declaration, first try to find the method
in a class extension. This works around a bug in Sema where multiple accessors
are synthesized for properties in class extensions that are redeclared in a
category. The implicit parameters are not filled in for the method on the
category, which causes a crash when trying to synthesize a getter for the
property in BodyFarm. The Sema bug is tracked as rdar://problem/25481164.

rdar://problem/25056531

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@265103 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 9a9ef84ee01c50e33dd065bb549a030b79c61beb)

Resolved a conflict in test/Analysis/properties.m and pulled in an extra test.