jdk-sandbox: comparison hotspot/src/share/vm/prims/forte.cpp

equal deleted inserted replaced

-:caf5eb7dd4a7
+:882756847a04
 /*
-* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 static bool is_decipherable_compiled_frame(JavaThread* thread, frame* fr, nmethod* nm);
 static bool is_decipherable_interpreted_frame(JavaThread* thread,
 frame* fr,
-methodOop* method_p,
+Method** method_p,
 int* bci_p);
 // Note: this method returns true when a valid Java method is found
 // even if a valid BCI cannot be found.
 static bool is_decipherable_interpreted_frame(JavaThread* thread,
 frame* fr,
-methodOop* method_p,
+Method** method_p,
 int* bci_p) {
 assert(fr->is_interpreted_frame(), "just checking");
 // top frame is an interpreted frame
-// check if it is walkable (i.e. valid methodOop and valid bci)
+// check if it is walkable (i.e. valid Method* and valid bci)
 // Because we may be racing a gc thread the method and/or bci
 // of a valid interpreter frame may look bad causing us to
 // fail the is_interpreted_frame_valid test. If the thread
 // is in any of the following states we are assured that the
 state == _thread_blocked );
 if (known_valid || fr->is_interpreted_frame_valid(thread)) {
 // The frame code should completely validate the frame so that
-// references to methodOop and bci are completely safe to access
+// references to Method* and bci are completely safe to access
 // If they aren't the frame code should be fixed not this
 // code. However since gc isn't locked out the values could be
 // stale. This is a race we can never completely win since we can't
 // lock out gc so do one last check after retrieving their values
 // from the frame for additional safety
-methodOop method = fr->interpreter_frame_method();
+Method* method = fr->interpreter_frame_method();
 // We've at least found a method.
 // NOTE: there is something to be said for the approach that
 // if we don't find a valid bci then the method is not likely
 // a valid method. Then again we may have caught an interpreter
 //
 static bool find_initial_Java_frame(JavaThread* thread,
 frame* fr,
 frame* initial_frame_p,
-methodOop* method_p,
+Method** method_p,
 int* bci_p) {
 // It is possible that for a frame containing an nmethod
 // we can capture the method but no bci. If we get no
 // bci the frame isn't walkable but the method is usable.
-// Therefore we init the returned methodOop to NULL so the
+// Therefore we init the returned Method* to NULL so the
 // caller can make the distinction.
 *method_p = NULL;
 // On the initial call to this method the frame we get may not be
 int depth,
 frame top_frame) {
 NoHandleMark nhm;
 frame initial_Java_frame;
-methodOop method;
+Method* method;
 int bci;
 int count;
 count = 0;
 assert(trace->frames != NULL, "trace->frames must be non-NULL");
 CollectedHeap* ch = Universe::heap();
 // The method is not stored GC safe so see if GC became active
 // after we entered AsyncGetCallTrace() and before we try to
-// use the methodOop.
+// use the Method*.
 // Yes, there is still a window after this check and before
-// we use methodOop below, but we can't lock out GC so that
+// we use Method* below, but we can't lock out GC so that
 // has to be an acceptable risk.
 if (!ch->is_valid_method(method)) {
 trace->num_frames = ticks_GC_active; // -2
 return;
 }
 bci = st.bci();
 method = st.method();
 // The method is not stored GC safe so see if GC became active
 // after we entered AsyncGetCallTrace() and before we try to
-// use the methodOop.
+// use the Method*.
 // Yes, there is still a window after this check and before
-// we use methodOop below, but we can't lock out GC so that
+// we use Method* below, but we can't lock out GC so that
 // has to be an acceptable risk.
 if (!ch->is_valid_method(method)) {
 // we throw away everything we've gathered in this sample since
 // none of it is safe
 trace->num_frames = ticks_GC_active; // -2

changeset 13728	882756847a04
parent 10565	dc90c239f4ec
child 14579	7f6ce6e3dd80