Mercurial > hg > graal-jvmci-8

diff c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java @ 1478:5571b97fc1ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More JNI global handle clean ups.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 26 Nov 2010 19:45:05 +0100
parents 2c754f3a2722
children 2fe369533fed
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java	Fri Nov 26 13:52:15 2010 +0100
+++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotXirGenerator.java	Fri Nov 26 19:45:05 2010 +0100
@@ -372,13 +372,13 @@
                 return asm.finishTemplate("putfield<" + kind + ">");
             }
             XirParameter fieldOffset = asm.createConstantInputParameter("fieldOffset", CiKind.Int);
+            if (kind == CiKind.Object) {
+                verifyPointer(asm, value);
+            }
             if (is(NULL_CHECK, flags)) {
                 asm.nop(1);
                 asm.mark(MARK_IMPLICIT_NULL);
             }
-            if (kind == CiKind.Object) {
-                verifyPointer(asm, value);
-            }
             asm.pstore(kind, object, fieldOffset, value, is(NULL_CHECK, flags));
             if (is(WRITE_BARRIER, flags)) {
                 XirOperand temp = asm.createTemp("temp", CiKind.Word);