r182176 - ObjC Debug Info: Emit the correct method names for accessors for

[David Blaikie]

On Fri, May 17, 2013 at 4:49 PM, Adrian Prantl <aprantl at apple.com> wrote:

> Author: adrian
> Date: Fri May 17 18:49:10 2013
> New Revision: 182176
>
> URL: http://llvm.org/viewvc/llvm-project?rev=182176&view=rev
> Log:
> ObjC Debug Info: Emit the correct method names for accessors for
> properties declared in a protocol.
>
> rdar://problem/13798000
>
> Added:
>     cfe/trunk/test/CodeGenObjC/debuginfo-properties.m
> Modified:
>     cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
>
> Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=182176&r1=182175&r2=182176&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Fri May 17 18:49:10 2013
> @@ -161,6 +161,13 @@ StringRef CGDebugInfo::getObjCMethodName
>               dyn_cast<const ObjCCategoryImplDecl>(DC)){
>        OS << ((const NamedDecl *)OCD)->getIdentifier()->getNameStart() <<
> '(' <<
>            OCD->getIdentifier()->getNameStart() << ')';
> +  } else if (isa<const ObjCProtocolDecl>(DC)) {
>

You can drop the 'const' from the isa test.


> +    // We can extract the type of the class from the self pointer.
> +    if (ImplicitParamDecl* SelfDecl = OMD->getSelfDecl()) {
> +      QualType ClassTy =
> +
>  cast<ObjCObjectPointerType>(SelfDecl->getType())->getPointeeType();
> +      ClassTy.print(OS, PrintingPolicy(LangOptions()));
>

Might be nice to add an overload (or default argument) for print - or maybe
even an op<< for the stream.


> +    }
>    }
>    OS << ' ' << OMD->getSelector().getAsString() << ']';
>
>
> Added: cfe/trunk/test/CodeGenObjC/debuginfo-properties.m
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/debuginfo-properties.m?rev=182176&view=auto
>
> ==============================================================================
> --- cfe/trunk/test/CodeGenObjC/debuginfo-properties.m (added)
> +++ cfe/trunk/test/CodeGenObjC/debuginfo-properties.m Fri May 17 18:49:10
> 2013
> @@ -0,0 +1,35 @@
> +// RUN: %clang_cc1 -g -emit-llvm -triple x86_64-apple-darwin -o - %s |
> FileCheck %s
> +// Check that we emit the correct method names for properties from a
> protocol.
> +// rdar://problem/13798000
> + at protocol NSObject
> +- (id)init;
> + at end
> + at interface NSObject <NSObject> {}
> + at end
> +
> + at class Selection;
> +
> + at protocol HasASelection <NSObject>
> + at property (nonatomic, retain) Selection* selection;
> +// CHECK: [ DW_TAG_subprogram ] [line [[@LINE-1]]] [local] [def]
> [-[MyClass selection]]
> +// CHECK: [ DW_TAG_subprogram ] [line [[@LINE-2]]] [local] [def]
> [-[MyClass setSelection:]]
> +// CHECK: [ DW_TAG_subprogram ] [line [[@LINE-3]]] [local] [def]
> [-[OtherClass selection]]
> +// CHECK: [ DW_TAG_subprogram ] [line [[@LINE-4]]] [local] [def]
> [-[OtherClass setSelection:]]
> + at end
> +
> + at interface MyClass : NSObject <HasASelection> {
> +  Selection *_selection;
> +}
> + at end
> +
> + at implementation MyClass
> + at synthesize selection = _selection;
> + at end
> +
> + at interface OtherClass : NSObject <HasASelection> {
> +  Selection *_selection;
> +}
> + at end
> + at implementation OtherClass
> + at synthesize selection = _selection;
> + at end
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130517/e671dcd4/attachment.html>