<div dir="ltr">In r189521.<div><br></div><div>Thanks,</div><div>Manman</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Aug 28, 2013 at 2:31 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Wed, Aug 28, 2013 at 2:20 PM, Manman Ren <<a href="mailto:manman.ren@gmail.com">manman.ren@gmail.com</a>> wrote:<br>
> Author: mren<br>
> Date: Wed Aug 28 16:20:28 2013<br>
> New Revision: 189519<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=189519&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=189519&view=rev</a><br>
> Log:<br>
> Debug Info: update interface for CreateEnumType and getOrCreateRecordFwdDecl.<br>
><br>
> Both functions will take a Type pointer instead of a Decl pointer. This helps<br>
> with follow-up type uniquing patches, which need the Type pointer to call<br>
> CXX mangler to generate unique identifiers.<br>
><br>
> No functionality change.<br>
><br>
> Modified:<br>
> cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
> cfe/trunk/lib/CodeGen/CGDebugInfo.h<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=189519&r1=189518&r2=189519&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=189519&r1=189518&r2=189519&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
> +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Wed Aug 28 16:20:28 2013<br>
> @@ -601,8 +601,9 @@ llvm::DIType CGDebugInfo::CreateType(con<br>
><br>
> // Creates a forward declaration for a RecordDecl in the given context.<br>
> llvm::DICompositeType<br>
> -CGDebugInfo::getOrCreateRecordFwdDecl(const RecordDecl *RD,<br>
> +CGDebugInfo::getOrCreateRecordFwdDecl(const RecordType *Ty,<br>
> llvm::DIDescriptor Ctx) {<br>
> + const RecordDecl *RD = Ty->getDecl();<br>
> if (llvm::DIType T = getTypeOrNull(CGM.getContext().getRecordType(RD)))<br>
> return llvm::DICompositeType(T);<br>
> llvm::DIFile DefUnit = getOrCreateFile(RD->getLocation());<br>
> @@ -1472,7 +1473,7 @@ llvm::DIType CGDebugInfo::CreateType(con<br>
> (CXXDecl && CXXDecl->hasDefinition() && CXXDecl->isDynamicClass())) {<br>
> llvm::DIDescriptor FDContext =<br>
> getContextDescriptor(cast<Decl>(RD->getDeclContext()));<br>
> - llvm::DIType RetTy = getOrCreateRecordFwdDecl(RD, FDContext);<br>
> + llvm::DIType RetTy = getOrCreateRecordFwdDecl(Ty, FDContext);<br>
> // FIXME: This is conservatively correct. If we return a non-forward decl<br>
> // that's not a full definition (such as those created by<br>
> // createContextChain) then getOrCreateType will record is as a complete<br>
> @@ -1861,7 +1862,8 @@ llvm::DIType CGDebugInfo::CreateType(con<br>
> }<br>
><br>
> /// CreateEnumType - get enumeration type.<br>
> -llvm::DIType CGDebugInfo::CreateEnumType(const EnumDecl *ED) {<br>
> +llvm::DIType CGDebugInfo::CreateEnumType(const EnumType* Ty) {<br>
<br>
</div></div>'*' to the right, please<br>
<div class="HOEnZb"><div class="h5"><br>
> + const EnumDecl *ED = Ty->getDecl();<br>
> uint64_t Size = 0;<br>
> uint64_t Align = 0;<br>
> if (!ED->getTypeForDecl()->isIncompleteType()) {<br>
> @@ -2144,7 +2146,7 @@ llvm::DIType CGDebugInfo::CreateTypeNode<br>
> case Type::Record:<br>
> return CreateType(cast<RecordType>(Ty));<br>
> case Type::Enum:<br>
> - return CreateEnumType(cast<EnumType>(Ty)->getDecl());<br>
> + return CreateEnumType(cast<EnumType>(Ty));<br>
> case Type::FunctionProto:<br>
> case Type::FunctionNoProto:<br>
> return CreateType(cast<FunctionType>(Ty), Unit);<br>
> @@ -2249,7 +2251,7 @@ llvm::DICompositeType CGDebugInfo::Creat<br>
> // If this is just a forward declaration, construct an appropriately<br>
> // marked node and just return it.<br>
> if (!RD->getDefinition())<br>
> - return getOrCreateRecordFwdDecl(RD, RDContext);<br>
> + return getOrCreateRecordFwdDecl(Ty, RDContext);<br>
><br>
> uint64_t Size = CGM.getContext().getTypeSize(Ty);<br>
> uint64_t Align = CGM.getContext().getTypeAlign(Ty);<br>
><br>
> Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=189519&r1=189518&r2=189519&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=189519&r1=189518&r2=189519&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original)<br>
> +++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Wed Aug 28 16:20:28 2013<br>
> @@ -126,7 +126,7 @@ class CGDebugInfo {<br>
> llvm::DIType CreateType(const RValueReferenceType *Ty, llvm::DIFile Unit);<br>
> llvm::DIType CreateType(const MemberPointerType *Ty, llvm::DIFile F);<br>
> llvm::DIType CreateType(const AtomicType *Ty, llvm::DIFile F);<br>
> - llvm::DIType CreateEnumType(const EnumDecl *ED);<br>
> + llvm::DIType CreateEnumType(const EnumType *Ty);<br>
> llvm::DIType CreateSelfType(const QualType &QualTy, llvm::DIType Ty);<br>
> llvm::DIType getTypeOrNull(const QualType);<br>
> llvm::DIType getCompletedTypeOrNull(const QualType);<br>
> @@ -309,7 +309,7 @@ private:<br>
> llvm::DIScope getCurrentContextDescriptor(const Decl *Decl);<br>
><br>
> /// \brief Create a forward decl for a RecordType in a given context.<br>
> - llvm::DICompositeType getOrCreateRecordFwdDecl(const RecordDecl *,<br>
> + llvm::DICompositeType getOrCreateRecordFwdDecl(const RecordType *,<br>
> llvm::DIDescriptor);<br>
><br>
> /// createContextChain - Create a set of decls for the context chain.<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>
</div></div></blockquote></div><br></div>