comparison src/share/vm/oops/compiledICHolderKlass.cpp @ 1713:7fcd5f39bd7a

Merge
author johnc
date Sat, 14 Aug 2010 00:47:52 -0700
parents 126ea7725993 9d7a8ab3736b
children f95d63e2154a
comparison
equal deleted inserted replaced
1695:21e519b91576 1713:7fcd5f39bd7a
118 obj->adjust_header(); 118 obj->adjust_header();
119 return size; 119 return size;
120 } 120 }
121 121
122 #ifndef SERIALGC 122 #ifndef SERIALGC
123 void compiledICHolderKlass::oop_copy_contents(PSPromotionManager* pm, oop obj) {
124 assert(obj->is_compiledICHolder(), "must be compiledICHolder");
125 }
126
127 void compiledICHolderKlass::oop_push_contents(PSPromotionManager* pm, oop obj) { 123 void compiledICHolderKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
128 assert(obj->is_compiledICHolder(), "must be compiledICHolder"); 124 assert(obj->is_compiledICHolder(), "must be compiledICHolder");
129 } 125 }
130 126
131 int compiledICHolderKlass::oop_update_pointers(ParCompactionManager* cm, 127 int compiledICHolderKlass::oop_update_pointers(ParCompactionManager* cm,