Mercurial > hg > release > icedtea7-2.2
changeset 2249:1de4376d0732
PR icedtea/323: Remove now unnecessary hack.
2010-05-11 Gary Benson <gbenson@redhat.com>
PR icedtea/323
* patches/hotspot/default/icedtea-shark.patch
(Deoptimization::create_vframeArray):
Remove a now-unnecessary hack.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Wed, 09 Jun 2010 17:42:58 +0100 |
| parents | a044595518ad |
| children | 1852744c5c16 |
| files | ChangeLog patches/hotspot/default/icedtea-shark.patch |
| diffstat | 2 files changed, 6 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 09 17:37:28 2010 +0100 +++ b/ChangeLog Wed Jun 09 17:42:58 2010 +0100 @@ -1,3 +1,9 @@ +2010-05-11 Gary Benson <gbenson@redhat.com> + + * patches/hotspot/default/icedtea-shark.patch + (Deoptimization::create_vframeArray): + Remove a now-unnecessary hack. + 2010-05-10 Gary Benson <gbenson@redhat.com> PR icedtea/323
--- a/patches/hotspot/default/icedtea-shark.patch Wed Jun 09 17:37:28 2010 +0100 +++ b/patches/hotspot/default/icedtea-shark.patch Wed Jun 09 17:42:58 2010 +0100 @@ -279,27 +279,6 @@ UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord, caller_adjustment * BytesPerWord, -@@ -921,7 +928,20 @@ - // stuff a C2I adapter we can properly fill in the callee-save - // register locations. - frame caller = fr.sender(reg_map); -+#ifdef ZERO -+ int frame_size; -+ { -+ // In zero, frame::sp() is the *end* of the frame, so -+ // caller.sp() - fr.sp() is the size of the *caller*. -+ RegisterMap dummy_map(thread, false); -+ frame frame_1 = thread->last_frame(); -+ frame frame_2 = frame_1.sender(&dummy_map); -+ assert(frame_2.sp() == fr.sp(), "should be"); -+ frame_size = frame_2.sp() - frame_1.sp(); -+ } -+#else - int frame_size = caller.sp() - fr.sp(); -+#endif // ZERO - - frame sender = caller; - @@ -1073,7 +1093,7 @@ JRT_END