open Udiff src/hotspot/cpu/arm/nativeInst_arm_64.cpp (original) (raw)

< prev index next >

Print this page

@@ -25,12 +25,13 @@ #include "precompiled.hpp" #include "assembler_arm.inline.hpp" #include "code/codeCache.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_arm.hpp" +#include "compressedOops.inline.hpp" #include "oops/klass.inline.hpp" -#include "oops/oop.inline.hpp" +#include "oops/oop.hpp" #include "runtime/handles.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "utilities/ostream.hpp" #ifdef COMPILER1

@@ -103,11 +104,11 @@ if (si->is_movz()) { // narrow constant or ic call cached value uintptr_t nx = 0; int val_size = 32; if (oop_addr != NULL) {

•  narrowOop encoded_oop = oopDesc::encode_heap_oop(*oop_addr);

•  narrowOop encoded_oop = CompressedOops::encode(*oop_addr);
   nx = encoded_oop;

  } else if (metadata_addr != NULL) { assert((*metadata_addr)->is_klass(), "expected Klass"); narrowKlass encoded_k = Klass::encode_klass((Klass *)*metadata_addr); nx = encoded_k;

@@ -238,6 +239,5 @@ NativeCall* nativeCall_before(address return_address) { assert(NativeCall::is_call_before(return_address), "must be"); return nativeCall_at(call_for(return_address)); }

< prev index next >