Mercurial > hg > release > icedtea6-1.4
changeset 1017:1ff78f827345
2008-08-14 Andrew Haley <aph@redhat.com>
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
(SharkBuilder::SharkBuilder): Fix syntax error on template class
name.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (class
SharkBuilder): Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.hpp (class
SharkValue): Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
(SharkCompiler::compile_method): Properly declare temporaries.
| author | Andrew Haley <aph@redhat.com> |
|---|---|
| date | Thu, 14 Aug 2008 17:00:18 +0100 |
| parents | 626751ee178e |
| children | f8dc8a133c2a |
| files | ChangeLog ports/hotspot/src/share/vm/shark/sharkBuilder.cpp ports/hotspot/src/share/vm/shark/sharkBuilder.hpp ports/hotspot/src/share/vm/shark/sharkCompiler.cpp ports/hotspot/src/share/vm/shark/sharkValue.hpp |
| diffstat | 5 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 14 11:14:26 2008 -0400 +++ b/ChangeLog Thu Aug 14 17:00:18 2008 +0100 @@ -1,3 +1,16 @@ +2008-08-14 Andrew Haley <aph@redhat.com> + + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::SharkBuilder): Fix syntax error on template class + name. + * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp (class + SharkBuilder): Likewise. + * ports/hotspot/src/share/vm/shark/sharkValue.hpp (class + SharkValue): Likewise. + + * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp + (SharkCompiler::compile_method): Properly declare temporaries. + 2008-08-14 Lillian Angel <langel@redhat.com> * acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 14 11:14:26 2008 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 14 17:00:18 2008 +0100 @@ -29,7 +29,7 @@ using namespace llvm; SharkBuilder::SharkBuilder() - : IRBuilder(), + : IRBuilder<>(), _module("shark"), _module_provider(module()), _execution_engine(ExecutionEngine::create(&_module_provider))
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Aug 14 11:14:26 2008 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp Thu Aug 14 17:00:18 2008 +0100 @@ -23,7 +23,7 @@ * */ -class SharkBuilder : public llvm::IRBuilder { +class SharkBuilder : public llvm::IRBuilder<> { public: SharkBuilder();
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu Aug 14 11:14:26 2008 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp Thu Aug 14 17:00:18 2008 +0100 @@ -101,9 +101,11 @@ function.function()->dump(); } if (SharkTraceInstalls) { + uint32_t *start = NULL; + uint32_t *limit = NULL; #ifdef PPC - uint32_t *start = *(uint32_t **) bb->instructions_begin(); - uint32_t *limit = start; + start = *(uint32_t **) bb->instructions_begin(); + limit = start; while (*limit) limit++; #else
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp Thu Aug 14 11:14:26 2008 -0400 +++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp Thu Aug 14 17:00:18 2008 +0100 @@ -182,7 +182,7 @@ { return llvm_value(); } - llvm::Value* intptr_value(llvm::IRBuilder* builder) const + llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const { assert(is_jobject(), "should be"); return builder->CreatePtrToInt(llvm_value(), SharkType::intptr_type());