Mercurial > hg > graal-compiler

changeset 18238:4221c8332c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary padding in constants section.
author Roland Schatz <roland.schatz@oracle.com>
date Tue, 04 Nov 2014 14:06:35 +0100
parents 6924bb0badc9
children 691e2b53dc63
files src/share/vm/graal/graalCodeInstaller.cpp
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Tue Nov 04 13:08:52 2014 +0100
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Tue Nov 04 14:06:35 2014 +0100
@@ -473,7 +473,7 @@
 
   if (cb != NULL) {
     // Make sure the pre-calculated constants section size was correct.
-    guarantee((cb->code_begin() - cb->content_begin()) == _constants_size, err_msg("%d != %d", (int)(cb->code_begin() - cb->content_begin()), _constants_size));
+    guarantee((cb->code_begin() - cb->content_begin()) >= _constants_size, err_msg("%d < %d", (int)(cb->code_begin() - cb->content_begin()), _constants_size));
   }
   return result;
 }
@@ -502,9 +502,6 @@
   _data_section_handle = JNIHandles::make_local(HotSpotCompiledCode::dataSection(compiled_code));
   guarantee(HotSpotCompiledCode::dataSectionAlignment(compiled_code) <= _constants->alignment(), "Alignment inside constants section is restricted by alignment of section begin");
   _constants_size = data_section()->length();
-  if (_constants_size > 0) {
-    _constants_size = align_size_up(_constants_size, _constants->alignment());
-  }
 
   _data_section_patches_handle = JNIHandles::make_local(HotSpotCompiledCode::dataSectionPatches(compiled_code));