# HG changeset patch
# User coleenp
# Date 1329430780 18000
# Node ID df4927a3b82e2ea98d3e34eb7a3687464cce1509
# Parent  4a24c4f648bdf4bac1f5f4451c53b6f149139aa6# Parent  7df3125953cb8936cdfef85f2cb9379f4209c8ec
Merge

diff -r 4a24c4f648bd -r df4927a3b82e src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Feb 16 13:50:54 2012 -0500
+++ b/src/share/vm/runtime/arguments.cpp	Thu Feb 16 17:19:40 2012 -0500
@@ -1370,12 +1370,9 @@
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
 #if !defined(COMPILER1) || defined(TIERED)
-// disable UseCompressedOops by default on MacOS X until 7118647 is fixed
-#ifndef __APPLE__
     if (FLAG_IS_DEFAULT(UseCompressedOops)) {
       FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
-#endif // !__APPLE__
 #endif
 #ifdef _WIN64
     if (UseLargePages && UseCompressedOops) {
diff -r 4a24c4f648bd -r df4927a3b82e src/share/vm/runtime/virtualspace.cpp
--- a/src/share/vm/runtime/virtualspace.cpp	Thu Feb 16 13:50:54 2012 -0500
+++ b/src/share/vm/runtime/virtualspace.cpp	Thu Feb 16 17:19:40 2012 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -455,7 +455,7 @@
 
 void ReservedSpace::protect_noaccess_prefix(const size_t size) {
   assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL &&
-                                      (size_t(_base + _size) > OopEncodingHeapMax) &&
+                                      (Universe::narrow_oop_base() != NULL) &&
                                       Universe::narrow_oop_use_implicit_null_checks()),
          "noaccess_prefix should be used only with non zero based compressed oops");