/hg/release/icedtea6-1.7: Undefine Shark debug code for NDEBUG b...

[xranby at icedtea.classpath.org]

changeset 6dc81df0b056 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6dc81df0b056
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Feb 26 15:54:29 2010 +0100

	Undefine Shark debug code for NDEBUG builds

	2010-02-26 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::generate_native_code): Undefine debug code for
	NDEBUG builds


diffstat:

2 files changed, 8 insertions(+)
ChangeLog                                          |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    2 ++

diffs (32 lines):

diff -r d6610428db7d -r 6dc81df0b056 ChangeLog
--- a/ChangeLog	Wed Feb 24 23:30:18 2010 +0000
+++ b/ChangeLog	Fri Feb 26 15:54:29 2010 +0100
@@ -1,3 +1,9 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-26  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+        * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+        (SharkCompiler::generate_native_code): Undefine debug code for
+        NDEBUG builds
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add THANKYOU to
diff -r d6610428db7d -r 6dc81df0b056 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Wed Feb 24 23:30:18 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Feb 26 15:54:29 2010 +0100
@@ -250,6 +250,7 @@ void SharkCompiler::generate_native_code
 
     if (SharkPrintAsmOf != NULL) {
 #if SHARK_LLVM_VERSION >= 27
+#ifndef NDEBUG
       if (!fnmatch(SharkPrintAsmOf, name, 0)) {
         llvm::SetCurrentDebugType(X86_ONLY("x86-emitter") NOT_X86("jit"));
         llvm::DebugFlag = true;
@@ -258,6 +259,7 @@ void SharkCompiler::generate_native_code
         llvm::SetCurrentDebugType("");
         llvm::DebugFlag = false;
       }
+#endif
 #else
       // NB you need to patch LLVM with http://tinyurl.com/yf3baln for this
       std::vector<const char*> args;