[GR-11805] Don't use Object.equals for Class, correct ordering of equ…

…als on constants. PullRequest: graal/2191
oracle · Sep 26, 2018 · 012b224 · 012b224
2 parents 5b33148 + 1c87ec4
commit 012b224
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/...s/com.oracle.truffle.llvm.asm.amd64/src/com/oracle/truffle/llvm/asm/amd64/AsmFactory.java b/...s/com.oracle.truffle.llvm.asm.amd64/src/com/oracle/truffle/llvm/asm/amd64/AsmFactory.java
@@ -336,7 +336,7 @@ private void parseArguments() {
             int end = source.lastIndexOf('}');
             if (start != -1 && end != -1) {
                 registerName = source.substring(start + 1, end);
-            } else if (source.equals(CONSTRAINT_REG) || source.equals(CONSTRAINT_REG_L)) {
+            } else if (CONSTRAINT_REG.equals(source) || CONSTRAINT_REG_L.equals(source)) {
                 registerName = TEMP_REGISTER_PREFIX + argInfo.size();
                 isAnonymous = true;
             } else if (source.length() == 1 && Character.isDigit(source.charAt(0))) {
@@ -1877,7 +1877,7 @@ private LLVMExpressionNode getOperandAddress(Type type, AsmOperand operand) {
             AsmOperand offset = op.getOffset();
             int shift = op.getShift();
             LLVMExpressionNode baseAddress;
-            assert op.getSegment() == null || op.getSegment().equals("%fs");
+            assert op.getSegment() == null || "%fs".equals(op.getSegment());
             LLVMExpressionNode segment = null;
             if (op.getSegment() != null) {
                 segment = new LLVMAMD64GetTlsNode();

diff --git a/...com.oracle.truffle.llvm.nodes/src/com/oracle/truffle/llvm/nodes/asm/syscall/LLVMInfo.java b/...com.oracle.truffle.llvm.nodes/src/com/oracle/truffle/llvm/nodes/asm/syscall/LLVMInfo.java
@@ -54,7 +54,7 @@ public class LLVMInfo {
         sysname = System.getProperty("os.name");
         release = System.getProperty("os.version");
         String arch = System.getProperty("os.arch");
-        if (arch.equals("amd64")) {
+        if ("amd64".equals(arch)) {
             arch = "x86_64";
         }
         machine = arch;

diff --git a/...llvm.nodes/src/com/oracle/truffle/llvm/nodes/op/arith/floating/LLVMArithmeticFactory.java b/...llvm.nodes/src/com/oracle/truffle/llvm/nodes/op/arith/floating/LLVMArithmeticFactory.java
@@ -80,7 +80,7 @@ public LLVMArithmetic execute(LLVMArithmetic x, LLVMArithmetic y,
         }
 
         LLVMArithmeticOpNode createNode(Object x, Object y) {
-            if (x instanceof LLVMArithmetic && x.getClass().equals(y.getClass())) {
+            if (x instanceof LLVMArithmetic && x.getClass() == y.getClass()) {
                 return ((LLVMArithmetic) x).createAddNode();
             } else {
                 throw new AssertionError("unsupported operand types: " + x.getClass() + ", " + y.getClass());
@@ -106,7 +106,7 @@ public LLVMArithmetic execute(LLVMArithmetic x, LLVMArithmetic y,
         }
 
         LLVMArithmeticOpNode createNode(Object x, Object y) {
-            if (x instanceof LLVMArithmetic && x.getClass().equals(y.getClass())) {
+            if (x instanceof LLVMArithmetic && x.getClass() == y.getClass()) {
                 return ((LLVMArithmetic) x).createSubNode();
             } else {
                 throw new AssertionError("unsupported operand types: " + x.getClass() + ", " + y.getClass());
@@ -132,7 +132,7 @@ public LLVMArithmetic execute(LLVMArithmetic x, LLVMArithmetic y,
         }
 
         LLVMArithmeticOpNode createNode(Object x, Object y) {
-            if (x instanceof LLVMArithmetic && x.getClass().equals(y.getClass())) {
+            if (x instanceof LLVMArithmetic && x.getClass() == y.getClass()) {
                 return ((LLVMArithmetic) x).createMulNode();
             } else {
                 throw new AssertionError("unsupported operand types: " + x.getClass() + ", " + y.getClass());
@@ -158,7 +158,7 @@ public LLVMArithmetic execute(LLVMArithmetic x, LLVMArithmetic y,
         }
 
         LLVMArithmeticOpNode createNode(Object x, Object y) {
-            if (x instanceof LLVMArithmetic && x.getClass().equals(y.getClass())) {
+            if (x instanceof LLVMArithmetic && x.getClass() == y.getClass()) {
                 return ((LLVMArithmetic) x).createDivNode();
             } else {
                 throw new AssertionError("unsupported operand types: " + x.getClass() + ", " + y.getClass());
@@ -184,7 +184,7 @@ public LLVMArithmetic execute(LLVMArithmetic x, LLVMArithmetic y,
         }
 
         LLVMArithmeticOpNode createNode(Object x, Object y) {
-            if (x instanceof LLVMArithmetic && x.getClass().equals(y.getClass())) {
+            if (x instanceof LLVMArithmetic && x.getClass() == y.getClass()) {
                 return ((LLVMArithmetic) x).createRemNode();
             } else {
                 throw new AssertionError("unsupported operand types: " + x.getClass() + ", " + y.getClass());

diff --git a/...e.truffle.llvm.nodes/src/com/oracle/truffle/llvm/nodes/others/LLVMValueProfilingNode.java b/...e.truffle.llvm.nodes/src/com/oracle/truffle/llvm/nodes/others/LLVMValueProfilingNode.java
@@ -166,7 +166,7 @@ protected LLVMPointer doPointer(LLVMPointer value) {
             if (localState != GENERIC) {
                 if (localState == SPECIALIZED_POINTER) {
                     LLVMPointer v = cachedPointer;
-                    if (value.equals(v)) {
+                    if (v.equals(value)) {
                         return v.export(value.getExportType());
                     }
                 }

diff --git a/....oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/elf/ElfDynamicSection.java b/....oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/elf/ElfDynamicSection.java
@@ -124,7 +124,7 @@ public List<String> getDTRPath() {
 
     private static ElfSectionHeaderTable.Entry getDynamiSHEntry(ElfSectionHeaderTable sht) {
         for (ElfSectionHeaderTable.Entry e : sht.getEntries()) {
-            if (e.getName(sht).equals(".dynamic")) {
+            if (".dynamic".equals(e.getName(sht))) {
                 return e;
             }
         }

diff --git a/...rc/com/oracle/truffle/llvm/parser/model/symbols/constants/integer/BigIntegerConstant.java b/...rc/com/oracle/truffle/llvm/parser/model/symbols/constants/integer/BigIntegerConstant.java
@@ -61,7 +61,7 @@ public BigInteger getValue() {
     @Override
     public String toString() {
         if (getType().getBitSize() == 1) {
-            return value.equals(BigInteger.ZERO) ? "false" : "true";
+            return BigInteger.ZERO.equals(value) ? "false" : "true";
         }
         return value.toString();
     }

diff --git a/...cle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/floating/LLVM80BitFloat.java b/...cle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/floating/LLVM80BitFloat.java
@@ -358,11 +358,11 @@ public LLVM80BitFloat abs() {
     }
 
     public boolean isPositiveInfinity() {
-        return this.equals(POSITIVE_INFINITY);
+        return POSITIVE_INFINITY.equals(this);
     }
 
     public boolean isNegativeInfinity() {
-        return equals(NEGATIVE_INFINITY);
+        return NEGATIVE_INFINITY.equals(this);
     }
 
     public boolean isInfinity() {

diff --git a/....truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/options/SulongEngineOption.java b/....truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/options/SulongEngineOption.java
@@ -130,14 +130,14 @@ public static boolean isTrue(String option) {
 
     public static List<String> getPolyglotOptionSearchPaths(TruffleLanguage.Env env) {
         String libraryPathOption = env.getOptions().get(LIBRARY_PATH);
-        String[] libraryPath = libraryPathOption.equals("") ? new String[0] : libraryPathOption.split(OPTION_ARRAY_SEPARATOR);
+        String[] libraryPath = "".equals(libraryPathOption) ? new String[0] : libraryPathOption.split(OPTION_ARRAY_SEPARATOR);
         return Arrays.asList(libraryPath);
     }
 
     public static List<String> getPolyglotOptionExternalLibraries(TruffleLanguage.Env env) {
         CompilerAsserts.neverPartOfCompilation();
         String librariesOption = env.getOptions().get(LIBRARIES);
-        String[] userLibraries = librariesOption.equals("") ? new String[0] : librariesOption.split(OPTION_ARRAY_SEPARATOR);
+        String[] userLibraries = "".equals(librariesOption) ? new String[0] : librariesOption.split(OPTION_ARRAY_SEPARATOR);
         return Arrays.asList(userLibraries);
     }
 }
diff --git a/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/NativeConfiguration.java b/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/NativeConfiguration.java
@@ -79,9 +79,9 @@ public List<ContextExtension> createContextExtensions(LLVMContext context) {
     @Override
     @SuppressWarnings("deprecation")
     public <E> E getCapability(Class<E> type) {
-        if (type.equals(LLVMMemory.class)) {
+        if (type == LLVMMemory.class) {
             return type.cast(LLVMNativeMemory.getInstance());
-        } else if (type.equals(UnsafeArrayAccess.class)) {
+        } else if (type == UnsafeArrayAccess.class) {
             return type.cast(UnsafeArrayAccess.getInstance());
         }
         return null;