Remove the workaround added in bug 1233732 now that the LLVM bug is fixed
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 05 Feb 2016 21:31:50 -0500
changeset 283383 4892358dbf20a8568090837d3f3a14d112c3829b
parent 283381 7f92cfae10ece85f43af6ff87c2dde9335713212
child 283384 3ba0bf1011206023969443c1c4a65dbb0a996f99
push id29980
push userphilringnalda@gmail.com
push dateSun, 07 Feb 2016 23:30:48 +0000
treeherdermozilla-central@1cfe34ea394c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1233732, 25875
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Remove the workaround added in bug 1233732 now that the LLVM bug is fixed The LLVM bug in question: https://llvm.org/bugs/show_bug.cgi?id=25875
js/src/jit/MacroAssembler.h
--- a/js/src/jit/MacroAssembler.h
+++ b/js/src/jit/MacroAssembler.h
@@ -164,25 +164,18 @@
 # define DEFINED_ON_EXPAND_ARCH_RESULTS(ParenResult)    \
     DEFINED_ON_EXPAND_ARCH_RESULTS_2 (ParenResult)
 
 # define DEFINED_ON_FWDARCH(Arch) DEFINED_ON_ ## Arch
 # define DEFINED_ON_MAP_ON_ARCHS(ArchList)              \
     DEFINED_ON_EXPAND_ARCH_RESULTS(                     \
       (MOZ_FOR_EACH(DEFINED_ON_FWDARCH, (), ArchList)))
 
-// clang-cl doesn't exactly follow MSVC's custom rules for handling
-// __VA_ARGS__ in macros (see LLVM PR 25875), so avoid using this macro
-// there.
-#if defined(_MSC_VER) && defined(__clang__)
-# define DEFINED_ON(...) /* nothing */
-#else
 # define DEFINED_ON(...)                                \
     DEFINED_ON_MAP_ON_ARCHS((none, __VA_ARGS__))
-#endif
 
 # define PER_ARCH DEFINED_ON(ALL_ARCH)
 # define PER_SHARED_ARCH DEFINED_ON(ALL_SHARED_ARCH)
 
 
 #ifdef IS_LITTLE_ENDIAN
 #define IMM32_16ADJ(X) X << 16
 #else