1.1 --- a/src/share/vm/memory/universe.hpp Thu Jan 27 13:42:28 2011 -0800 1.2 +++ b/src/share/vm/memory/universe.hpp Thu Jan 27 16:11:27 2011 -0800 1.3 @@ -139,7 +139,6 @@ 1.4 1.5 static klassOop _objectArrayKlassObj; 1.6 1.7 - static klassOop _symbolKlassObj; 1.8 static klassOop _methodKlassObj; 1.9 static klassOop _constMethodKlassObj; 1.10 static klassOop _methodDataKlassObj; 1.11 @@ -198,8 +197,6 @@ 1.12 // the vm thread. 1.13 static oop _vm_exception; 1.14 1.15 - static oop _emptySymbol; // Canonical empty string ("") symbol 1.16 - 1.17 // The particular choice of collected heap. 1.18 static CollectedHeap* _collectedHeap; 1.19 1.20 @@ -273,7 +270,6 @@ 1.21 return _typeArrayKlassObjs[t]; 1.22 } 1.23 1.24 - static klassOop symbolKlassObj() { return _symbolKlassObj; } 1.25 static klassOop methodKlassObj() { return _methodKlassObj; } 1.26 static klassOop constMethodKlassObj() { return _constMethodKlassObj; } 1.27 static klassOop methodDataKlassObj() { return _methodDataKlassObj; } 1.28 @@ -287,9 +283,8 @@ 1.29 static klassOop compiledICHolderKlassObj() { return _compiledICHolderKlassObj; } 1.30 static klassOop systemObjArrayKlassObj() { return _systemObjArrayKlassObj; } 1.31 1.32 - // Known objects in tbe VM 1.33 - static oop int_mirror() { return check_mirror(_int_mirror); 1.34 -} 1.35 + // Known objects in the VM 1.36 + static oop int_mirror() { return check_mirror(_int_mirror); } 1.37 static oop float_mirror() { return check_mirror(_float_mirror); } 1.38 static oop double_mirror() { return check_mirror(_double_mirror); } 1.39 static oop byte_mirror() { return check_mirror(_byte_mirror); } 1.40 @@ -327,7 +322,6 @@ 1.41 static oop arithmetic_exception_instance() { return _arithmetic_exception_instance; } 1.42 static oop virtual_machine_error_instance() { return _virtual_machine_error_instance; } 1.43 static oop vm_exception() { return _vm_exception; } 1.44 - static oop emptySymbol() { return _emptySymbol; } 1.45 1.46 // OutOfMemoryError support. Returns an error with the required message. The returned error 1.47 // may or may not have a backtrace. If error has a backtrace then the stack trace is already