# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1431344836 -7200
# Node ID e15605ce5abab7b4de4b205e7532b9bcc887c177
# Parent  34a4509f9ee99a3a81357e982a6e177bb63bba70
NodeLIRBuilder#verifyPHIKind: check for LIRKind equality first.

diff -r 34a4509f9ee9 -r e15605ce5aba graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java	Mon May 11 11:52:46 2015 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java	Mon May 11 13:47:16 2015 +0200
@@ -212,7 +212,7 @@
     private static boolean verifyPHIKind(LIRKind derivedKind, LIRKind phiKind) {
         assert derivedKind.getPlatformKind() != Kind.Object || !derivedKind.isDerivedReference();
         PlatformKind phiPlatformKind = phiKind.getPlatformKind();
-        assert derivedKind.getPlatformKind().equals(phiPlatformKind instanceof Kind ? ((Kind) phiPlatformKind).getStackKind() : phiPlatformKind);
+        assert derivedKind.equals(phiKind) || derivedKind.getPlatformKind().equals(phiPlatformKind instanceof Kind ? ((Kind) phiPlatformKind).getStackKind() : phiPlatformKind);
         return true;
     }