truffle: src/share/vm/oops/method.hpp comparison

comparison src/share/vm/oops/method.hpp @ 20804:7848fc12602b

Merge with jdk8u40-b25

author	Gilles Duboscq <gilles.m.duboscq@oracle.com>
date	Tue, 07 Apr 2015 14:58:49 +0200
parents	52b4284cb496 600c44255e5f
children

comparison

equal deleted inserted replaced

-:84105dcdb05b
+:7848fc12602b
 void clear_breakpoint(int bci);
 void clear_all_breakpoints();
 // Tracking number of breakpoints, for fullspeed debugging.
 // Only mutated by VM thread.
 u2   number_of_breakpoints()             const {
-if (method_counters() == NULL) {
+MethodCounters* mcs = method_counters();
+if (mcs == NULL) {
 return 0;
 } else {
-return method_counters()->number_of_breakpoints();
+return mcs->number_of_breakpoints();
 }
 }
 void incr_number_of_breakpoints(TRAPS)         {
 MethodCounters* mcs = get_method_counters(CHECK);
 if (mcs != NULL) {
 mcs->decr_number_of_breakpoints();
 }
 }
 // Initialization only
 void clear_number_of_breakpoints()             {
-if (method_counters() != NULL) {
+MethodCounters* mcs = method_counters();
-method_counters()->clear_number_of_breakpoints();
+if (mcs != NULL) {
+mcs->clear_number_of_breakpoints();
 }
 }
 // index into InstanceKlass methods() array
 // note: also used by jfr
 mcs->interpreter_throwout_increment();
 }
 }
 int  interpreter_throwout_count() const        {
-if (method_counters() == NULL) {
+MethodCounters* mcs = method_counters();
+if (mcs == NULL) {
 return 0;
 } else {
-return method_counters()->interpreter_throwout_count();
+return mcs->interpreter_throwout_count();
 }
 }
 // size of parameters
 int  size_of_parameters() const                { return constMethod()->size_of_parameters(); }
 MethodCounters* method_counters() const {
 return _method_counters;
 }
-void set_method_counters(MethodCounters* counters) {
+void clear_method_counters() {
-// The store into method must be released. On platforms without
+_method_counters = NULL;
-// total store order (TSO) the reference may become visible before
+}
-// the initialization of data otherwise.
-OrderAccess::release_store_ptr((volatile void *)&_method_counters, counters);
+bool init_method_counters(MethodCounters* counters) {
+// Try to install a pointer to MethodCounters, return true on success.
+return Atomic::cmpxchg_ptr(counters, (volatile void*)&_method_counters, NULL) == NULL;
 }
 #ifdef TIERED
 // We are reusing interpreter_invocation_count as a holder for the previous event count!
 // We can do that since interpreter_invocation_count is not used in tiered.
 return 0;
 } else {
 return method_counters()->interpreter_invocation_count();
 }
 }
-void set_prev_event_count(int count, TRAPS)    {
+void set_prev_event_count(int count) {
-MethodCounters* mcs = get_method_counters(CHECK);
+MethodCounters* mcs = method_counters();
 if (mcs != NULL) {
 mcs->set_interpreter_invocation_count(count);
 }
 }
 jlong prev_time() const                        {
-return method_counters() == NULL ? 0 : method_counters()->prev_time();
+MethodCounters* mcs = method_counters();
-}
+return mcs == NULL ? 0 : mcs->prev_time();
-void set_prev_time(jlong time, TRAPS)          {
+}
-MethodCounters* mcs = get_method_counters(CHECK);
+void set_prev_time(jlong time) {
+MethodCounters* mcs = method_counters();
 if (mcs != NULL) {
 mcs->set_prev_time(time);
 }
 }
 float rate() const                             {
-return method_counters() == NULL ? 0 : method_counters()->rate();
+MethodCounters* mcs = method_counters();
-}
+return mcs == NULL ? 0 : mcs->rate();
-void set_rate(float rate, TRAPS) {
+}
-MethodCounters* mcs = get_method_counters(CHECK);
+void set_rate(float rate) {
+MethodCounters* mcs = method_counters();
 if (mcs != NULL) {
 mcs->set_rate(rate);
 }
 }
 #endif
 static void build_interpreter_method_data(methodHandle method, TRAPS);
 static MethodCounters* build_method_counters(Method* m, TRAPS);
 int interpreter_invocation_count() {
-if (TieredCompilation) return invocation_count();
+if (TieredCompilation) {
-else return (method_counters() == NULL) ? 0 :
+return invocation_count();
-method_counters()->interpreter_invocation_count();
+} else {
+MethodCounters* mcs = method_counters();
+return (mcs == NULL) ? 0 : mcs->interpreter_invocation_count();
+}
 }
 int increment_interpreter_invocation_count(TRAPS) {
 if (TieredCompilation) ShouldNotReachHere();
 MethodCounters* mcs = get_method_counters(CHECK_0);
 return (mcs == NULL) ? 0 : mcs->increment_interpreter_invocation_count();
 void set_guaranteed_monitor_matching()         { _access_flags.set_monitor_matching(); }
 // returns true if the method is an accessor function (setter/getter).
 bool is_accessor() const;
+// returns true if the method does nothing but return a constant of primitive type
+bool is_constant_getter() const;
 // returns true if the method is an initializer (<init> or <clinit>).
 bool is_initializer() const;
 // returns true if the method is static OR if the classfile version < 51
 bool has_valid_initializer_flags() const;
 bool is_overpass() const { return method_type() == ConstMethod::OVERPASS; }
 // On-stack replacement support
 bool has_osr_nmethod(int level, bool match_level) {
 return method_holder()->lookup_osr_nmethod(this, InvocationEntryBci, level, match_level) != NULL;
+}
+int mark_osr_nmethods() {
+return method_holder()->mark_osr_nmethods(this);
 }
 nmethod* lookup_osr_nmethod_for(int bci, int level, bool match_level) {
 return method_holder()->lookup_osr_nmethod(this, bci, level, match_level);
 }

Mercurial > hg > truffle

comparison src/share/vm/oops/method.hpp @ 20804:7848fc12602b