@@ -1678,7 +1678,6 @@ size_t Arguments::max_heap_for_compressed_oops() {
16781678}
16791679
16801680void Arguments::set_use_compressed_oops () {
1681- #ifndef ZERO
16821681#ifdef _LP64
16831682 // MaxHeapSize is not set up properly at this point, but
16841683 // the only value that can override MaxHeapSize if we are
@@ -1699,14 +1698,12 @@ void Arguments::set_use_compressed_oops() {
16991698 }
17001699 }
17011700#endif // _LP64
1702- #endif // ZERO
17031701}
17041702
17051703
17061704// NOTE: set_use_compressed_klass_ptrs() must be called after calling
17071705// set_use_compressed_oops().
17081706void Arguments::set_use_compressed_klass_ptrs () {
1709- #ifndef ZERO
17101707#ifdef _LP64
17111708 // On some architectures, the use of UseCompressedClassPointers implies the use of
17121709 // UseCompressedOops. The reason is that the rheap_base register of said platforms
@@ -1734,7 +1731,6 @@ void Arguments::set_use_compressed_klass_ptrs() {
17341731 }
17351732 }
17361733#endif // _LP64
1737- #endif // !ZERO
17381734}
17391735
17401736void Arguments::set_conservative_max_heap_alignment () {
@@ -1753,7 +1749,6 @@ jint Arguments::set_ergonomics_flags() {
17531749
17541750 set_conservative_max_heap_alignment ();
17551751
1756- #ifndef ZERO
17571752#ifdef _LP64
17581753 set_use_compressed_oops ();
17591754
@@ -1764,7 +1759,6 @@ jint Arguments::set_ergonomics_flags() {
17641759 // Also checks that certain machines are slower with compressed oops
17651760 // in vm_version initialization code.
17661761#endif // _LP64
1767- #endif // !ZERO
17681762
17691763 return JNI_OK;
17701764}
@@ -4194,8 +4188,6 @@ jint Arguments::apply_ergo() {
41944188 // Clear flags not supported on zero.
41954189 FLAG_SET_DEFAULT (ProfileInterpreter, false );
41964190 FLAG_SET_DEFAULT (UseBiasedLocking, false );
4197- LP64_ONLY (FLAG_SET_DEFAULT (UseCompressedOops, false ));
4198- LP64_ONLY (FLAG_SET_DEFAULT (UseCompressedClassPointers, false ));
41994191#endif // ZERO
42004192
42014193 if (PrintAssembly && FLAG_IS_DEFAULT (DebugNonSafepoints)) {
0 commit comments