--- old/src/cpu/aarch64/vm/c1_LIR_aarch64.cpp	2016-07-12 14:03:56.708565653 +0200
+++ new/src/cpu/aarch64/vm/c1_LIR_aarch64.cpp	2016-07-12 14:03:56.648565651 +0200
@@ -36,7 +36,7 @@
 
 // Reg2 unused.
 LIR_Opr LIR_OprFact::double_fpu(int reg1, int reg2) {
-  assert(reg2 == fnoreg->encoding(), "Not used on this platform");
+  assert(as_FloatRegister(reg2) == fnoreg, "Not used on this platform");
   return (LIR_Opr)(intptr_t)((reg1 << LIR_OprDesc::reg1_shift) |
                              (reg1 << LIR_OprDesc::reg2_shift) |
                              LIR_OprDesc::double_type          |