1.1 --- a/src/share/vm/code/stubs.cpp Thu Sep 20 16:49:17 2012 +0200
1.2 +++ b/src/share/vm/code/stubs.cpp Mon Sep 24 10:30:14 2012 -0700
1.3 @@ -101,7 +101,8 @@
1.4
1.5 Stub* StubQueue::request_committed(int code_size) {
1.6 Stub* s = request(code_size);
1.7 - if (s != NULL) commit(code_size);
1.8 + CodeComments comments;
1.9 + if (s != NULL) commit(code_size, comments);
1.10 return s;
1.11 }
1.12
1.13 @@ -118,7 +119,8 @@
1.14 assert(_buffer_limit == _buffer_size, "buffer must be fully usable");
1.15 if (_queue_end + requested_size <= _buffer_size) {
1.16 // code fits in at the end => nothing to do
1.17 - stub_initialize(s, requested_size);
1.18 + CodeComments comments;
1.19 + stub_initialize(s, requested_size, comments);
1.20 return s;
1.21 } else {
1.22 // stub doesn't fit in at the queue end
1.23 @@ -135,7 +137,8 @@
1.24 // Queue: |XXX|.......|XXXXXXX|.......|
1.25 // ^0 ^end ^begin ^limit ^size
1.26 s = current_stub();
1.27 - stub_initialize(s, requested_size);
1.28 + CodeComments comments;
1.29 + stub_initialize(s, requested_size, comments);
1.30 return s;
1.31 }
1.32 // Not enough space left
1.33 @@ -144,12 +147,12 @@
1.34 }
1.35
1.36
1.37 -void StubQueue::commit(int committed_code_size) {
1.38 +void StubQueue::commit(int committed_code_size, CodeComments& comments) {
1.39 assert(committed_code_size > 0, "committed_code_size must be > 0");
1.40 int committed_size = round_to(stub_code_size_to_size(committed_code_size), CodeEntryAlignment);
1.41 Stub* s = current_stub();
1.42 assert(committed_size <= stub_size(s), "committed size must not exceed requested size");
1.43 - stub_initialize(s, committed_size);
1.44 + stub_initialize(s, committed_size, comments);
1.45 _queue_end += committed_size;
1.46 _number_of_stubs++;
1.47 if (_mutex != NULL) _mutex->unlock();
