changeset in /hg/icedtea6: 2009-06-23 Edward Nevill <enevill at a...

[doko at ubuntu.com]

changeset 914f2022b402 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=914f2022b402
description:
	2009-06-23  Edward Nevill  <enevill at arm.com>
	            Matthias Klose  <doko at 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'.

diffstat:

2 files changed, 7 insertions(+), 1 deletion(-)
ChangeLog                                             |    6 ++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |    2 +-

diffs (32 lines):

diff -r 438cbd2f7252 -r 914f2022b402 ChangeLog
--- 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-07-15  Xerxes RÃ¥nby  <xerxes at zafen
+2009-06-23  Edward Nevill  <enevill at arm.com>
+	    Matthias Klose  <doko at 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 at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/llvmValue.hpp
diff -r 438cbd2f7252 -r 914f2022b402 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- 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 @@ void CppInterpreter::native_entry(method
     Unimplemented();
   }
   void **arguments;
+  void *mirror = NULL;
   {
     arguments =
       (void **) stack->alloc(handler->argument_count() * sizeof(void **));
@@ -255,7 +256,6 @@ void CppInterpreter::native_entry(method
     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());