src/share/vm/opto/loopUnswitch.cpp

@@ -171,11 +171,11 @@
   for (DUIterator_Fast imax, i = unswitch_iff->fast_outs(imax); i < imax; i++) {
     ProjNode* proj= unswitch_iff->fast_out(i)->as_Proj();
     // Copy to a worklist for easier manipulation
     for (DUIterator_Fast jmax, j = proj->fast_outs(jmax); j < jmax; j++) {
       Node* use = proj->fast_out(j);
-      if (use->Opcode() == Op_CheckCastPP && loop->is_invariant(use->in(1))) {
+      if (use->Opcode() == Opcodes::Op_CheckCastPP && loop->is_invariant(use->in(1))) {
         worklist.push(use);
       }
     }
     ProjNode* invar_proj = invar_iff->proj_out(proj->_con)->as_Proj();
     while (worklist.size() > 0) {

@@ -221,11 +221,11 @@
 // Create a slow version of the loop by cloning the loop
 // and inserting an if to select fast-slow versions.
 // Return control projection of the entry to the fast version.
 ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop,
                                                       Node_List &old_new,
-                                                      int opcode) {
+                                                      Opcodes opcode) {
   LoopNode* head  = loop->_head->as_Loop();
   bool counted_loop = head->is_CountedLoop();
   Node*     entry = head->in(LoopNode::EntryControl);
   _igvn.rehash_node_delayed(entry);
   IdealLoopTree* outer_loop = loop->_parent;

@@ -234,11 +234,11 @@
   set_ctrl(cont, C->root());
   Node* opq       = new Opaque1Node(C, cont);
   register_node(opq, outer_loop, entry, dom_depth(entry));
   Node *bol       = new Conv2BNode(opq);
   register_node(bol, outer_loop, entry, dom_depth(entry));
-  IfNode* iff = (opcode == Op_RangeCheck) ? new RangeCheckNode(entry, bol, PROB_MAX, COUNT_UNKNOWN) :
+  IfNode* iff = (opcode == Opcodes::Op_RangeCheck) ? new RangeCheckNode(entry, bol, PROB_MAX, COUNT_UNKNOWN) :
     new IfNode(entry, bol, PROB_MAX, COUNT_UNKNOWN);
   register_node(iff, outer_loop, entry, dom_depth(entry));
   ProjNode* iffast = new IfTrueNode(iff);
   register_node(iffast, outer_loop, iff, dom_depth(iff));
   ProjNode* ifslow = new IfFalseNode(iff);

@@ -403,11 +403,11 @@
   Node* iff = ifslow_pred->in(0);
   if (!iff->is_If() || iff != _iff) {
     return false;
   }
 
-  if (iff->in(1)->Opcode() != Op_ConI) {
+  if (iff->in(1)->Opcode() != Opcodes::Op_ConI) {
     return false;
   }
 
   return _has_reserved = true;
 }