---

yaml
---
r: 348884
b: refs/heads/master
c: 3b9dbd5
h: refs/heads/master

Author: varungandhi-apple

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d4bafdf9fa3bc1668f581bfe5c223797abe5ad47
+refs/heads/master: 3b9dbd57c4eff1d5f56955b3692fdf681935a684
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/AST/Decl.cpp

@@ -4930,7 +4930,7 @@ getNameFromObjcAttribute(const ObjCAttr *attr, DeclName preferredName) {
 ObjCSelector
 AbstractStorageDecl::getObjCGetterSelector(Identifier preferredName) const {
   // If the getter has an @objc attribute with a name, use that.
-  if (auto getter = getParsedAccessor(AccessorKind::Get)) {
+  if (auto getter = getAccessor(AccessorKind::Get)) {
       if (auto name = getNameFromObjcAttribute(getter->getAttrs().
           getAttribute<ObjCAttr>(), preferredName))
         return *name;
@@ -4960,7 +4960,7 @@ AbstractStorageDecl::getObjCGetterSelector(Identifier preferredName) const {
 ObjCSelector
 AbstractStorageDecl::getObjCSetterSelector(Identifier preferredName) const {
   // If the setter has an @objc attribute with a name, use that.
-  auto setter = getParsedAccessor(AccessorKind::Set);
+  auto setter = getAccessor(AccessorKind::Set);
   auto objcAttr = setter ? setter->getAttrs().getAttribute<ObjCAttr>()
                          : nullptr;
   if (auto name = getNameFromObjcAttribute(objcAttr, DeclName(preferredName))) {

trunk/test/PrintAsObjC/getter_setter.swift

@@ -12,15 +12,14 @@ import Foundation
 // written in Objective-C.
 public final class Saiyan: NSObject, PowerProtocol {
   public var level: Int64
-  // FIXME: The getter and setter names should show up here.
-  // HEADER: @property (nonatomic) int64_t level;
+  // HEADER: @property (nonatomic, getter=getPower, setter=setPower:) int64_t level;
   // IRCHECK1: METACLASS_DATA__TtC13getter_setter6Saiyan
-  // IRCHECK1-NOT: selector_data(getPower)
-  // IRCHECK1-NOT: selector_data(setPower:)
+  // IRCHECK1: selector_data(getPower)
+  // IRCHECK1: selector_data(setPower:)
   // IRCHECK1: INSTANCE_METHODS__TtC13getter_setter6Saiyan
   // IRCHECK2: METACLASS_DATA__TtC13getter_setter6Saiyan
-  // IRCHECK2: selector_data(level)
-  // IRCHECK2: selector_data(setLevel:)
+  // IRCHECK2-NOT: selector_data(level)
+  // IRCHECK2-NOT: selector_data(setLevel:)
   // IRCHECK2: INSTANCE_METHODS__TtC13getter_setter6Saiyan
   public override init() {
     level = 9001