Mercurial > hg > truffle

comparison src/share/vm/opto/macro.cpp @ 4762:069ab3f976d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7118863: Move sizeof(klassOopDesc) into the *Klass::*_offset_in_bytes() functions Summary: Moved sizeof(klassOopDesc), changed the return type to ByteSize and removed the _in_bytes suffix. Reviewed-by: never, bdelsart, coleenp, jrose
author stefank
date Wed, 07 Dec 2011 11:35:03 +0100
parents 1bd45abaa507
children 1dc233a8c7fe
comparison
equal deleted inserted replaced
4761:65149e74c706 4762:069ab3f976d3
1468 InitializeNode* init = alloc->initialization(); 1468 InitializeNode* init = alloc->initialization();
1469 // Store the klass & mark bits 1469 // Store the klass & mark bits
1470 Node* mark_node = NULL; 1470 Node* mark_node = NULL;
1471 // For now only enable fast locking for non-array types 1471 // For now only enable fast locking for non-array types
1472 if (UseBiasedLocking && (length == NULL)) { 1472 if (UseBiasedLocking && (length == NULL)) {
1473 mark_node = make_load(control, rawmem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeRawPtr::BOTTOM, T_ADDRESS); 1473 mark_node = make_load(control, rawmem, klass_node, in_bytes(Klass::prototype_header_offset()), TypeRawPtr::BOTTOM, T_ADDRESS);
1474 } else { 1474 } else {
1475 mark_node = makecon(TypeRawPtr::make((address)markOopDesc::prototype())); 1475 mark_node = makecon(TypeRawPtr::make((address)markOopDesc::prototype()));
1476 } 1476 }
1477 rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, T_ADDRESS); 1477 rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, T_ADDRESS);
1478 1478
1956 klass_node->in(1)->init_req(0, ctrl); 1956 klass_node->in(1)->init_req(0, ctrl);
1957 } else 1957 } else
1958 #endif 1958 #endif
1959 klass_node->init_req(0, ctrl); 1959 klass_node->init_req(0, ctrl);
1960 } 1960 }
1961 Node *proto_node = make_load(ctrl, mem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeX_X, TypeX_X->basic_type()); 1961 Node *proto_node = make_load(ctrl, mem, klass_node, in_bytes(Klass::prototype_header_offset()), TypeX_X, TypeX_X->basic_type());
1962 1962
1963 Node* thread = transform_later(new (C, 1) ThreadLocalNode()); 1963 Node* thread = transform_later(new (C, 1) ThreadLocalNode());
1964 Node* cast_thread = transform_later(new (C, 2) CastP2XNode(ctrl, thread)); 1964 Node* cast_thread = transform_later(new (C, 2) CastP2XNode(ctrl, thread));
1965 Node* o_node = transform_later(new (C, 3) OrXNode(cast_thread, proto_node)); 1965 Node* o_node = transform_later(new (C, 3) OrXNode(cast_thread, proto_node));
1966 Node* x_node = transform_later(new (C, 3) XorXNode(o_node, mark_node)); 1966 Node* x_node = transform_later(new (C, 3) XorXNode(o_node, mark_node));