/hg/icedtea6: 2 new changesets

[xranby at icedtea.classpath.org]

changeset 5be68dd68632 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5be68dd68632
author: Gary Benson <gbenson at redhat.com>
date: Wed May 12 11:16:47 2010 +0100

	LLVM 2.7 non-product fixes


changeset 87f0c2edefcf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=87f0c2edefcf
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Aug 05 13:45:36 2010 +0200

	Updated NEWS and ChangeLog with LLVM 2.7 non-product fixes.

	2010-08-05 Gary Benson <gbenson at redhat.com>

	 * NEWS: Updated with LLVM 2.7 non-product fixes.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Prevent
	LLVM headers to define DEBUG.
		* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::CreateDump): Make non-product debug code LLVM
	2.7 API compatible.


diffstat:

4 files changed, 31 insertions(+), 2 deletions(-)
ChangeLog                                         |    9 +++++++++
NEWS                                              |    1 +
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp  |   15 ++++++++++++++-
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp |    8 +++++++-

diffs (80 lines):

diff -r 9da4f50c13c0 -r 87f0c2edefcf ChangeLog
--- a/ChangeLog	Wed Aug 04 00:46:09 2010 +0100
+++ b/ChangeLog	Thu Aug 05 13:45:36 2010 +0200
@@ -1,3 +1,12 @@ 2010-08-03  Andrew John Hughes  <ahughes
+2010-08-05  Gary Benson  <gbenson at redhat.com>
+
+	* NEWS: Updated with LLVM 2.7 non-product fixes.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Prevent LLVM headers to define DEBUG.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::CreateDump): Make non-product debug code
+	LLVM 2.7 API compatible.
+
 2010-08-03  Andrew John Hughes  <ahughes at redhat.com>
 
 	Backport latest XRender pipeline.
diff -r 9da4f50c13c0 -r 87f0c2edefcf NEWS
--- a/NEWS	Wed Aug 04 00:46:09 2010 +0100
+++ b/NEWS	Thu Aug 05 13:45:36 2010 +0200
@@ -701,6 +701,7 @@ New in release 1.9 (2010-XX-XX):
   - Fix stack leak in Shark
   - PR494: Shark fails to catch Exception using catch (Throwable e)
   - PR525: Shark made not entrant deopt sigsegv regression after bump to b20 and hs17.
+  - LLVM 2.7 non-product fixes.
 * NetX
   - Do not use Look and Feel related methods for setting up security dialogs
   - Minor fixes to JNLPRandomAccessFile
diff -r 9da4f50c13c0 -r 87f0c2edefcf ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Aug 04 00:46:09 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Thu Aug 05 13:45:36 2010 +0200
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
 
 #ifdef assert
   #undef assert
+#endif
+
+#ifdef DEBUG
+  #define SHARK_DEBUG
+  #undef DEBUG
 #endif
 
 #include <llvm/Argument.h>
@@ -67,3 +72,11 @@
 #else
   #define assert(p, msg)
 #endif
+
+#ifdef DEBUG
+  #undef DEBUG
+#endif
+#ifdef SHARK_DEBUG
+  #define DEBUG
+  #undef SHARK_DEBUG
+#endif
diff -r 9da4f50c13c0 -r 87f0c2edefcf ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Wed Aug 04 00:46:09 2010 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Thu Aug 05 13:45:36 2010 +0200
@@ -498,7 +498,13 @@ CallInst* SharkBuilder::CreateDump(Value
 
   if (isa<PointerType>(value->getType()))
     value = CreatePtrToInt(value, SharkType::intptr_type());
-  else if (value->getType()->isInteger())
+  else if (value->getType()->
+#if SHARK_LLVM_VERSION >= 27
+           isIntegerTy()
+#else
+           isInteger()
+#endif
+           )
     value = CreateIntCast(value, SharkType::intptr_type(), false);
   else
     Unimplemented();