<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">2013/8/22 David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank" class="cremed">dblaikie@gmail.com</a>></span><br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class="im">On Wed, Aug 21, 2013 at 10:33 AM, Timur Iskhodzhanov<br>
<<a href="mailto:timurrrr@google.com" class="cremed">timurrrr@google.com</a>> wrote:<br>
> Author: timurrrr<br>
> Date: Wed Aug 21 12:33:16 2013<br>
> New Revision: 188909<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=188909&view=rev" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project?rev=188909&view=rev</a><br>
> Log:<br>
> [CGF] Get rid of passing redundant VTable pointer around in CodeGenFunction::InitializeVTablePointer[s]<br>
<br>
</div>Strangely, this appears to have regressed debug info (probably based<br>
on a debug info feature I implemented over the weekend).<br>
<br>
<a href="http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/8031" target="_blank" class="cremed">http://lab.llvm.org:8011/builders/clang-x86_64-ubuntu-gdb-75/builds/8031</a><br>
<br>
I don't really know how your change connects to this, but I'll<br>
investigate, etc - no action required on your part, just wanted to<br>
note it down here in case anyone was looking at the bots, seeing weird<br>
debug info, etc.</blockquote><div> </div><div>Ouch, check-all doesn't detect that...</div><div>Thanks for taking this!</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class=""><div class="h5">
><br>
> Modified:<br>
> cfe/trunk/lib/CodeGen/CGClass.cpp<br>
> cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
><br>
> Modified: cfe/trunk/lib/CodeGen/CGClass.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=188909&r1=188908&r2=188909&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGClass.cpp?rev=188909&r1=188908&r2=188909&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/CodeGen/CGClass.cpp (original)<br>
> +++ cfe/trunk/lib/CodeGen/CGClass.cpp Wed Aug 21 12:33:16 2013<br>
> @@ -1852,7 +1852,6 @@ void<br>
> CodeGenFunction::InitializeVTablePointer(BaseSubobject Base,<br>
> const CXXRecordDecl *NearestVBase,<br>
> CharUnits OffsetFromNearestVBase,<br>
> - llvm::Constant *VTable,<br>
> const CXXRecordDecl *VTableClass) {<br>
> const CXXRecordDecl *RD = Base.getBase();<br>
><br>
> @@ -1875,6 +1874,7 @@ CodeGenFunction::InitializeVTablePointer<br>
> // And load the address point from the VTT.<br>
> VTableAddressPoint = Builder.CreateLoad(VTT);<br>
> } else {<br>
> + llvm::Constant *VTable = CGM.getVTables().GetAddrOfVTable(VTableClass);<br>
> uint64_t AddressPoint =<br>
> CGM.getVTableContext().getVTableLayout(VTableClass).getAddressPoint(Base);<br>
> VTableAddressPoint =<br>
> @@ -1919,7 +1919,6 @@ CodeGenFunction::InitializeVTablePointer<br>
> const CXXRecordDecl *NearestVBase,<br>
> CharUnits OffsetFromNearestVBase,<br>
> bool BaseIsNonVirtualPrimaryBase,<br>
> - llvm::Constant *VTable,<br>
> const CXXRecordDecl *VTableClass,<br>
> VisitedVirtualBasesSetTy& VBases) {<br>
> // If this base is a non-virtual primary base the address point has already<br>
> @@ -1927,7 +1926,7 @@ CodeGenFunction::InitializeVTablePointer<br>
> if (!BaseIsNonVirtualPrimaryBase) {<br>
> // Initialize the vtable pointer for this base.<br>
> InitializeVTablePointer(Base, NearestVBase, OffsetFromNearestVBase,<br>
> - VTable, VTableClass);<br>
> + VTableClass);<br>
> }<br>
><br>
> const CXXRecordDecl *RD = Base.getBase();<br>
> @@ -1970,7 +1969,7 @@ CodeGenFunction::InitializeVTablePointer<br>
> I->isVirtual() ? BaseDecl : NearestVBase,<br>
> BaseOffsetFromNearestVBase,<br>
> BaseDeclIsNonVirtualPrimaryBase,<br>
> - VTable, VTableClass, VBases);<br>
> + VTableClass, VBases);<br>
> }<br>
> }<br>
><br>
> @@ -1979,16 +1978,12 @@ void CodeGenFunction::InitializeVTablePo<br>
> if (!RD->isDynamicClass())<br>
> return;<br>
><br>
> - // Get the VTable.<br>
> - llvm::Constant *VTable = CGM.getVTables().GetAddrOfVTable(RD);<br>
> -<br></div></div></blockquote><div><br></div><div>You might consider adding</div><div><br></div><div> CGM.getVTables().GenerateClassData(RD);</div><div><br></div><div>here with a comment why it's needed.</div><div>
Writing a "check-clang" test is also encouraged :)</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class=""><div class="h5">
> // Initialize the vtable pointers for this class and all of its bases.<br>
> VisitedVirtualBasesSetTy VBases;<br>
> InitializeVTablePointers(BaseSubobject(RD, CharUnits::Zero()),<br>
> /*NearestVBase=*/0,<br>
> /*OffsetFromNearestVBase=*/CharUnits::Zero(),<br>
> - /*BaseIsNonVirtualPrimaryBase=*/false,<br>
> - VTable, RD, VBases);<br>
> + /*BaseIsNonVirtualPrimaryBase=*/false, RD, VBases);<br>
> }<br>
><br>
> llvm::Value *CodeGenFunction::GetVTablePtr(llvm::Value *This,<br>
><br>
> Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=188909&r1=188908&r2=188909&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=188909&r1=188908&r2=188909&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)<br>
> +++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Wed Aug 21 12:33:16 2013<br>
> @@ -1180,7 +1180,6 @@ public:<br>
> void InitializeVTablePointer(BaseSubobject Base,<br>
> const CXXRecordDecl *NearestVBase,<br>
> CharUnits OffsetFromNearestVBase,<br>
> - llvm::Constant *VTable,<br>
> const CXXRecordDecl *VTableClass);<br>
><br>
> typedef llvm::SmallPtrSet<const CXXRecordDecl *, 4> VisitedVirtualBasesSetTy;<br>
> @@ -1188,7 +1187,6 @@ public:<br>
> const CXXRecordDecl *NearestVBase,<br>
> CharUnits OffsetFromNearestVBase,<br>
> bool BaseIsNonVirtualPrimaryBase,<br>
> - llvm::Constant *VTable,<br>
> const CXXRecordDecl *VTableClass,<br>
> VisitedVirtualBasesSetTy& VBases);<br>
><br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu" class="cremed">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank" class="cremed">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>