[vmkit-commits] [vmkit] r198232 - round the parent size to uintptr_t

[Gael Thomas]

Author: gthomas
Date: Mon Dec 30 12:12:15 2013
New Revision: 198232

URL: http://llvm.org/viewvc/llvm-project?rev=198232&view=rev
Log:
round the parent size to uintptr_t

Modified:
    vmkit/branches/mcjit/lib/j3/vm/j3class.cc

Modified: vmkit/branches/mcjit/lib/j3/vm/j3class.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3class.cc?rev=198232&r1=198231&r2=198232&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Mon Dec 30 12:12:15 2013
@@ -448,10 +448,6 @@ void J3Class::doResolve(J3Field* hiddenF
 
 		llvm::cast<llvm::StructType>(llvmType()->getContainedType(0))->setBody(virtualBody);
 
-		uint64_t kkk = loader()->vm()->dataLayout()->getTypeAllocSize(llvmType()->getContainedType(0));
-		if(kkk != structSize())
-			J3::internalError(L"should not happen");
-			
 		staticLayout._vt = J3VirtualTable::create(&staticLayout);
 
 		_vt = J3VirtualTable::create(this);
@@ -596,14 +592,13 @@ void J3Class::readClassBytes(std::vector
 		_structSize = super()->structSize();
 	}
 
+	_structSize = ((_structSize - 1) & -sizeof(uintptr_t)) + sizeof(uintptr_t);
+
 	fillFields(&staticBody, virtualBody, pFields3, i3);
 	fillFields(&staticBody, virtualBody, pFields2, i2);
 	fillFields(&staticBody, virtualBody, pFields1, i1);
 	fillFields(&staticBody, virtualBody, pFields0, i0);
 
-	_structSize = ((_structSize - 1) & -sizeof(uintptr_t)) + sizeof(uintptr_t);
-	staticLayout._structSize = ((staticLayout._structSize - 1) & -sizeof(uintptr_t)) + sizeof(uintptr_t);
-
 	staticLLVMType()->getContainedType(0);
 
 	llvm::cast<llvm::StructType>(staticLLVMType()->getContainedType(0))->setBody(staticBody);