# HG changeset patch
# User kvn
# Date 1275505369 25200
# Node ID 4a2e260bb13a12a0ee334fc22a1094c65161ac56
# Parent  3657cb01ffc5b74da8f698aab584a7c80786bea7
6957882: nsk/sajdi tests failed with NullPointerException
Summary: VM.getObjectAlignmentInBytes() accesses intxType before it is created.
Reviewed-by: never

diff -r 3657cb01ffc5 -r 4a2e260bb13a agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Wed Jun 02 09:49:32 2010 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Wed Jun 02 12:02:49 2010 -0700
@@ -314,6 +314,13 @@
       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 @@
       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();