Title: [229432] trunk/Source/_javascript_Core
- Revision
- 229432
- Author
- [email protected]
- Date
- 2018-03-08 13:44:52 -0800 (Thu, 08 Mar 2018)
Log Message
Unreviewed, another attempt at fixing the Windows build.
I guess the pragma must be outside the function...
* jit/CCallHelpers.h:
(JSC::CCallHelpers::clampArrayToSize):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (229431 => 229432)
--- trunk/Source/_javascript_Core/ChangeLog 2018-03-08 21:35:38 UTC (rev 229431)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-03-08 21:44:52 UTC (rev 229432)
@@ -1,5 +1,13 @@
2018-03-08 Keith Miller <[email protected]>
+ Unreviewed, another attempt at fixing the Windows build.
+ I guess the pragma must be outside the function...
+
+ * jit/CCallHelpers.h:
+ (JSC::CCallHelpers::clampArrayToSize):
+
+2018-03-08 Keith Miller <[email protected]>
+
Unreviewed, one last try at fixing the windows build before rollout.
* jit/CCallHelpers.h:
Modified: trunk/Source/_javascript_Core/jit/CCallHelpers.h (229431 => 229432)
--- trunk/Source/_javascript_Core/jit/CCallHelpers.h 2018-03-08 21:35:38 UTC (rev 229431)
+++ trunk/Source/_javascript_Core/jit/CCallHelpers.h 2018-03-08 21:44:52 UTC (rev 229432)
@@ -248,15 +248,17 @@
std::array<FPRReg, FPRInfo::numberOfRegisters> fprDestinations;
};
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4701)
+#endif
+
template<unsigned TargetSize, typename RegType>
std::array<RegType, TargetSize> clampArrayToSize(std::array<RegType, InfoTypeForReg<RegType>::numberOfRegisters> sourceArray)
{
static_assert(TargetSize <= sourceArray.size(), "TargetSize is bigger than source.size()");
RELEASE_ASSERT(TargetSize <= InfoTypeForReg<RegType>::numberOfRegisters);
-#if COMPILER(MSVC)
-#pragma warning(push)
-#pragma warning(disable: 4701)
-#endif
+
std::array<RegType, TargetSize> result;
for (unsigned i = 0; i < TargetSize; i++) {
@@ -265,10 +267,11 @@
}
return result;
+ }
+
#if COMPILER(MSVC)
#pragma warning(pop)
#endif
- }
template<typename ArgType>
ALWAYS_INLINE void pokeForArgument(ArgType arg, unsigned currentGPRArgument, unsigned currentFPRArgument, unsigned extraPoke)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
