<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 7, 2015 at 9:49 AM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Wed Jan  7 11:49:30 2015<br>
New Revision: 225359<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=225359&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=225359&view=rev</a><br>
Log:<br>
Debug info: pass in the correct size for a pointer to a member function.<br>
This corrects a bug I introduced in r224781.<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=225359&r1=225358&r2=225359&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=225359&r1=225358&r2=225359&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Wed Jan  7 11:49:30 2015<br>
@@ -1883,7 +1883,7 @@ llvm::DIType CGDebugInfo::CreateType(con<br>
   if (!Ty->getPointeeType()->isFunctionType())<br>
     return DBuilder.createMemberPointerType(<br>
       getOrCreateType(Ty->getPointeeType(), U), ClassType,<br>
-      CGM.PointerWidthInBits);<br>
+      CGM.getContext().getTypeSize(Ty));<br>
<br>
   const FunctionProtoType *FPT =<br>
       Ty->getPointeeType()->getAs<FunctionProtoType>();<br>
@@ -1891,7 +1891,7 @@ llvm::DIType CGDebugInfo::CreateType(con<br>
       getOrCreateInstanceMethodType(CGM.getContext().getPointerType(QualType(<br>
                                         Ty->getClass(), FPT->getTypeQuals())),<br>
                                     FPT, U),<br>
-      ClassType, CGM.PointerWidthInBits);<br>
+      ClassType, CGM.getContext().getTypeSize(Ty));<br></blockquote><div><br>Why two separate code changes? Does the test exercise both?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
 }<br>
<br>
 llvm::DIType CGDebugInfo::CreateType(const AtomicType *Ty, llvm::DIFile U) {<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp?rev=225359&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp?rev=225359&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/debug-info-ptr-to-member-function.cpp Wed Jan  7 11:49:30 2015<br>
@@ -0,0 +1,10 @@<br>
+// RUN: %clang_cc1 %s -triple x86_64-apple-darwin -g -emit-llvm -o - | FileCheck %s<br>
+<br>
+struct T {<br>
+  int method();<br>
+};<br>
+<br>
+void foo(int (T::*method)()) {}<br>
+<br>
+// A pointer to a member function is a pair of function- and this-pointer.<br>
+// CHECK: [ DW_TAG_ptr_to_member_type ] {{.*}} size 128<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>