1.1 --- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -28,7 +28,7 @@
1.11 #include "interpreter/interpreter.hpp"
1.12 #include "nativeInst_sparc.hpp"
1.13 #include "oops/instanceOop.hpp"
1.14 -#include "oops/methodOop.hpp"
1.15 +#include "oops/method.hpp"
1.16 #include "oops/objArrayKlass.hpp"
1.17 #include "oops/oop.inline.hpp"
1.18 #include "prims/methodHandles.hpp"
1.19 @@ -3016,7 +3016,7 @@
1.20
1.21 BLOCK_COMMENT("arraycopy argument klass checks");
1.22 // get src->klass()
1.23 - if (UseCompressedOops) {
1.24 + if (UseCompressedKlassPointers) {
1.25 __ delayed()->nop(); // ??? not good
1.26 __ load_klass(src, G3_src_klass);
1.27 } else {
1.28 @@ -3051,7 +3051,7 @@
1.29 // Load 32-bits signed value. Use br() instruction with it to check icc.
1.30 __ lduw(G3_src_klass, lh_offset, G5_lh);
1.31
1.32 - if (UseCompressedOops) {
1.33 + if (UseCompressedKlassPointers) {
1.34 __ load_klass(dst, G4_dst_klass);
1.35 }
1.36 // Handle objArrays completely differently...
1.37 @@ -3059,7 +3059,7 @@
1.38 __ set(objArray_lh, O5_temp);
1.39 __ cmp(G5_lh, O5_temp);
1.40 __ br(Assembler::equal, false, Assembler::pt, L_objArray);
1.41 - if (UseCompressedOops) {
1.42 + if (UseCompressedKlassPointers) {
1.43 __ delayed()->nop();
1.44 } else {
1.45 __ delayed()->ld_ptr(dst, oopDesc::klass_offset_in_bytes(), G4_dst_klass);
