diff options
author | Douglas Gregor <dgregor@apple.com> | 2010-04-28 22:16:22 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2010-04-28 22:16:22 +0000 |
commit | 882211c1da17254908e6b36d6e5d4e425f224347 (patch) | |
tree | f2f975514865d2ed37eac79a5e787fe5803a6432 /clang/tools/CIndex/CXCursor.cpp | |
parent | 0dec1e0d56c3bbccf7d61323fb2939f475ad9a0b (diff) | |
download | bcm5719-llvm-882211c1da17254908e6b36d6e5d4e425f224347.tar.gz bcm5719-llvm-882211c1da17254908e6b36d6e5d4e425f224347.zip |
Completely reimplement __builtin_offsetof, based on a patch by Roberto
Amadini.
This change introduces a new expression node type, OffsetOfExpr, that
describes __builtin_offsetof. Previously, __builtin_offsetof was
implemented using a unary operator whose subexpression involved
various synthesized array-subscript and member-reference expressions,
which was ugly and made it very hard to instantiate as a
template. OffsetOfExpr represents the AST more faithfully, with proper
type source information and a more compact representation.
OffsetOfExpr also has support for dependent __builtin_offsetof
expressions; it can be value-dependent, but will never be
type-dependent (like sizeof or alignof). This commit introduces
template instantiation for __builtin_offsetof as well.
There are two major caveats to this patch:
1) CodeGen cannot handle the case where __builtin_offsetof is not a
constant expression, so it produces an error. So, to avoid
regressing in C, we retain the old UnaryOperator-based
__builtin_offsetof implementation in C while using the shiny new
OffsetOfExpr implementation in C++. The old implementation can go
away once we have proper CodeGen support for this case, which we
expect won't cause much trouble in C++.
2) __builtin_offsetof doesn't work well with non-POD class types,
particularly when the designated field is found within a base
class. I will address this in a subsequent patch.
Fixes PR5880 and a bunch of assertions when building Boost.Python
tests.
llvm-svn: 102542
Diffstat (limited to 'clang/tools/CIndex/CXCursor.cpp')
-rw-r--r-- | clang/tools/CIndex/CXCursor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/tools/CIndex/CXCursor.cpp b/clang/tools/CIndex/CXCursor.cpp index 3bc5d01fbad..c8eb4823779 100644 --- a/clang/tools/CIndex/CXCursor.cpp +++ b/clang/tools/CIndex/CXCursor.cpp @@ -140,7 +140,8 @@ CXCursor cxcursor::MakeCXCursor(Stmt *S, Decl *Parent, ASTUnit *TU) { case Stmt::StringLiteralClass: case Stmt::CharacterLiteralClass: case Stmt::ParenExprClass: - case Stmt::UnaryOperatorClass: + case Stmt::UnaryOperatorClass: + case Stmt::OffsetOfExprClass: case Stmt::SizeOfAlignOfExprClass: case Stmt::ArraySubscriptExprClass: case Stmt::BinaryOperatorClass: |