--- a/src/hotspot/cpu/aarch64/aarch64.ad	Fri May 18 16:27:15 2018 +0800
+++ b/src/hotspot/cpu/aarch64/aarch64.ad	Fri May 18 13:23:28 2018 +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: