[vmkit-commits] [vmkit] r198225 - Rename size() into structSize() to avoid any ambiguity

[Gael Thomas]

Author: gthomas
Date: Mon Dec 30 11:28:20 2013
New Revision: 198225

URL: http://llvm.org/viewvc/llvm-project?rev=198225&view=rev
Log:
Rename size() into structSize() to avoid any ambiguity

Modified:
    vmkit/branches/mcjit/include/j3/j3class.h
    vmkit/branches/mcjit/include/j3/j3meta.def
    vmkit/branches/mcjit/lib/j3/vm/j3class.cc
    vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
    vmkit/branches/mcjit/lib/j3/vm/j3object.cc

Modified: vmkit/branches/mcjit/include/j3/j3class.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3class.h?rev=198225&r1=198224&r2=198225&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3class.h (original)
+++ vmkit/branches/mcjit/include/j3/j3class.h Mon Dec 30 11:28:20 2013
@@ -196,13 +196,13 @@ namespace j3 {
 		size_t            _nbMethods;
 		J3Method**        _methods;
 
-		size_t             _size;
+		size_t             _structSize;
 	public:
 		J3Layout(J3ClassLoader* loader, const vmkit::Name* name);
 
 		virtual bool      isLayout() { return 1; }
 
-		size_t            size();
+		size_t            structSize();
 
 		size_t            nbMethods() { return _nbMethods; }
 		J3Method**        methods() { return _methods; }

Modified: vmkit/branches/mcjit/include/j3/j3meta.def
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3meta.def?rev=198225&r1=198224&r2=198225&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3meta.def (original)
+++ vmkit/branches/mcjit/include/j3/j3meta.def Mon Dec 30 11:28:20 2013
@@ -2,7 +2,7 @@ _x(funcJ3MethodIndex,            "j3::J3
 _x(funcJ3TypeVT,                 "j3::J3Type::vt()")
 _x(funcJ3TypeVTAndResolve,       "j3::J3Type::vtAndResolve()")
 _x(funcJ3TypeInitialise,         "j3::J3Type::initialise()")
-_x(funcJ3LayoutSize,             "j3::J3Layout::size()")
+_x(funcJ3LayoutStructSize,       "j3::J3Layout::structSize()")
 _x(funcJ3ClassStaticInstance,    "j3::J3Class::staticInstance()")
 _x(funcJ3ClassStringAt,          "j3::J3Class::stringAt(unsigned short)")
 _x(funcJ3ObjectTypeJavaClass,    "j3::J3ObjectType::javaClass()")

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=198225&r1=198224&r2=198225&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Mon Dec 30 11:28:20 2013
@@ -242,8 +242,8 @@ J3StaticLayout::J3StaticLayout(J3ClassLo
 J3Layout::J3Layout(J3ClassLoader* loader, const vmkit::Name* name) : J3ObjectType(loader, name) {
 }
 
-size_t J3Layout::size() { 
-	return _size; 
+size_t J3Layout::structSize() { 
+	return _structSize; 
 }
 
 J3Method* J3Layout::findMethod(const vmkit::Name* name, const vmkit::Name* sign) {
@@ -445,7 +445,7 @@ void J3Class::doResolve(J3Field* hiddenF
 
 		llvm::cast<llvm::StructType>(llvmType()->getContainedType(0))->setBody(virtualBody);
 
-		_size = loader()->vm()->dataLayout()->getTypeAllocSize(llvmType()->getContainedType(0));
+		_structSize = loader()->vm()->dataLayout()->getTypeAllocSize(llvmType()->getContainedType(0));
 			
 		staticLayout._vt = J3VirtualTable::create(&staticLayout);
 

Modified: vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc?rev=198225&r1=198224&r2=198225&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc Mon Dec 30 11:28:20 2013
@@ -511,9 +511,9 @@ void J3CodeGen::newObject(J3Class* cl) {
 	llvm::Value* size;
 
 	if(!cl->isResolved()) {
-		size = builder->CreateCall(funcJ3LayoutSize, builder->CreateBitCast(cl->llvmDescriptor(module()), vm->typeJ3LayoutPtr));
+		size = builder->CreateCall(funcJ3LayoutStructSize, builder->CreateBitCast(cl->llvmDescriptor(module()), vm->typeJ3LayoutPtr));
 	} else {
-		size = builder->getInt64(cl->size());
+		size = builder->getInt64(cl->structSize());
 	}
 
 	llvm::Value* res = builder->CreateCall2(funcJ3ObjectAllocate, vt(cl), size);

Modified: vmkit/branches/mcjit/lib/j3/vm/j3object.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3object.cc?rev=198225&r1=198224&r2=198225&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3object.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3object.cc Mon Dec 30 11:28:20 2013
@@ -280,7 +280,7 @@ J3Object* J3Object::allocate(J3VirtualTa
 }
 
 J3Object* J3Object::doNewNoInit(J3Class* cl) {
-	return allocate(cl->vtAndResolve(), cl->size());
+	return allocate(cl->vtAndResolve(), cl->structSize());
 }
 
 J3Object* J3Object::doNew(J3Class* cl) {