--- old/src/share/vm/opto/regmask.hpp	2016-07-11 22:46:53.816351817 +0900
+++ new/src/share/vm/opto/regmask.hpp	2016-07-11 22:46:53.679352297 +0900
@@ -26,6 +26,7 @@
 #define SHARE_VM_OPTO_REGMASK_HPP
 
 #include "code/vmreg.hpp"
+#include "opto/opcodes.hpp"
 #include "opto/optoreg.hpp"
 
 // Some fun naming (textual) substitutions:
@@ -194,7 +195,7 @@
   // Test for a single adjacent pair
   int is_bound_pair() const;
   // Test for a single adjacent set of ideal register's size.
-  int is_bound(uint ireg) const {
+  int is_bound(Opcodes ireg) const {
     if (is_vector(ireg)) {
       if (is_bound_set(num_registers(ireg)))
         return true;
@@ -224,8 +225,8 @@
   // Test for a single adjacent set
   int is_bound_set(const int size) const;
 
-  static bool is_vector(uint ireg);
-  static int num_registers(uint ireg);
+  static bool is_vector(Opcodes ireg);
+  static int num_registers(Opcodes ireg);
 
   // Fast overlap test.  Non-zero if any registers in common.
   int overlap( const RegMask &rm ) const {