graal-jvmci-8: src/share/vm/graal/graalEnv.cpp comparison

comparison src/share/vm/graal/graalEnv.cpp @ 19782:29916dcee0b8

Verify dependencies when assertions are enabled

author	Tom Rodriguez <tom.rodriguez@oracle.com>
date	Tue, 10 Mar 2015 22:18:53 -0700
parents	fb38e004503c
children	a560c9b81f0f

comparison

equal deleted inserted replaced

-:ea8d6fa333ab
+:29916dcee0b8
 }
 // ------------------------------------------------------------------
 // Check for changes to the system dictionary during compilation
 // class loads, evolution, breakpoints
-bool GraalEnv::check_for_system_dictionary_modification(Dependencies* dependencies, Handle compiled_code, GraalEnv* env, char** failure_detail) {
+GraalEnv::CodeInstallResult GraalEnv::check_for_system_dictionary_modification(Dependencies* dependencies, Handle compiled_code,
+GraalEnv* env, char** failure_detail) {
 // If JVMTI capabilities were enabled during compile, the compilation is invalidated.
 if (env != NULL) {
 if (!env->_jvmti_can_hotswap_or_post_breakpoint && JvmtiExport::can_hotswap_or_post_breakpoint()) {
 *failure_detail = (char*) "Hotswapping or breakpointing was enabled during compilation";
-return false;
+return GraalEnv::dependencies_failed;
 }
 }
 // Dependencies must be checked when the system dictionary changes
 // or if we don't know whether it has changed (i.e., env == NULL).
 // In debug mode, always check dependencies.
 bool counter_changed = env != NULL && env->_system_dictionary_modification_counter != SystemDictionary::number_of_modifications();
-bool verify_deps = env == NULL || trueInDebug;
+bool verify_deps = env == NULL || trueInDebug || Debug::ENABLED();
 if (!counter_changed && !verify_deps) {
-return true;
+return GraalEnv::ok;
 }
 for (Dependencies::DepStream deps(dependencies); deps.next(); ) {
 Klass* witness = deps.check_dependency();
 if (witness != NULL) {
 // resizing in the context of an inner resource mark.
 char* buffer = NEW_RESOURCE_ARRAY(char, O_BUFLEN);
 stringStream st(buffer, O_BUFLEN);
 deps.print_dependency(witness, true, &st);
 *failure_detail = st.as_string();
-return false;
+if (env == NULL || counter_changed) {
+return GraalEnv::dependencies_failed;
+} else {
+// The dependencies were invalid at the time of installation
+// without any intervening modification of the system
+// dictionary.  That means they were invalidly constructed.
+return GraalEnv::dependencies_invalid;
+}
 }
 if (LogCompilation) {
 deps.log_dependency();
 }
 }
-return true;
+return GraalEnv::ok;
 }
 // ------------------------------------------------------------------
 GraalEnv::CodeInstallResult GraalEnv::register_method(
 methodHandle& method,
 // Encode the dependencies now, so we can check them right away.
 dependencies->encode_content_bytes();
 // Check for {class loads, evolution, breakpoints} during compilation
-if (!check_for_system_dictionary_modification(dependencies, compiled_code, env, &failure_detail)) {
+result = check_for_system_dictionary_modification(dependencies, compiled_code, env, &failure_detail);
+if (result != GraalEnv::ok) {
 // While not a true deoptimization, it is a preemptive decompile.
 MethodData* mdp = method()->method_data();
 if (mdp != NULL) {
 mdp->inc_decompile_count();
 if (mdp->decompile_count() > (uint)PerMethodRecompilationCutoff) {
 // All buffers in the CodeBuffer are allocated in the CodeCache.
 // If the code buffer is created on each compile attempt
 // as in C2, then it must be freed.
 //code_buffer->free_blob();
-result = GraalEnv::dependencies_failed;
 } else {
 ImplicitExceptionTable implicit_tbl;
 nm =  nmethod::new_nmethod(method,
 compile_id,
 entry_bci,

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/graal/graalEnv.cpp @ 19782:29916dcee0b8