1.1 --- a/src/cpu/x86/vm/interpreterRT_x86_32.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/x86/vm/interpreterRT_x86_32.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -27,7 +27,7 @@
1.11 #include "interpreter/interpreterRuntime.hpp"
1.12 #include "memory/allocation.inline.hpp"
1.13 #include "memory/universe.inline.hpp"
1.14 -#include "oops/methodOop.hpp"
1.15 +#include "oops/method.hpp"
1.16 #include "oops/oop.inline.hpp"
1.17 #include "runtime/handles.inline.hpp"
1.18 #include "runtime/icache.hpp"
1.19 @@ -131,8 +131,8 @@
1.20 }
1.21 };
1.22
1.23 -IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, methodOopDesc* method, intptr_t* from, intptr_t* to))
1.24 - methodHandle m(thread, (methodOop)method);
1.25 +IRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* thread, Method* method, intptr_t* from, intptr_t* to))
1.26 + methodHandle m(thread, (Method*)method);
1.27 assert(m->is_native(), "sanity check");
1.28 // handle arguments
1.29 SlowSignatureHandler(m, (address)from, to + 1).iterate(UCONST64(-1));
