shark build failure on icedtea7 trunk

[Matthias Klose]

On 12.07.2010 10:41, Gary Benson wrote:
> Matthias Klose wrote:
>> after fixing the zero build failure, shark fails to build (llvm-2.7):
>>
>> In file included from ../generated/incls/_sharkBuilder.cpp.incl:10,
>>                   from
>> build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.cpp:27:
>> build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp: In
>> member function 'llvm::Value* SharkBuilder::CreateInlineOop(ciObject*,
>> const char*)':
>> build/zerovm/openjdk/hotspot/src/share/vm/shark/sharkBuilder.hpp:195:
>> error: 'class ciObject' has no member named 'encoding'
>
> It should be constant_encoding, or something like that.
> The names were changed in some version or another of HotSpot.
> Hopefully when it's upstream all of this will go away :)

ok, thanks. The following fixes the build. ok to checkin this and the other zero 
fix?

diff -r b18f5ecf2522 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Mon Jul 12 11:24:29 2010 
+0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Mon Jul 12 12:27:52 2010 
+0200
@@ -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,