@@ -1678,7 +1678,6 @@ size_t Arguments::max_heap_for_compressed_oops() {
1678
1678
}
1679
1679
1680
1680
void Arguments::set_use_compressed_oops () {
1681
- #ifndef ZERO
1682
1681
#ifdef _LP64
1683
1682
// MaxHeapSize is not set up properly at this point, but
1684
1683
// the only value that can override MaxHeapSize if we are
@@ -1699,14 +1698,12 @@ void Arguments::set_use_compressed_oops() {
1699
1698
}
1700
1699
}
1701
1700
#endif // _LP64
1702
- #endif // ZERO
1703
1701
}
1704
1702
1705
1703
1706
1704
// NOTE: set_use_compressed_klass_ptrs() must be called after calling
1707
1705
// set_use_compressed_oops().
1708
1706
void Arguments::set_use_compressed_klass_ptrs () {
1709
- #ifndef ZERO
1710
1707
#ifdef _LP64
1711
1708
// On some architectures, the use of UseCompressedClassPointers implies the use of
1712
1709
// UseCompressedOops. The reason is that the rheap_base register of said platforms
@@ -1734,7 +1731,6 @@ void Arguments::set_use_compressed_klass_ptrs() {
1734
1731
}
1735
1732
}
1736
1733
#endif // _LP64
1737
- #endif // !ZERO
1738
1734
}
1739
1735
1740
1736
void Arguments::set_conservative_max_heap_alignment () {
@@ -1753,7 +1749,6 @@ jint Arguments::set_ergonomics_flags() {
1753
1749
1754
1750
set_conservative_max_heap_alignment ();
1755
1751
1756
- #ifndef ZERO
1757
1752
#ifdef _LP64
1758
1753
set_use_compressed_oops ();
1759
1754
@@ -1764,7 +1759,6 @@ jint Arguments::set_ergonomics_flags() {
1764
1759
// Also checks that certain machines are slower with compressed oops
1765
1760
// in vm_version initialization code.
1766
1761
#endif // _LP64
1767
- #endif // !ZERO
1768
1762
1769
1763
return JNI_OK;
1770
1764
}
@@ -4194,8 +4188,6 @@ jint Arguments::apply_ergo() {
4194
4188
// Clear flags not supported on zero.
4195
4189
FLAG_SET_DEFAULT (ProfileInterpreter, false );
4196
4190
FLAG_SET_DEFAULT (UseBiasedLocking, false );
4197
- LP64_ONLY (FLAG_SET_DEFAULT (UseCompressedOops, false ));
4198
- LP64_ONLY (FLAG_SET_DEFAULT (UseCompressedClassPointers, false ));
4199
4191
#endif // ZERO
4200
4192
4201
4193
if (PrintAssembly && FLAG_IS_DEFAULT (DebugNonSafepoints)) {
0 commit comments