Mercurial > hg > release > icedtea6-1.6
changeset 1640:914f2022b402
2009-06-23 Edward Nevill <enevill@arm.com>
Matthias Klose <doko@ubuntu.com>
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp (native_entry):
Move decl of `mirror' to the same scope as the decl of `arguments'.
| author | doko@ubuntu.com |
|---|---|
| date | Wed, 15 Jul 2009 17:54:49 +0200 |
| parents | 438cbd2f7252 |
| children | ea9d66cbd06d |
| files | ChangeLog ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 15 12:56:10 2009 +0200 +++ b/ChangeLog Wed Jul 15 17:54:49 2009 +0200 @@ -1,3 +1,9 @@ +2009-06-23 Edward Nevill <enevill@arm.com> + Matthias Klose <doko@ubuntu.com> + + * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp (native_entry): + Move decl of `mirror' to the same scope as the decl of `arguments'. + 2009-07-15 Xerxes Rånby <xerxes@zafena.se> * ports/hotspot/src/share/vm/shark/llvmValue.hpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Jul 15 12:56:10 2009 +0200 +++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Jul 15 17:54:49 2009 +0200 @@ -247,6 +247,7 @@ Unimplemented(); } void **arguments; + void *mirror = NULL; { arguments = (void **) stack->alloc(handler->argument_count() * sizeof(void **)); @@ -255,7 +256,6 @@ void *env = thread->jni_environment(); *(dst++) = &env; - void *mirror = NULL; if (method->is_static()) { istate->set_oop_temp( method->constants()->pool_holder()->klass_part()->java_mirror());