Bug 1193459: Fix JS_DEPENDENT_TEMPLATE_HINT for clang-cl. r=jimb

--HG--
extra : rebase_source : 47c8c4d88946dfcbd5484b5ea7ebcb66c2c27537

js/public/TraceKind.h

@@ -98,7 +98,9 @@ JS_FOR_EACH_TRACEKIND(JS_EXPAND_DEF);
 // GCC and Clang require an explicit template declaration in front of the
 // specialization of operator() because it is a dependent template. MSVC, on
 // the other hand, gets very confused if we have a |template| token there.
-#ifdef _MSC_VER
+// The clang-cl front end defines _MSC_VER, but still requires the explicit
+// template declaration, so we must test for __clang__ here as well.
+#if defined(_MSC_VER) && !defined(__clang__)
 # define JS_DEPENDENT_TEMPLATE_HINT
 #else
 # define JS_DEPENDENT_TEMPLATE_HINT template

js/src/vm/UnboxedObject-inl.h

@@ -583,8 +583,8 @@ CopyBoxedOrUnboxedDenseElements(JSContext* cx, JSObject* dst, JSObject* src,
 // Dispatch to specialized methods based on the type of an object.
 /////////////////////////////////////////////////////////////////////
 
-// Goop to fix MSVC. See CallTyped in jsgc.h.
-#ifdef _MSC_VER
+// Goop to fix MSVC. See DispatchTraceKindTyped in TraceKind.h.
+#if defined(_MSC_VER) && !defined(__clang__)
 # define DEPENDENT_TEMPLATE_HINT
 #else
 # define DEPENDENT_TEMPLATE_HINT template