Merge pull request #51 from 0xdaryl/fixvp

(0.20.0) Fix VP constraint merging for multi-dimensional arrays
eclipse-openj9 · Mar 28, 2020 · ffe8de8 · ffe8de8
2 parents fbaaf21 + b9e9d72
commit ffe8de8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/compiler/optimizer/VPConstraint.cpp b/compiler/optimizer/VPConstraint.cpp
@@ -3495,7 +3495,10 @@ TR::VPConstraint *TR::VPFixedClass::intersect1(TR::VPConstraint *other, OMR::Val
             }
 
          if ((*thisSig != 'L') && ((*otherSig == 'L') || (*otherSig == '[')))
-            return NULL;
+            {
+            if (! ((*thisSig == '[') && (otherLen == 18 && !strncmp(otherSig, "Ljava/lang/Object;", 18))) )
+               return NULL;
+            }
 
          // retain the fact that its a fixed type
          return this;