aboutsummaryrefslogtreecommitdiff
path: root/src/share/vm
diff options
context:
space:
mode:
authorcoffeys <none@none>2014-03-12 18:53:34 +0000
committercoffeys <none@none>2014-03-12 18:53:34 +0000
commit1406bd665e53ab8835e93cf4675ce9caf6b9a950 (patch)
tree50100c0c32559eb3dde74af50229d19870538c50 /src/share/vm
parentf7ef1e39d4da3c231cefaf340ffc7c91e1db679b (diff)
parent96ba410534effb4888f7ae0c8f3d72686a239c99 (diff)
Merge
Diffstat (limited to 'src/share/vm')
-rw-r--r--src/share/vm/ci/ciMethod.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/share/vm/ci/ciMethod.cpp b/src/share/vm/ci/ciMethod.cpp
index 923331ede..85fa757b4 100644
--- a/src/share/vm/ci/ciMethod.cpp
+++ b/src/share/vm/ci/ciMethod.cpp
@@ -724,6 +724,11 @@ ciMethod* ciMethod::find_monomorphic_target(ciInstanceKlass* caller,
VM_ENTRY_MARK;
+ // Disable CHA for default methods for now
+ if (root_m->get_Method()->is_default_method()) {
+ return NULL;
+ }
+
methodHandle target;
{
MutexLocker locker(Compile_lock);