/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 634914f47fd3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=634914f47fd3
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 17:48:59 2010 +0100

	PR icedtea/512: Use the pristine srcdir copy of generated.

	2010-07-12 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/521
		* Makefile.am: (SOURCEPATH_DIRS): The untainted srcdir
	version of generated should be used.


changeset 23c9af44a7d5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=23c9af44a7d5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 12 17:55:39 2010 +0100

	Merge


diffstat:

3 files changed, 14 insertions(+), 2 deletions(-)
ChangeLog                                         |   12 ++++++++++++
Makefile.am                                       |    2 +-
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp |    2 +-

diffs (43 lines):

diff -r 5a146f117f6d -r 23c9af44a7d5 ChangeLog
--- a/ChangeLog	Mon Jul 12 17:31:25 2010 +0100
+++ b/ChangeLog	Mon Jul 12 17:55:39 2010 +0100
@@ -1,3 +1,15 @@ 2010-07-12  Matthias Klose  <doko at ubuntu
+2010-07-12 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/521
+	* Makefile.am:
+	(SOURCEPATH_DIRS): The untainted srcdir
+	version of generated should be used.
+
+2010-07-12  Matthias Klose  <doko at ubuntu.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
+	(CreateInlineOop): Rename encoding to constant_encoding.
+
 2010-07-12  Matthias Klose  <doko at ubuntu.com>
 
 	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
diff -r 5a146f117f6d -r 23c9af44a7d5 Makefile.am
--- a/Makefile.am	Mon Jul 12 17:31:25 2010 +0100
+++ b/Makefile.am	Mon Jul 12 17:55:39 2010 +0100
@@ -91,7 +91,7 @@ OPENJDK_SOURCEPATH_DIRS = \
 OPENJDK_SOURCEPATH_DIRS = \
         $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS_COND)
 
-SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
+SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
 
 # Sources used from OpenJDK.
 if LACKS_SUN_AWT_TOOLKIT
diff -r 5a146f117f6d -r 23c9af44a7d5 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Mon Jul 12 17:31:25 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Mon Jul 12 17:55:39 2010 +0100
@@ -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,