Commit 0e32561a authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 754557 - Fix building with --enable-methodjit-spew without --enable-debug. r=dmandelin

parent fe881f4e

js/src/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ CPPSRCS += ExecutableAllocator.cpp \ 
		YarrSyntaxChecker.cpp \

		$(NONE)



ifdef MOZ_DEBUG

ifdef ENABLE_METHODJIT_SPEW

CPPSRCS += Logging.cpp

endif

js/src/config/autoconf.mk.in

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ VISIBILITY_FLAGS = @VISIBILITY_FLAGS@ 
WRAP_SYSTEM_INCLUDES = @WRAP_SYSTEM_INCLUDES@



ENABLE_METHODJIT = @ENABLE_METHODJIT@

ENABLE_METHODJIT_SPEW = @ENABLE_METHODJIT_SPEW@

HAVE_ARM_SIMD= @HAVE_ARM_SIMD@



JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@

js/src/configure.in

+6 −4
Original line number Diff line number Diff line
@@ -2668,6 +2668,7 @@ MOZ_ARG_ENABLE_BOOL(methodjit-spew, 
  ENABLE_METHODJIT_SPEW= )



AC_SUBST(ENABLE_METHODJIT)

AC_SUBST(ENABLE_METHODJIT_SPEW)



if test "$ENABLE_METHODJIT"; then

    AC_DEFINE(JS_METHODJIT)
@@ -2685,10 +2686,6 @@ if test "$ENABLE_METHODJIT_TYPED_ARRAY"; then 
    AC_DEFINE(JS_METHODJIT_TYPED_ARRAY)

fi



if test "$ENABLE_METHODJIT_SPEW"; then

    AC_DEFINE(JS_METHODJIT_SPEW)

fi



if test -z "$SKIP_COMPILER_CHECKS"; then

dnl Checks for typedefs, structures, and compiler characteristics.

dnl ========================================================
@@ -3882,6 +3879,7 @@ MOZ_ARG_ENABLE_STRING(debug, 
                           (using compiler flags DBG)],

[ if test "$enableval" != "no"; then

    MOZ_DEBUG=1

    ENABLE_METHODJIT_SPEW=1

    if test -n "$enableval" -a "$enableval" != "yes"; then

        MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`

        _MOZ_DEBUG_FLAGS_SET=1
@@ -3917,6 +3915,10 @@ if test -n "$MOZ_DEBUG"; then 
    CFLAGS=$_SAVE_CFLAGS

fi



if test "$ENABLE_METHODJIT_SPEW"; then

    AC_DEFINE(JS_METHODJIT_SPEW)

fi



dnl ========================================================

dnl = Enable code optimization. ON by default.

dnl ========================================================

js/src/jsanalyze.cpp

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ ScriptAnalysis::analyzeLifetimes(JSContext *cx) 
    ranLifetimes_ = true;

}



#ifdef DEBUG

#ifdef JS_METHODJIT_SPEW

void

LifetimeVariable::print() const

{

js/src/jsanalyze.h

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ struct LifetimeVariable 
        return offset;

    }



#ifdef DEBUG

#ifdef JS_METHODJIT_SPEW

    void print() const;

#endif

};