Mercurial > hg > release > icedtea7-2.2

changeset 2283:23c9af44a7d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 12 Jul 2010 17:55:39 +0100
parents 634914f47fd3 (current diff) dfc49680a3ab (diff)
children ebc77668bad5
files ChangeLog
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jul 12 17:48:59 2010 +0100
+++ b/ChangeLog	Mon Jul 12 17:55:39 2010 +0100
@@ -7,6 +7,11 @@
 
 2010-07-12  Matthias Klose  <doko@ubuntu.com>
 
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+	(CreateInlineOop): Rename encoding to constant_encoding.
+
+2010-07-12  Matthias Klose  <doko@ubuntu.com>
+
 	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
 	Set MaxRAM.
 
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Mon Jul 12 17:48:59 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Mon Jul 12 17:55:39 2010 +0100
@@ -192,7 +192,7 @@
   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,