--- a/hotspot/src/share/vm/memory/universe.hpp	Fri Apr 11 09:56:35 2008 -0400
+++ b/hotspot/src/share/vm/memory/universe.hpp	Sun Apr 13 17:43:42 2008 -0400
@@ -180,10 +180,13 @@
 
   // The particular choice of collected heap.
   static CollectedHeap* _collectedHeap;
+  // Base address for oop-within-java-object materialization.
+  // NULL if using wide oops.  Doubles as heap oop null value.
+  static address        _heap_base;
 
   // array of dummy objects used with +FullGCAlot
   debug_only(static objArrayOop _fullgc_alot_dummy_array;)
- // index of next entry to clear
+  // index of next entry to clear
   debug_only(static int         _fullgc_alot_dummy_next;)
 
   // Compiler/dispatch support
@@ -323,6 +326,10 @@
   // The particular choice of collected heap.
   static CollectedHeap* heap() { return _collectedHeap; }
 
+  // For UseCompressedOops
+  static address heap_base()       { return _heap_base; }
+  static address* heap_base_addr() { return &_heap_base; }
+
   // Historic gc information
   static size_t get_heap_capacity_at_last_gc()         { return _heap_capacity_at_last_gc; }
   static size_t get_heap_free_at_last_gc()             { return _heap_capacity_at_last_gc - _heap_used_at_last_gc; }