changeset 33751:5cc611ec85b3

Merge
author coleenp
date Mon, 02 Nov 2015 19:38:49 +0000
parents 456510109b17 6f5873dfa67f
children 0782a966d781
files
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp	Mon Nov 02 17:26:20 2015 +0000
+++ b/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp	Mon Nov 02 19:38:49 2015 +0000
@@ -60,7 +60,7 @@
 
 // ----------------------------------------------------------------------------
 
-address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
   ShouldNotReachHere(); // Only needed for COMPILER2.
   return NULL;
 }
--- a/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Mon Nov 02 17:26:20 2015 +0000
+++ b/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Mon Nov 02 19:38:49 2015 +0000
@@ -59,11 +59,6 @@
   ShouldNotCallThis();
 }
 
-void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src,
-                                                       CodeBuffer*       dst) {
-  ShouldNotCallThis();
-}
-
 void metadata_Relocation::pd_fix_value(address x) {
   ShouldNotCallThis();
 }
--- a/hotspot/src/cpu/zero/vm/vm_version_zero.cpp	Mon Nov 02 17:26:20 2015 +0000
+++ b/hotspot/src/cpu/zero/vm/vm_version_zero.cpp	Mon Nov 02 19:38:49 2015 +0000
@@ -37,4 +37,9 @@
     warning("Unaligned memory access is not available on this CPU");
     FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
   }
+  // Disable prefetching for Zero
+  if (! FLAG_IS_DEFAULT(AllocatePrefetchDistance)) {
+    warning("Prefetching is not available for a Zero VM");
+  }
+  FLAG_SET_DEFAULT(AllocatePrefetchDistance, 0);
 }
--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Nov 02 17:26:20 2015 +0000
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Nov 02 19:38:49 2015 +0000
@@ -2190,7 +2190,7 @@
                 result->set_mark(markOopDesc::prototype());
               }
               result->set_klass_gap(0);
-              result->set_klass(k_entry);
+              result->set_klass(ik);
               // Must prevent reordering of stores for object initialization
               // with stores that publish the new object.
               OrderAccess::storestore();