Bug 875342: fix JS channel-specific features to use the right build-time logic, r=sstangl
authorGavin Sharp <gavin@gavinsharp.com>
Fri, 24 May 2013 10:53:32 -0700
changeset 140529 c7aae5ead16f228ddc3b27ea4395257df1386206
parent 140528 fab554d11298336146df09d4f9464c624b61f767
child 140530 2ff67e9fc18285fbda9c134d3e16ef2a4bed2a60
push id3911
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 20:17:26 +0000
treeherdermozilla-aurora@7e26ca8db92b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssstangl
bugs875342
milestone24.0a1
Bug 875342: fix JS channel-specific features to use the right build-time logic, r=sstangl
js/src/Makefile.in
js/src/jstypedarray.cpp
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -63,20 +63,17 @@ VPATH		+= \
 #
 VPATH		+= \
 		$(srcdir)/../public \
 		$(NULL)
 
 ###############################################
 # BEGIN enable non-releasable features
 #
-ifeq (,$(filter beta release esr,$(MOZ_UPDATE_CHANNEL)))
-DEFINES += -DENABLE_TYPEDARRAY_MOVE
-endif
-ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL)))
+ifdef NIGHTLY_BUILD
 DEFINES += -DENABLE_PARALLEL_JS
 endif
 
 # Ion
 ifdef ENABLE_ION
 VPATH +=	$(srcdir)/ion
 VPATH +=	$(srcdir)/ion/shared
 
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -3368,17 +3368,17 @@ const JSFunctionSpec ArrayBufferObject::
     JS_FN("slice", ArrayBufferObject::fun_slice, 2, JSFUN_GENERIC_NATIVE),
     JS_FS_END
 };
 
 /*
  * TypedArray boilerplate
  */
 
-#ifdef ENABLE_TYPEDARRAY_MOVE
+#ifndef RELEASE_BUILD
 # define IMPL_TYPED_ARRAY_STATICS(_typedArray)                                 \
 const JSFunctionSpec _typedArray::jsfuncs[] = {                                \
     JS_FN("iterator", JS_ArrayIterator, 0, 0),                                 \
     JS_FN("subarray", _typedArray::fun_subarray, 2, JSFUN_GENERIC_NATIVE),     \
     JS_FN("set", _typedArray::fun_set, 2, JSFUN_GENERIC_NATIVE),               \
     JS_FN("move", _typedArray::fun_move, 3, JSFUN_GENERIC_NATIVE),             \
     JS_FS_END                                                                  \
 }