* src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned.

[cacao.git] / src / vm / jit / argument.cpp

diff --git a/src/vm/jit/argument.cpp b/src/vm/jit/argument.cpp
index 73ed9e271f4db5fa42fb7bc0bcf2793acbd3fd5c..9736c1e24945dce0707558fdd7920ae1d8e355bb 100644 (file)
--- a/src/vm/jit/argument.cpp
+++ b/src/vm/jit/argument.cpp
@@ -30,16 +30,16 @@
 
 #include "arch.h"
 
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
 #include "native/llni.h"
 
-#include "vm/array.h"
-#include "vm/descriptor.h"
+#include "vm/array.hpp"
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
-#include "vm/method.h"
+#include "vm/method.hpp"
 #include "vm/primitive.hpp"
-#include "vm/resolve.h"
+#include "vm/resolve.hpp"
 #include "vm/vm.hpp"
 
 #include "vm/jit/abi-asm.h"
@@ -582,10 +582,12 @@ uint64_t *argument_vmarray_from_objectarray(methodinfo *m, java_handle_t *o,
                i++;
        }
 
+       ObjectArray oa(params);
+
        for (j = 0; i < md->paramcount; i++, j++, pd++, td++) {
                /* XXX This function can throw an exception, which should not happend
                   here, since we are outside the nativeworld. */
-               param = array_objectarray_element_get(params, j);
+               param = oa.get_element(j);
 
                switch (td->type) {
                case TYPE_INT: