--- a/src/hotspot/cpu/x86/x86_32.ad	Fri Dec 14 12:02:39 2018 +0100
+++ b/src/hotspot/cpu/x86/x86_32.ad	Fri Dec 14 12:56:57 2018 +0100
@@ -7760,9 +7760,9 @@
   match(Set dst (MulAddS2I (Binary dst src1) (Binary src2 src3)));
   effect(KILL cr, KILL src2);
 
-  expand %{ mulI_rReg(dst, src1, cr);
-           mulI_rReg(src2, src3, cr);
-           addI_rReg(dst, src2, cr); %}
+  expand %{ mulI_eReg(dst, src1, cr);
+           mulI_eReg(src2, src3, cr);
+           addI_eReg(dst, src2, cr); %}
 %}
 
 // Multiply Register Int to Long