--- a/hotspot/src/share/vm/adlc/formssel.cpp	Thu Sep 22 18:23:15 2016 +0200
+++ b/hotspot/src/share/vm/adlc/formssel.cpp	Thu Sep 22 18:29:15 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -722,6 +722,11 @@
         // // unique def, some uses
         // // must return bottom unless all uses match def
         // unique = NULL;
+#ifdef S390
+        // This case is important for move instructions on s390x.
+        // On other platforms (e.g. x86), all uses always match the def.
+        unique = NULL;
+#endif
       }
     } else if( DEF_of_memory > 0 ) {
       // multiple defs, don't care about uses