1.1 --- a/src/share/vm/opto/compile.cpp Mon Aug 23 09:09:36 2010 -0700
1.2 +++ b/src/share/vm/opto/compile.cpp Wed Aug 25 05:27:54 2010 -0700
1.3 @@ -400,7 +400,7 @@
1.4 }
1.5
1.6 // Initialize the relocation buffers
1.7 - relocInfo* locs_buf = (relocInfo*) blob->instructions_end() - MAX_locs_size;
1.8 + relocInfo* locs_buf = (relocInfo*) blob->content_end() - MAX_locs_size;
1.9 set_scratch_locs_memory(locs_buf);
1.10 }
1.11
1.12 @@ -422,9 +422,9 @@
1.13 assert(blob != NULL, "Initialize BufferBlob at start");
1.14 assert(blob->size() > MAX_inst_size, "sanity");
1.15 relocInfo* locs_buf = scratch_locs_memory();
1.16 - address blob_begin = blob->instructions_begin();
1.17 + address blob_begin = blob->content_begin();
1.18 address blob_end = (address)locs_buf;
1.19 - assert(blob->instructions_contains(blob_end), "sanity");
1.20 + assert(blob->content_contains(blob_end), "sanity");
1.21 CodeBuffer buf(blob_begin, blob_end - blob_begin);
1.22 buf.initialize_consts_size(MAX_const_size);
1.23 buf.initialize_stubs_size(MAX_stubs_size);
1.24 @@ -433,7 +433,7 @@
1.25 buf.insts()->initialize_shared_locs(&locs_buf[0], lsize);
1.26 buf.stubs()->initialize_shared_locs(&locs_buf[lsize], lsize);
1.27 n->emit(buf, this->regalloc());
1.28 - return buf.code_size();
1.29 + return buf.insts_size();
1.30 }
1.31
1.32
