--- old/src/hotspot/share/opto/matcher.cpp	2018-12-10 13:45:18.430164500 -0800
+++ new/src/hotspot/share/opto/matcher.cpp	2018-12-10 13:45:17.874509300 -0800
@@ -2345,6 +2345,15 @@
         n->del_req(3);
         break;
       }
+      case Op_MulAddS2I: {
+        Node* pair1 = new BinaryNode(n->in(1), n->in(2));
+        Node* pair2 = new BinaryNode(n->in(3), n->in(4));
+        n->set_req(1, pair1);
+        n->set_req(2, pair2);
+        n->del_req(4);
+        n->del_req(3);
+        break;
+      }
       default:
         break;
       }