[Truffle] Expand comparison of frame descriptors used in caching.

jruby · Feb 19, 2016 · bb66b57 · eregon · Feb 24, 2016 · bb66b57
1 parent ccc4519
commit bb66b57
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java b/truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java
@@ -194,8 +194,22 @@ protected boolean compatibleFrames(DynamicObject binding1, DynamicObject binding
             final FrameDescriptor fd1 = getFrameDescriptor(binding1);
             final FrameDescriptor fd2 = getFrameDescriptor(binding2);
 
-            return ((fd1 == fd2) || (fd1.getSize() == 0 && fd2.getSize() == 0)) &&
-                    getDeclarationFrame(binding1).getFrameDescriptor() == getDeclarationFrame(binding2).getFrameDescriptor();
+            if (!((fd1 == fd2) || (fd1.getSize() == 0 && fd2.getSize() == 0))) {
+                return false;
+            }
+
+            final MaterializedFrame df1 = getDeclarationFrame(binding1);
+            final MaterializedFrame df2 = getDeclarationFrame(binding2);
+
+            if ((df1 == null) != (df2 == null)) {
+                return false;
+            }
+
+            if (df1 == null) {
+                return true;
+            }
+
+            return df1.getFrameDescriptor() == df2.getFrameDescriptor();
         }
 
         protected ReadFrameSlotNode createReadNode(FrameSlotAndDepth frameSlot) {