--- old/src/hotspot/share/c1/c1_CodeStubs.hpp	2019-12-20 00:56:35.000000000 +0300
+++ new/src/hotspot/share/c1/c1_CodeStubs.hpp	2019-12-20 00:56:35.000000000 +0300
@@ -123,7 +123,7 @@
  public:
   ConversionStub(Bytecodes::Code bytecode, LIR_Opr input, LIR_Opr result)
     : _bytecode(bytecode), _input(input), _result(result) {
-    NOT_IA32( assert(false, "used only by x86-32"); )
+    NOT_IA32( ShouldNotReachHere(); ) // used only on x86-32
   }
 
   Bytecodes::Code bytecode() { return _bytecode; }
--- old/src/hotspot/share/c1/c1_LinearScan.cpp	2019-12-20 00:56:35.000000000 +0300
+++ new/src/hotspot/share/c1/c1_LinearScan.cpp	2019-12-20 00:56:35.000000000 +0300
@@ -2779,7 +2779,7 @@
 
       assert(opr->fpu_regnrLo() == opr->fpu_regnrHi(), "assumed in calculation (only fpu_regnrLo is used)");
 #endif
-#ifdef IA64
+#ifdef AMD64
       assert(false, "FPU not used on x86-64");
 #endif
 #ifdef SPARC