On Tue, Oct 9, 2012 at 10:50 AM, Douglas Gregor <span dir="ltr"><<a href="mailto:dgregor@apple.com" target="_blank" class="cremed">dgregor@apple.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dgregor<br>
Date: Tue Oct 9 12:50:23 2012<br>
New Revision: 165515<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=165515&view=rev" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project?rev=165515&view=rev</a><br>
Log:<br>
Make the order of visitation of the pending bodies in the AST reader<br>
deterministic.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Serialization/ASTReader.h<br>
cfe/trunk/lib/Serialization/ASTReader.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Serialization/ASTReader.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTReader.h?rev=165515&r1=165514&r2=165515&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTReader.h?rev=165515&r1=165514&r2=165515&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Serialization/ASTReader.h (original)<br>
+++ cfe/trunk/include/clang/Serialization/ASTReader.h Tue Oct 9 12:50:23 2012<br>
@@ -33,6 +33,7 @@<br>
#include "llvm/ADT/APFloat.h"<br>
#include "llvm/ADT/APInt.h"<br>
#include "llvm/ADT/APSInt.h"<br>
+#include "llvm/ADT/MapVector.h"<br>
#include "llvm/ADT/OwningPtr.h"<br>
#include "llvm/ADT/SmallPtrSet.h"<br>
#include "llvm/ADT/SmallSet.h"<br>
@@ -342,8 +343,13 @@<br>
/// declarations that have not yet been linked to their definitions.<br>
llvm::SmallPtrSet<Decl *, 4> PendingDefinitions;<br>
<br>
+ typedef llvm::MapVector<Decl *, uint64_t,<br>
+ llvm::SmallDenseMap<Decl *, unsigned, 4>,<br></blockquote><div><br></div><div>I would expect the generated code to be slightly better with a map of <Decl *, uintptr_t> (or size_t, or some other pointer-sized entity). While in an ideal world, LLVM could figure this out, I wouldn't be surprised if having a 12-byte element with 16-byte alignment prevents initialization of the buckets from being a simple memset....</div>
<div><br></div><div>I wonder if we shouldn't make a SmallMapVector wrapper just to automate building this with optimal type pairs?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ llvm::SmallVector<std::pair<Decl *, uint64_t>, 4> ><br>
+ PendingBodiesMap;<br>
+<br>
/// \brief Functions or methods that have bodies that will be attached.<br>
- llvm::SmallDenseMap<Decl *, uint64_t, 4> PendingBodies;<br>
+ PendingBodiesMap PendingBodies;<br>
<br>
/// \brief Read the records that describe the contents of declcontexts.<br>
bool ReadDeclContextStorage(ModuleFile &M,<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=165515&r1=165514&r2=165515&view=diff" target="_blank" class="cremed">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=165515&r1=165514&r2=165515&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Tue Oct 9 12:50:23 2012<br>
@@ -6484,8 +6484,8 @@<br>
// Load the bodies of any functions or methods we've encountered. We do<br>
// this now (delayed) so that we can be sure that the declaration chains<br>
// have been fully wired up.<br>
- for (llvm::SmallDenseMap<Decl *, uint64_t, 4>::iterator<br>
- PB = PendingBodies.begin(), PBEnd = PendingBodies.end();<br>
+ for (PendingBodiesMap::iterator PB = PendingBodies.begin(),<br>
+ PBEnd = PendingBodies.end();<br>
PB != PBEnd; ++PB) {<br>
if (FunctionDecl *FD = dyn_cast<FunctionDecl>(PB->first)) {<br>
// FIXME: Check for =delete/=default?<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>
</blockquote></div><br></div>