提交 99a453d9 编写于 作者: I iveresov

Merge

...@@ -303,12 +303,12 @@ public class ClassWriter implements /* imports */ ClassConstants ...@@ -303,12 +303,12 @@ public class ClassWriter implements /* imports */ ClassConstants
case JVM_CONSTANT_MethodHandle: { case JVM_CONSTANT_MethodHandle: {
dos.writeByte(cpConstType); dos.writeByte(cpConstType);
int value = cpool.getIntAt(ci); int value = cpool.getIntAt(ci);
short bootstrapMethodIndex = (short) extractLowShortFromInt(value); byte refKind = (byte) extractLowShortFromInt(value);
short nameAndTypeIndex = (short) extractHighShortFromInt(value); short memberIndex = (short) extractHighShortFromInt(value);
dos.writeShort(bootstrapMethodIndex); dos.writeByte(refKind);
dos.writeShort(nameAndTypeIndex); dos.writeShort(memberIndex);
if (DEBUG) debugMessage("CP[" + ci + "] = indy BSM = " + if (DEBUG) debugMessage("CP[" + ci + "] = MH kind = " +
bootstrapMethodIndex + ", N&T = " + nameAndTypeIndex); refKind + ", mem = " + memberIndex);
break; break;
} }
......
...@@ -86,6 +86,7 @@ static inline uint64_t cast_uint64_t(size_t x) ...@@ -86,6 +86,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(constantPoolOopDesc, _tags, typeArrayOop) \ nonstatic_field(constantPoolOopDesc, _tags, typeArrayOop) \
nonstatic_field(constantPoolOopDesc, _cache, constantPoolCacheOop) \ nonstatic_field(constantPoolOopDesc, _cache, constantPoolCacheOop) \
nonstatic_field(constantPoolOopDesc, _pool_holder, klassOop) \ nonstatic_field(constantPoolOopDesc, _pool_holder, klassOop) \
nonstatic_field(constantPoolOopDesc, _operands, typeArrayOop) \
nonstatic_field(constantPoolOopDesc, _length, int) \ nonstatic_field(constantPoolOopDesc, _length, int) \
nonstatic_field(constantPoolCacheOopDesc, _length, int) \ nonstatic_field(constantPoolCacheOopDesc, _length, int) \
nonstatic_field(constantPoolCacheOopDesc, _constant_pool, constantPoolOop) \ nonstatic_field(constantPoolCacheOopDesc, _constant_pool, constantPoolOop) \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册