1.1 --- a/src/share/vm/prims/jvmtiEnvThreadState.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/prims/jvmtiEnvThreadState.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 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 @@ -150,7 +150,7 @@
1.11 // - instruction rewrites
1.12 // - breakpoint followed by single step
1.13 // - single step at a breakpoint
1.14 -void JvmtiEnvThreadState::compare_and_set_current_location(methodOop new_method,
1.15 +void JvmtiEnvThreadState::compare_and_set_current_location(Method* new_method,
1.16 address new_location, jvmtiEvent event) {
1.17
1.18 int new_bci = new_location - new_method->code_base();
1.19 @@ -271,7 +271,7 @@
1.20 RegisterMap rm(_thread, false);
1.21 javaVFrame* vf = _thread->last_java_vframe(&rm);
1.22 assert(vf != NULL, "must have last java frame");
1.23 - methodOop method = vf->method();
1.24 + Method* method = vf->method();
1.25 _method_id = method->jmethod_id();
1.26 _bci = vf->bci();
1.27 }
