--- old/src/hotspot/cpu/aarch64/aarch64.ad	2018-05-09 09:40:17.589581492 +0300
+++ new/src/hotspot/cpu/aarch64/aarch64.ad	2018-05-09 09:40:17.485574876 +0300
@@ -3665,7 +3665,7 @@
 
 // Are floats converted to double when stored to stack during
 // deoptimization?
-bool Matcher::float_in_double() { return true; }
+bool Matcher::float_in_double() { return false; }
 
 // Do ints take an entire long register or just half?
 // The relevant question is how the int is callee-saved: