src/cpu/x86/vm/stubGenerator_x86_64.cpp

@@ -4268,21 +4268,22 @@
       StubRoutines::_squareToLen = generate_squareToLen();
     }
     if (UseMulAddIntrinsic) {
       StubRoutines::_mulAdd = generate_mulAdd();
     }
-
-#ifndef _WINDOWS
+    
+// Visual Studio 2017 (and higher) has the compiler instrinisics required
+#if !(defined(_WINDOWS) && _MSC_VER < 1910)
     if (UseMontgomeryMultiplyIntrinsic) {
       StubRoutines::_montgomeryMultiply
         = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_multiply);
     }
     if (UseMontgomerySquareIntrinsic) {
       StubRoutines::_montgomerySquare
         = CAST_FROM_FN_PTR(address, SharedRuntime::montgomery_square);
     }
-#endif // WINDOWS
+    #endif //! VC++ < 2017
 #endif // COMPILER2
   }
 
  public:
   StubGenerator(CodeBuffer* code, bool all) : StubCodeGenerator(code) {