* src/vm/class.cpp (class_isanysubclass): Fixed warning about unused variable.

* src/vm/jit/builtin.cpp (builtin_fast_canstore): Likewise.

diff --git a/src/vm/class.cpp b/src/vm/class.cpp
index 698356d11566973010920c69af5720f75694445d..0c3b13494b74ff3a7f0f7e7492b0e786b1ad2ef5 100644 (file)
--- a/src/vm/class.cpp
+++ b/src/vm/class.cpp
@@ -1445,8 +1445,7 @@ bool class_issubclass(classinfo *sub, classinfo *super)
 
 bool class_isanysubclass(classinfo *sub, classinfo *super)
 {
-       uint32_t diffval;
-       bool     result;
+       bool result;
 
        /* This is the trivial case. */
 
@@ -1476,8 +1475,8 @@ bool class_isanysubclass(classinfo *sub, classinfo *super)
 #else
                LOCK_CLASSRENUMBER_LOCK;
 
-               diffval = sub->vftbl->baseval - super->vftbl->baseval;
-               result  = diffval <= (uint32_t) super->vftbl->diffval;
+               uint32_t diffval = sub->vftbl->baseval - super->vftbl->baseval;
+               result = diffval <= (uint32_t) super->vftbl->diffval;
 
                UNLOCK_CLASSRENUMBER_LOCK;
 #endif

diff --git a/src/vm/jit/builtin.cpp b/src/vm/jit/builtin.cpp
index 491d48ce6c056cac6b6c212424807374485f3d46..5747a032bf4a8e1687e7705b0d30eaa1adb74657 100644 (file)
--- a/src/vm/jit/builtin.cpp
+++ b/src/vm/jit/builtin.cpp
@@ -682,7 +682,6 @@ bool builtin_fast_canstore(java_objectarray_t *oa, java_object_t *o)
        vftbl_t         *componentvftbl;
        vftbl_t         *valuevftbl;
        int32_t          baseval;
-       uint32_t         diffval;
        bool             result;
 
        if (o == NULL)
@@ -721,8 +720,8 @@ bool builtin_fast_canstore(java_objectarray_t *oa, java_object_t *o)
 #if USES_NEW_SUBTYPE
                        result = fast_subtype_check(valuevftbl, componentvftbl);
 #else
-                       diffval = valuevftbl->baseval - componentvftbl->baseval;
-                       result  = diffval <= (uint32_t) componentvftbl->diffval;
+                       uint32_t diffval = valuevftbl->baseval - componentvftbl->baseval;
+                       result = diffval <= (uint32_t) componentvftbl->diffval;
 #endif
                }
 
@@ -755,7 +754,6 @@ bool builtin_fast_canstore_onedim(java_objectarray_t *a, java_object_t *o)
        vftbl_t         *elementvftbl;
        vftbl_t         *valuevftbl;
        int32_t          baseval;
-       uint32_t         diffval;
        bool             result;
        
        if (o == NULL)
@@ -791,8 +789,8 @@ bool builtin_fast_canstore_onedim(java_objectarray_t *a, java_object_t *o)
 #if USES_NEW_SUBTYPE
                result = fast_subtype_check(valuevftbl, elementvftbl);
 #else
-               diffval = valuevftbl->baseval - elementvftbl->baseval;
-               result  = diffval <= (uint32_t) elementvftbl->diffval;
+               uint32_t diffval = valuevftbl->baseval - elementvftbl->baseval;
+               result = diffval <= (uint32_t) elementvftbl->diffval;
 #endif
        }
 
@@ -806,10 +804,9 @@ bool builtin_fast_canstore_onedim(java_objectarray_t *a, java_object_t *o)
  * one-dimensional array of a class type */
 bool builtin_fast_canstore_onedim_class(java_objectarray_t *a, java_object_t *o)
 {
-       vftbl_t  *elementvftbl;
-       vftbl_t  *valuevftbl;
-       uint32_t  diffval;
-       bool      result;
+       vftbl_t *elementvftbl;
+       vftbl_t *valuevftbl;
+       bool     result;
        
        if (o == NULL)
                return 1;
@@ -836,8 +833,8 @@ bool builtin_fast_canstore_onedim_class(java_objectarray_t *a, java_object_t *o)
 #if USES_NEW_SUBTYPE
        result = fast_subtype_check(valuevftbl, elementvftbl);
 #else
-       diffval = valuevftbl->baseval - elementvftbl->baseval;
-       result  = diffval <= (uint32_t) elementvftbl->diffval;
+       uint32_t diffval = valuevftbl->baseval - elementvftbl->baseval;
+       result = diffval <= (uint32_t) elementvftbl->diffval;
 #endif
 
        UNLOCK_CLASSRENUMBER_LOCK;