changeset in /hg/icedtea6: 2008-08-14 Andrew Haley <aph at redhat...

[Andrew Haley]

changeset 1ff78f827345 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1ff78f827345
description:
	2008-08-14  Andrew Haley  <aph at 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.

diffstat:

5 files changed, 20 insertions(+), 5 deletions(-)
ChangeLog                                          |   13 +++++++++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp  |    2 +-
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp  |    2 +-
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    6 ++++--
ports/hotspot/src/share/vm/shark/sharkValue.hpp    |    2 +-

diffs (73 lines):

diff -r 626751ee178e -r 1ff78f827345 ChangeLog
--- 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  Lillian Angel  <langel at redha
+2008-08-14  Andrew Haley  <aph at 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 at redhat.com>
 
 	* acinclude.m4: Changed LIBGCJ_JAR check to be less stringent with 
diff -r 626751ee178e -r 1ff78f827345 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- 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;
 using namespace llvm;
 
 SharkBuilder::SharkBuilder()
-    : IRBuilder(),
+  : IRBuilder<>(),
       _module("shark"),
       _module_provider(module()),
       _execution_engine(ExecutionEngine::create(&_module_provider))
diff -r 626751ee178e -r 1ff78f827345 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- 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();
 
diff -r 626751ee178e -r 1ff78f827345 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- 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 @@ void SharkCompiler::compile_method(ciEnv
       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
diff -r 626751ee178e -r 1ff78f827345 ports/hotspot/src/share/vm/shark/sharkValue.hpp
--- 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 @@ class SharkValue : public ResourceObj {
   {
     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());