src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java

@@ -1,8 +1,7 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.

@@ -31,11 +30,11 @@
 import com.sun.org.apache.bcel.internal.generic.IFNE;
 import com.sun.org.apache.bcel.internal.generic.INVOKESPECIAL;
 import com.sun.org.apache.bcel.internal.generic.INVOKESTATIC;
 import com.sun.org.apache.bcel.internal.generic.INVOKEVIRTUAL;
 import com.sun.org.apache.bcel.internal.generic.Instruction;
-import com.sun.org.apache.bcel.internal.generic.InstructionConstants;
+import com.sun.org.apache.bcel.internal.generic.InstructionConst;
 import com.sun.org.apache.bcel.internal.generic.InstructionList;
 import com.sun.org.apache.bcel.internal.generic.LocalVariableGen;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.Constants;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.FlowList;

@@ -294,31 +293,31 @@
                                                      DOUBLE_VALUE,
                                                      DOUBLE_VALUE_SIG)));
     }
 
     public Instruction ADD() {
-        return InstructionConstants.DADD;
+        return InstructionConst.DADD;
     }
 
     public Instruction SUB() {
-        return InstructionConstants.DSUB;
+        return InstructionConst.DSUB;
     }
 
     public Instruction MUL() {
-        return InstructionConstants.DMUL;
+        return InstructionConst.DMUL;
     }
 
     public Instruction DIV() {
-        return InstructionConstants.DDIV;
+        return InstructionConst.DDIV;
     }
 
     public Instruction REM() {
-        return InstructionConstants.DREM;
+        return InstructionConst.DREM;
     }
 
     public Instruction NEG() {
-        return InstructionConstants.DNEG;
+        return InstructionConst.DNEG;
     }
 
     public Instruction LOAD(int slot) {
         return new DLOAD(slot);
     }

@@ -330,11 +329,11 @@
     public Instruction POP() {
         return POP2;
     }
 
     public Instruction CMP(boolean less) {
-        return less ? InstructionConstants.DCMPG : InstructionConstants.DCMPL;
+        return less ? InstructionConst.DCMPG : InstructionConst.DCMPL;
     }
 
     public Instruction DUP() {
         return DUP2;
     }