--- a/hotspot/src/share/vm/adlc/formssel.cpp	Mon Jul 25 14:31:42 2016 -0700
+++ b/hotspot/src/share/vm/adlc/formssel.cpp	Wed Jul 20 12:34:11 2016 +0200
@@ -3647,14 +3647,14 @@
     // Check left operands
     if( (_lChild == NULL) && (mRule2->_lChild == NULL) ) {
       left_spillable = Maybe_cisc_spillable;
-    } else {
+    } else  if (_lChild != NULL) {
       left_spillable = _lChild->cisc_spill_match(globals, registers, mRule2->_lChild, operand, reg_type);
     }
 
     // Check right operands
     if( (_rChild == NULL) && (mRule2->_rChild == NULL) ) {
       right_spillable =  Maybe_cisc_spillable;
-    } else {
+    } else if (_rChild != NULL) {
       right_spillable = _rChild->cisc_spill_match(globals, registers, mRule2->_rChild, operand, reg_type);
     }