[cfe-commits] r102014 - /cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp
Daniel Dunbar
daniel at zuster.org
Wed Apr 21 12:10:49 PDT 2010
Author: ddunbar
Date: Wed Apr 21 14:10:49 2010
New Revision: 102014
URL: http://llvm.org/viewvc/llvm-project?rev=102014&view=rev
Log:
IRgen: Add checking that the LLVM and AST record layout offsets agree (for
non-bit-fields).
Modified:
cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp
Modified: cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp?rev=102014&r1=102013&r2=102014&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGRecordLayoutBuilder.cpp Wed Apr 21 14:10:49 2010
@@ -20,6 +20,7 @@
#include "CodeGenTypes.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Type.h"
+#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetData.h"
using namespace clang;
@@ -569,7 +570,25 @@
getTargetData().getTypeAllocSize(Ty) &&
"Type size mismatch!");
- // FIXME: We should verify the individual field offsets here as well.
+ // Verify that the LLVM and AST field offsets agree.
+#ifndef NDEBUG
+ const llvm::StructType *ST =
+ dyn_cast<llvm::StructType>(RL->getLLVMType());
+ const llvm::StructLayout *SL = getTargetData().getStructLayout(ST);
+
+ const ASTRecordLayout &AST_RL = getContext().getASTRecordLayout(D);
+ RecordDecl::field_iterator it = D->field_begin();
+ for (unsigned i = 0, e = AST_RL.getFieldCount(); i != e; ++i, ++it) {
+ const FieldDecl *FD = *it;
+ if (FD->isBitField()) {
+ // FIXME: Verify assorted things.
+ } else {
+ unsigned FieldNo = RL->getLLVMFieldNo(FD);
+ assert(AST_RL.getFieldOffset(i) == SL->getElementOffsetInBits(FieldNo) &&
+ "Invalid field offset!");
+ }
+ }
+#endif
return RL;
}
More information about the cfe-commits
mailing list