Shark and IcedTea7

[Andrew John Hughes]

I've forwardported the latest IcedTea6 changest to Shark to 7 and
pushed them.  However, I haven't been able to successfully build with
them.  The version of LLVM with which I was building was apparently
now too old.  It seems the latest SVN may be too new:

In file included from ../generated/incls/_sharkBuilder.cpp.incl:3,
                 from
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/sharkBuilder.cpp:27:
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::ConstantInt*
LLVMValue::jbyte_constant(jbyte)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:31:
error: 'class llvm::LLVMContext' has no member named 'getConstantInt'
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::ConstantInt*
LLVMValue::jint_constant(jint)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:39:
error: 'class llvm::LLVMContext' has no member named 'getConstantInt'
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::ConstantInt*
LLVMValue::jlong_constant(jlong)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:47:
error: 'class llvm::LLVMContext' has no member named 'getConstantInt'
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::Constant*
LLVMValue::jfloat_constant(jfloat)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:55:
error: 'class llvm::LLVMContext' has no member named 'getConstantFP'
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::Constant*
LLVMValue::jdouble_constant(jdouble)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:66:
error: 'class llvm::LLVMContext' has no member named 'getConstantFP'
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::ConstantInt*
LLVMValue::bit_constant(int)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:83:
error: 'class llvm::LLVMContext' has no member named 'getConstantInt'
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:
In static member function 'static llvm::ConstantInt*
LLVMValue::intptr_constant(intptr_t)':
/mnt/builder/shark7/openjdk-ecj/hotspot/src/share/vm/shark/llvmValue.hpp:91:
error: 'class llvm::LLVMContext' has no member named 'getConstantInt'
make[7]: *** [sharkCompiler.o] Error 1

There was a change to the file containing getConstantInt last Thursday:

------------------------------------------------------------------------
r77583 | evancheng | 2009-07-30 09:44:08 +0100 (Thu, 30 Jul 2009) | 4 lines

I've changed the semantics of MERGE_VALUES a bit. It's now allowed to
live until scheduling. It's deleted when the scheduler translate DAG
nodes to machine instructions.

This is currently used by X86 to handle atomic_load_add when the
output of the node is not used. I believe there is a better solution.
But I find MERGE_VALUES useful for selecting multi-output node when
the dead output can be selected as a IMPLICIT_DEF.

but this only seems to have altered a comment.

Any ideas?  I've pushed because I assume that those working with Shark
have been successfully building it even if I can't... :)
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8