Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Mon Nov 03 10:17:24 2014 -0800 +++ b/src/share/vm/runtime/deoptimization.cpp Mon Nov 03 10:31:39 2014 -0800 @@ -915,7 +915,7 @@ } // Restore fields of an eliminated instance object using the same field order -// returned by HotSpotResolvedObjectType.getInstanceFields(true) +// returned by HotSpotResolvedObjectTypeImpl.getInstanceFields(true) static int reassign_fields_by_klass(InstanceKlass* klass, frame* fr, RegisterMap* reg_map, ObjectValue* sv, int svIndex, oop obj) { if (klass->superklass() != NULL) { svIndex = reassign_fields_by_klass(klass->superklass(), fr, reg_map, sv, svIndex, obj);