Code tree search structs refactor + lazily expanded flat terms #543
Conversation
…ng version in term code trees
Indexing/CodeTree.cpp
Outdated
| @@ -35,6 +35,9 @@ | |||
| namespace Indexing | |||
| { | |||
|
|
|||
| #define GET_CONTAINING_OBJECT(ContainingClass,MemberField,object) \ | |||
| reinterpret_cast<ContainingClass*>(reinterpret_cast<size_t>(object)-offsetof(ContainingClass,MemberField)) | |||
There was a problem hiding this comment.
This looks dubious to me as I don't think size_t is guaranteed to be big enough. What I think you want to do it cast to char * and then do the arithmetic on that.
There was a problem hiding this comment.
You're right, this is also implemented on Linux. The main problem is with char* we need to const_cast as well, because it is called with both const and non-const arguments. Let me know which one do you think is better.
There was a problem hiding this comment.
Two macros, one for each case? Could also then be static_cast, I think.
mezpusz
force-pushed
the
code-tree-refactor
branch
from
3984a05
to
e0a6b0c
Compare
|
Thanks for the fixes/improvements, @mezpusz! I'm happy apart from the |
|
No new assertion violations and slightly improves performance. I think it's ready to go! |
|
OK! I'll wait to see how/if @mezpusz wants to fix |
Two main changes in this pull request:
CodeTree::SearchStructis refactored avoiding duplication of subclasses. Raw array containing value-target pairs is replaced with STL containers for better and easier handling.FUN_UNEXPANDEDtoFlatTermin which case only the tag, term pointer and number of subentries is filled out first. A call onFlatTerm::Entry::expandfills out the same entries for the arguments. The point is that we expand tha flat term lazily which in some cases would be a bottleneck when theFlatTermis not even used.Additionally, added some basic printing for code trees.