/hg/icedtea6: 2010-06-25 Matthias Klose <doko at ubuntu.com>

[doko at icedtea.classpath.org]

changeset 2abd775a9d46 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2abd775a9d46
author: doko at ubuntu.com
date: Fri Jun 25 12:24:35 2010 +0200

	2010-06-25 Matthias Klose <doko at ubuntu.com>

	 Fix shark build failures, update for latest HotSpot taken
	from
	http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188
	        * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Update.
	        * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update.
	        * ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update.


diffstat:

4 files changed, 11 insertions(+), 2 deletions(-)
ChangeLog                                            |    8 ++++++++
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp |    1 +
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp    |    2 +-
ports/hotspot/src/share/vm/shark/sharkConstant.cpp   |    2 +-

diffs (50 lines):

diff -r 1c22941d9896 -r 2abd775a9d46 ChangeLog
--- a/ChangeLog	Thu Jun 24 21:30:07 2010 +0100
+++ b/ChangeLog	Fri Jun 25 12:24:35 2010 +0200
@@ -1,3 +1,11 @@ 2010-06-24 Andrew John Hughes  <ahughes@
+2010-06-25 Matthias Klose  <doko at ubuntu.com>
+
+	Fix shark build failures, update for latest HotSpot taken from
+	http://icedtea.classpath.org/hg/shark/hotspot/rev/3236ce90f188
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Update.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Update.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Update.
+
 2010-06-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 1c22941d9896 -r 2abd775a9d46 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Thu Jun 24 21:30:07 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Fri Jun 25 12:24:35 2010 +0200
@@ -47,6 +47,7 @@ define_pd_global(intx,     Tier4BackEdge
 
 define_pd_global(intx,     OnStackReplacePercentage,     933  );
 define_pd_global(intx,     FreqInlineSize,               325  );
+define_pd_global(intx,     InlineSmallCode,              1000 );
 define_pd_global(intx,     NewRatio,                     12   );
 define_pd_global(intx,     NewSizeThreadIncrease,        4*K  );
 define_pd_global(intx,     InitialCodeCacheSize,         160*K);
diff -r 1c22941d9896 -r 2abd775a9d46 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Thu Jun 24 21:30:07 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Fri Jun 25 12:24:35 2010 +0200
@@ -192,7 +192,7 @@ class SharkBuilder : public llvm::IRBuil
   llvm::Value* code_buffer_address(int offset);
   llvm::Value* CreateInlineOop(jobject object, const char* name = "");
   llvm::Value* CreateInlineOop(ciObject* object, const char* name = "") {
-    return CreateInlineOop(object->encoding(), name);
+    return CreateInlineOop(object->constant_encoding(), name);
   }
   llvm::Value* CreateInlineData(void*             data,
                                 size_t            size,
diff -r 1c22941d9896 -r 2abd775a9d46 ports/hotspot/src/share/vm/shark/sharkConstant.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkConstant.cpp	Thu Jun 24 21:30:07 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkConstant.cpp	Fri Jun 25 12:24:35 2010 +0200
@@ -114,7 +114,7 @@ SharkConstant::SharkConstant(ciConstant 
     }
     object = klass->java_mirror();
   }
-  if (object->is_null_object() || !object->has_encoding()) {
+  if (object->is_null_object() || !object->can_be_constant()) {
     _is_loaded = false;
     return;
   }