comparison src/share/vm/runtime/deoptimization.cpp @ 18229:e04712c8928a

Merge
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Mon, 03 Nov 2014 10:31:39 -0800
parents 40074f6ac788 17c98fad6980
children 3ad5d7a6adb5
comparison
equal deleted inserted replaced
18228:ab489bac3bc8 18229:e04712c8928a
913 int compare(ReassignedField* left, ReassignedField* right) { 913 int compare(ReassignedField* left, ReassignedField* right) {
914 return left->_offset - right->_offset; 914 return left->_offset - right->_offset;
915 } 915 }
916 916
917 // Restore fields of an eliminated instance object using the same field order 917 // Restore fields of an eliminated instance object using the same field order
918 // returned by HotSpotResolvedObjectType.getInstanceFields(true) 918 // returned by HotSpotResolvedObjectTypeImpl.getInstanceFields(true)
919 static int reassign_fields_by_klass(InstanceKlass* klass, frame* fr, RegisterMap* reg_map, ObjectValue* sv, int svIndex, oop obj) { 919 static int reassign_fields_by_klass(InstanceKlass* klass, frame* fr, RegisterMap* reg_map, ObjectValue* sv, int svIndex, oop obj) {
920 if (klass->superklass() != NULL) { 920 if (klass->superklass() != NULL) {
921 svIndex = reassign_fields_by_klass(klass->superklass(), fr, reg_map, sv, svIndex, obj); 921 svIndex = reassign_fields_by_klass(klass->superklass(), fr, reg_map, sv, svIndex, obj);
922 } 922 }
923 923