RFC [patch] Fix Shark NDEBUG build

[Andrew John Hughes]

On 26 February 2010 14:47, Xerxes Rånby <xerxes at zafena.se> wrote:
> When building shark against a LLVM release build this can occour:
> g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32
> -DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles
> -I../generated/jvmtifiles
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/asm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/c1
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/ci
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/classfile
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/code -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/compiler
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/g1
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parNew
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/shared
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_interface
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/interpreter
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/memory
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/oops -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/prims
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/runtime
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/services
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/utilities
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/cpu/zero/vm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os/linux/vm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os_cpu/linux_zero/vm
> -I../generated -DHOTSPOT_RELEASE_VERSION="\"14.0-b16\""
> -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\""
> -DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_17-b17\""
> -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6
> 1.7+r398a7f03255b\"" -DDISTRIBUTION_ID="\"Built on Ubuntu lucid
> (development branch) (Fri Feb 26 15:26:43 CET 2010)\"" -DSHARK
> -I/usr/local/include -DNDEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
> -D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti
> -fno-exceptions -D_REENTRANT -fcheck-new -m32 -pipe -g -O3
> -fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith
> -Wsign-compare    -c -o sharkContext.o
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkContext.cpp
>
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:
> In member function 'void
> SharkCompiler::generate_native_code(SharkEntry*, llvm::Function*, const
> char*)':
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:254:
> error: expected unqualified-id before ';' token
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:255:
> error: 'DebugFlag' is not a member of 'llvm'
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:258:
> error: expected unqualified-id before ';' token
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:259:
> error: 'DebugFlag' is not a member of 'llvm'
>
> The attached patch fixes this issue:
>
>    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
>    (SharkCompiler::generate_native_code): Undefine debug code for
> NDEBUG builds
>
> Ok to push?
> Ok to push to icedtea6-1.7 release branch?
> Cheers
> Xerxes
>
>
>

Yes and yes.
-- 
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