archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8151130: [BACKOUT] Remove Method::_method_data for C1

Browse source 
Backing out the fix for JDK-8147978 because it fails and blocks integration.

Reviewed-by: vlivanov, zmajo
This commit is contained in:
Tobias Hartmann 2016-03-03 13:18:53 +01:00
parent 68ce6b3b9f
commit 2c4627b399
6 changed files with 16 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/oops/method.cpp
View file

@ -383,15 +383,14 @@ void Method::build_interpreter_method_data(const methodHandle& method, TRAPS) {
MutexLocker ml(MethodData_lock, THREAD);
if (method->method_data() == NULL) {
ClassLoaderData* loader_data = method->method_holder()->class_loader_data();
#if defined(COMPILER2) || INCLUDE_JVMCI
MethodData* method_data = MethodData::allocate(loader_data, method, THREAD);
if (HAS_PENDING_EXCEPTION) {
CompileBroker::log_metaspace_failure();
ClassLoaderDataGraph::set_metaspace_oom(true);
return; // return the exception (which is cleared)
}
method->set_method_data(method_data);
#endif
if (PrintMethodData && (Verbose || WizardMode)) {
ResourceMark rm(THREAD);
tty->print("build_interpreter_method_data for ");
@ -921,7 +920,7 @@ void Method::unlink_method() {
// shared class that failed to load, this->link_method() may
// have already been called (before an exception happened), so
// this->_method_data may not be NULL.
assert(!DumpSharedSpaces || method_data() == NULL, "unexpected method data?");
assert(!DumpSharedSpaces || _method_data == NULL, "unexpected method data?");
set_method_data(NULL);
clear_method_counters();