* src/vm/jit/alpha/codegen.c (codegen): Set fieldtype in all cases.

--HG--
branch : new_instruction_format

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index eadd103d1f7f6f37d33d8de2f5cb7939e95d4740..f8bcc4df8cc668d601d7d2de85923aaaa11e1f26 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -32,7 +32,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 5336 2006-09-05 20:57:13Z edwin $
+   $Id: codegen.c 5338 2006-09-05 21:06:54Z edwin $
 
 */
 
@@ -1994,6 +1994,7 @@ bool codegen(jitdata *jd)
                        else {
                                fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
 
+                               fieldtype = fi->type;
                                disp = dseg_add_address(cd, &(fi->value));
 
                                if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
@@ -2048,6 +2049,7 @@ bool codegen(jitdata *jd)
                        else {
                                fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
 
+                               fieldtype = fi->type;
                                disp = dseg_add_address(cd, &(fi->value));
 
                                if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
@@ -2104,8 +2106,6 @@ bool codegen(jitdata *jd)
                                fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
 
                                fieldtype = fi->type;
-
-       
                                disp = dseg_add_address(cd, &(fi->value));
 
                                if (!CLASS_IS_OR_ALMOST_INITIALIZED(fi->class)) {
@@ -2157,6 +2157,8 @@ bool codegen(jitdata *jd)
                        }
                        else {
                                fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
+
+                               fieldtype = fi->type;
                                disp = fi->offset;
                        }
 
@@ -2210,6 +2212,8 @@ bool codegen(jitdata *jd)
                        }
                        else {
                                fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
+
+                               fieldtype = fi->type;
                                disp = fi->offset;
                        }
 
@@ -2255,7 +2259,6 @@ bool codegen(jitdata *jd)
                                fieldinfo *fi = iptr->sx.s23.s3.fmiref->p.field;
 
                                fieldtype = fi->type;
-
                                disp = fi->offset;
                        }