From bdef27482cb94d6d1fd4efa51b83ff735e0ff7cf Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Wed, 2 Jun 2010 12:02:49 -0700 Subject: [PATCH] 6957882: nsk/sajdi tests failed with NullPointerException VM.getObjectAlignmentInBytes() accesses intxType before it is created. Reviewed-by: never --- .../share/classes/sun/jvm/hotspot/runtime/VM.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java index 9798e74f5a1..1c94a365f8d 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java @@ -314,6 +314,13 @@ public class VM { isLP64 = debugger.getMachineDescription().isLP64(); } bytesPerLong = db.lookupIntConstant("BytesPerLong").intValue(); + heapWordSize = db.lookupIntConstant("HeapWordSize").intValue(); + oopSize = db.lookupIntConstant("oopSize").intValue(); + + intxType = db.lookupType("intx"); + uintxType = db.lookupType("uintx"); + boolType = (CIntegerType) db.lookupType("bool"); + minObjAlignmentInBytes = getObjectAlignmentInBytes(); if (minObjAlignmentInBytes == 8) { logMinObjAlignmentInBytes = 3; @@ -323,13 +330,6 @@ public class VM { throw new RuntimeException("Object alignment " + minObjAlignmentInBytes + " not yet supported"); } - heapWordSize = db.lookupIntConstant("HeapWordSize").intValue(); - oopSize = db.lookupIntConstant("oopSize").intValue(); - - intxType = db.lookupType("intx"); - uintxType = db.lookupType("uintx"); - boolType = (CIntegerType) db.lookupType("bool"); - if (isCompressedOopsEnabled()) { // Size info for oops within java objects is fixed heapOopSize = (int)getIntSize();