infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-04 20:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8286397: Address possibly lossy conversions in jdk.hotspot.agent

Browse Source 
Reviewed-by: cjplummer, chegar
This commit is contained in:
Ryan Ernst 2022-06-30 08:28:45 +00:00 committed by Chris Hegarty
parent 28c5e483a8
commit 7b5bd251ef
3 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
View File

@ -53,15 +53,15 @@ public class ObjectHeap {
public ObjectHeap(TypeDataBase db) throws WrongTypeException {
// Get commonly used sizes of basic types
oopSize = VM.getVM().getOopSize();
byteSize = db.getJByteType().getSize();
charSize = db.getJCharType().getSize();
booleanSize = db.getJBooleanType().getSize();
intSize = db.getJIntType().getSize();
shortSize = db.getJShortType().getSize();
longSize = db.getJLongType().getSize();
floatSize = db.getJFloatType().getSize();
doubleSize = db.getJDoubleType().getSize();
oopSize = (int) VM.getVM().getOopSize();
byteSize = (int) db.getJByteType().getSize();
charSize = (int) db.getJCharType().getSize();
booleanSize = (int) db.getJBooleanType().getSize();
intSize = (int) db.getJIntType().getSize();
shortSize = (int) db.getJShortType().getSize();
longSize = (int) db.getJLongType().getSize();
floatSize = (int) db.getJFloatType().getSize();
doubleSize = (int) db.getJDoubleType().getSize();
}
/** Comparison operation for oops, either or both of which may be null */
@ -71,25 +71,25 @@ public class ObjectHeap {
}
// Cached sizes of basic types
private long oopSize;
private long byteSize;
private long charSize;
private long booleanSize;
private long intSize;
private long shortSize;
private long longSize;
private long floatSize;
private long doubleSize;
private final int oopSize;
private final int byteSize;
private final int charSize;
private final int booleanSize;
private final int intSize;
private final int shortSize;
private final int longSize;
private final int floatSize;
private final int doubleSize;
public long getOopSize() { return oopSize; }
public long getByteSize() { return byteSize; }
public long getCharSize() { return charSize; }
public long getBooleanSize() { return booleanSize; }
public long getIntSize() { return intSize; }
public long getShortSize() { return shortSize; }
public long getLongSize() { return longSize; }
public long getFloatSize() { return floatSize; }
public long getDoubleSize() { return doubleSize; }
public int getOopSize() { return oopSize; }
public int getByteSize() { return byteSize; }
public int getCharSize() { return charSize; }
public int getBooleanSize() { return booleanSize; }
public int getIntSize() { return intSize; }
public int getShortSize() { return shortSize; }
public int getLongSize() { return longSize; }
public int getFloatSize() { return floatSize; }
public int getDoubleSize() { return doubleSize; }
/** an interface to filter objects while walking heap */
public static interface ObjectFilter {

2
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
View File

@ -949,7 +949,7 @@ public class HTMLGenerator implements /* imports */ ClassConstants {
}
public void endInstruction(long endPc) {
instrSize += endPc - pc;
instrSize += (int) (endPc - pc);
if (genHTML) buf.br();
if (nmethod != null) {

42
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
View File

@ -524,12 +524,12 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
Assert.that(cd != null, "can not get class data for " + klass.getName().asString() + klass.getAddress());
}
List<Field> fields = cd.fields;
return (int) BYTE_SIZE + (int)OBJ_ID_SIZE * 2 + (int)INT_SIZE * 2 + getSizeForFields(fields);
return BYTE_SIZE + OBJ_ID_SIZE * 2 + INT_SIZE * 2 + getSizeForFields(fields);
}
private int calculateClassDumpRecordSize(Klass k) {
// tag + javaMirror + DUMMY_STACK_TRACE_ID + super
int size = (int)BYTE_SIZE + (int)INT_SIZE + (int)OBJ_ID_SIZE * 2;
int size = BYTE_SIZE + INT_SIZE + OBJ_ID_SIZE * 2;
if (k instanceof InstanceKlass ik) {
List<Field> fields = getInstanceFields(ik);
List<Field> declaredFields = ik.getImmediateFields();
@ -592,7 +592,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
private int calculatePrimitiveArrayDumpRecordSize(TypeArray array) throws IOException {
int headerSize = getArrayHeaderSize(false);
TypeArrayKlass tak = (TypeArrayKlass) array.getKlass();
final int type = (int) tak.getElementType();
final int type = tak.getElementType();
final String typeName = tak.getElementTypeName();
final long typeSize = getSizeForType(type);
final int length = calculateArrayMaxLength(array.getLength(),
@ -654,7 +654,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
}
// get the size in bytes for the requested type
private long getSizeForType(int type) throws IOException {
private int getSizeForType(int type) throws IOException {
switch (type) {
case TypeArrayKlass.T_BOOLEAN:
return BOOLEAN_SIZE;
@ -680,8 +680,8 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
private int getArrayHeaderSize(boolean isObjectAarray) {
return isObjectAarray?
((int) BYTE_SIZE + 2 * (int) INT_SIZE + 2 * (int) OBJ_ID_SIZE):
(2 * (int) BYTE_SIZE + 2 * (int) INT_SIZE + (int) OBJ_ID_SIZE);
(BYTE_SIZE + 2 * INT_SIZE + 2 * OBJ_ID_SIZE):
(2 * BYTE_SIZE + 2 * INT_SIZE + OBJ_ID_SIZE);
}
// Check if we need to truncate an array.
@ -817,7 +817,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
private void dumpStackTraces() throws IOException {
// write a HPROF_TRACE record without any frames to be referenced as object alloc sites
writeHeader(HPROF_TRACE, 3 * (int)INT_SIZE );
writeHeader(HPROF_TRACE, 3 * INT_SIZE );
out.writeInt(DUMMY_STACK_TRACE_ID);
out.writeInt(0); // thread number
out.writeInt(0); // frame count
@ -848,7 +848,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
}
// write HPROF_TRACE record for one thread
writeHeader(HPROF_TRACE, 3 * (int)INT_SIZE + depth * (int)VM.getVM().getOopSize());
writeHeader(HPROF_TRACE, 3 * INT_SIZE + depth * OBJ_ID_SIZE);
int stackSerialNum = numThreads + DUMMY_STACK_TRACE_ID;
out.writeInt(stackSerialNum); // stack trace serial number
out.writeInt(numThreads); // thread serial number
@ -872,7 +872,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
writeSymbol(m.getSignature()); // method's signature
writeSymbol(m.getMethodHolder().getSourceFileName()); // source file name
// Then write FRAME descriptor
writeHeader(HPROF_FRAME, 4 * (int)VM.getVM().getOopSize() + 2 * (int)INT_SIZE);
writeHeader(HPROF_FRAME, 4 * OBJ_ID_SIZE + 2 * INT_SIZE);
writeObjectID(frameSN); // frame serial number
writeSymbolID(m.getName()); // method's name
writeSymbolID(m.getSignature()); // method's signature
@ -882,7 +882,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
}
protected void writeJavaThread(JavaThread jt, int index) throws IOException {
int size = (int)BYTE_SIZE + (int)OBJ_ID_SIZE + (int)INT_SIZE * 2;
int size = BYTE_SIZE + OBJ_ID_SIZE + INT_SIZE * 2;
writeHeapRecordPrologue(size);
out.writeByte((byte) HPROF_GC_ROOT_THREAD_OBJ);
writeObjectID(jt.getThreadObj());
@ -904,7 +904,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
Oop oop = objectHeap.newOop(oopHandle);
// exclude JNI handles hotspot internal objects
if (oop != null && isJavaVisible(oop)) {
int size = (int)BYTE_SIZE + (int)OBJ_ID_SIZE + (int)INT_SIZE * 2;
int size = BYTE_SIZE + OBJ_ID_SIZE + INT_SIZE * 2;
writeHeapRecordPrologue(size);
out.writeByte((byte) HPROF_GC_ROOT_JNI_LOCAL);
writeObjectID(oop);
@ -932,7 +932,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
Oop oop = objectHeap.newOop(oopHandle);
// exclude JNI handles of hotspot internal objects
if (oop != null && isJavaVisible(oop)) {
int size = (int)BYTE_SIZE + (int)OBJ_ID_SIZE * 2;
int size = BYTE_SIZE + OBJ_ID_SIZE * 2;
writeHeapRecordPrologue(size);
out.writeByte((byte) HPROF_GC_ROOT_JNI_GLOBAL);
writeObjectID(oop);
@ -961,7 +961,7 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
protected void writePrimitiveArray(TypeArray array) throws IOException {
int headerSize = getArrayHeaderSize(false);
TypeArrayKlass tak = (TypeArrayKlass) array.getKlass();
final int type = (int) tak.getElementType();
final int type = tak.getElementType();
final String typeName = tak.getElementTypeName();
final long typeSize = getSizeForType(type);
final int length = calculateArrayMaxLength(array.getLength(),
@ -1390,14 +1390,14 @@ public class HeapHprofBinWriter extends AbstractHeapGraphWriter {
private long DOUBLE_BASE_OFFSET;
private long OBJECT_BASE_OFFSET;
private long BOOLEAN_SIZE;
private long BYTE_SIZE;
private long CHAR_SIZE;
private long SHORT_SIZE;
private long INT_SIZE;
private long LONG_SIZE;
private long FLOAT_SIZE;
private long DOUBLE_SIZE;
private int BOOLEAN_SIZE;
private int BYTE_SIZE;
private int CHAR_SIZE;
private int SHORT_SIZE;
private int INT_SIZE;
private int LONG_SIZE;
private int FLOAT_SIZE;
private int DOUBLE_SIZE;
private static class ClassData {
int instSize;