--- a/hotspot/src/share/vm/opto/superword.cpp	Mon Oct 19 15:03:58 2015 +0200
+++ b/hotspot/src/share/vm/opto/superword.cpp	Thu Oct 22 13:07:10 2015 -0400
@@ -3665,7 +3665,7 @@
 }
 
 int SuperWord::mark_generations() {
-  Node *ii_err = 0, *tail_err;
+  Node *ii_err = NULL, *tail_err = NULL;
   for (int i = 0; i < _mem_slice_head.length(); i++) {
     Node* phi  = _mem_slice_head.at(i);
     assert(phi->is_Phi(), "must be phi");