graal-compiler: src/share/vm/code/nmethod.cpp comparison

comparison src/share/vm/code/nmethod.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Tue, 01 Apr 2014 13:57:07 +0200
parents	b10e42998d01
children	169caf662ac7

comparison

equal deleted inserted replaced

-:8db6e76cb658
+:4ca6dc0799b6
 #ifdef DTRACE_ENABLED
 // Only bother with this argument setup if dtrace is available
+#ifndef USDT2
+HS_DTRACE_PROBE_DECL8(hotspot, compiled__method__load,
+const char*, int, const char*, int, const char*, int, void*, size_t);
+HS_DTRACE_PROBE_DECL6(hotspot, compiled__method__unload,
+char*, int, char*, int, char*, int);
+#define DTRACE_METHOD_UNLOAD_PROBE(method)                                \
+{                                                                       \
+Method* m = (method);                                                 \
+if (m != NULL) {                                                      \
+Symbol* klass_name = m->klass_name();                               \
+Symbol* name = m->name();                                           \
+Symbol* signature = m->signature();                                 \
+HS_DTRACE_PROBE6(hotspot, compiled__method__unload,                 \
+klass_name->bytes(), klass_name->utf8_length(),                   \
+name->bytes(), name->utf8_length(),                               \
+signature->bytes(), signature->utf8_length());                    \
+}                                                                     \
+}
+#else /* USDT2 */
 #define DTRACE_METHOD_UNLOAD_PROBE(method)                                \
 {                                                                       \
 Method* m = (method);                                                 \
 if (m != NULL) {                                                      \
 Symbol* klass_name = m->klass_name();                               \
 (char *) klass_name->bytes(), klass_name->utf8_length(),                   \
 (char *) name->bytes(), name->utf8_length(),                               \
 (char *) signature->bytes(), signature->utf8_length());                    \
 }                                                                     \
 }
+#endif /* USDT2 */
 #else //  ndef DTRACE_ENABLED
 #define DTRACE_METHOD_UNLOAD_PROBE(method)
 // record this nmethod as dependent on this klass
 InstanceKlass::cast(klass)->add_dependent_nmethod(nm);
 }
 if (nm != NULL)  note_java_nmethod(nm);
-if (PrintAssembly || CompilerOracle::has_option_string(method, "PrintAssembly")) {
+if (PrintAssembly) {
 Disassembler::decode(nm);
 }
 }
 }
 // Do verification and logging outside CodeCache_lock.
 // new method for install_code() path
 // Transfer information from compilation to jvmti
 void nmethod::post_compiled_method_load_event() {
 Method* moop = method();
+#ifndef USDT2
+HS_DTRACE_PROBE8(hotspot, compiled__method__load,
+moop->klass_name()->bytes(),
+moop->klass_name()->utf8_length(),
+moop->name()->bytes(),
+moop->name()->utf8_length(),
+moop->signature()->bytes(),
+moop->signature()->utf8_length(),
+insts_begin(), insts_size());
+#else /* USDT2 */
 HOTSPOT_COMPILED_METHOD_LOAD(
 (char *) moop->klass_name()->bytes(),
 moop->klass_name()->utf8_length(),
 (char *) moop->name()->bytes(),
 moop->name()->utf8_length(),
 (char *) moop->signature()->bytes(),
 moop->signature()->utf8_length(),
 insts_begin(), insts_size());
+#endif /* USDT2 */
 if (JvmtiExport::should_post_compiled_method_load() ||
 JvmtiExport::should_post_compiled_method_unload()) {
 get_and_cache_jmethod_id();
 }
 return NULL;
 }
 }
-void nmethod::check_all_dependencies(DepChange& changes) {
+bool nmethod::check_all_dependencies() {
-// Checked dependencies are allocated into this ResourceMark
+bool found_check = false;
-ResourceMark rm;
+// wholesale check of all dependencies
+for (Dependencies::DepStream deps(this); deps.next(); ) {
-// Turn off dependency tracing while actually testing dependencies.
+if (deps.check_dependency() != NULL) {
-NOT_PRODUCT( FlagSetting fs(TraceDependencies, false) );
+found_check = true;
+NOT_DEBUG(break);
-GenericHashtable<DependencySignature, ResourceObj>* table = new GenericHashtable<DependencySignature, ResourceObj>(11027);
+}
-// Iterate over live nmethods and check dependencies of all nmethods that are not
+}
-// marked for deoptimization. A particular dependency is only checked once.
+return found_check;  // tell caller if we found anything
-for(nmethod* nm = CodeCache::alive_nmethod(CodeCache::first()); nm != NULL; nm = CodeCache::alive_nmethod(CodeCache::next(nm))) {
-if (!nm->is_marked_for_deoptimization()) {
-for (Dependencies::DepStream deps(nm); deps.next(); ) {
-// Construct abstraction of a dependency.
-DependencySignature* current_sig = new DependencySignature(deps);
-// Determine if 'deps' is already checked. table->add() returns
-// 'true' if the dependency was added (i.e., was not in the hashtable).
-if (table->add(current_sig)) {
-if (deps.check_dependency() != NULL) {
-// Dependency checking failed. Print out information about the failed
-// dependency and finally fail with an assert. We can fail here, since
-// dependency checking is never done in a product build.
-changes.print();
-nm->print();
-nm->print_dependencies();
-assert(false, "Should have been marked for deoptimization");
-}
-}
-}
-}
-}
 }
 bool nmethod::check_dependency_on(DepChange& changes) {
 // What has happened:
 // 1) a new class dependee has been added

Mercurial > hg > graal-compiler

comparison src/share/vm/code/nmethod.cpp @ 14909:4ca6dc0799b6