Simplify SetShapeFlagsNode.

Author: woess

truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObject.java

@@ -1387,12 +1387,11 @@ public abstract static class SetShapeFlagsNode extends Node {
         public abstract boolean execute(DynamicObject receiver, int newFlags);
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"shape == cachedShape", "flags == newFlags"}, limit = "SHAPE_CACHE_LIMIT")
+        @Specialization(guards = {"shape == cachedShape", "flags == newShape.getFlags()"}, limit = "SHAPE_CACHE_LIMIT")
         static boolean doCached(DynamicObject receiver, int flags,
                         @Bind("receiver.getShape()") Shape shape,
                         @Cached("shape") Shape cachedShape,
-                        @Cached("flags") int newFlags,
-                        @Cached("shapeSetFlags(cachedShape, newFlags)") Shape newShape) {
+                        @Cached("shapeSetFlags(cachedShape, flags)") Shape newShape) {
             if (newShape != cachedShape) {
                 receiver.setShape(newShape);
                 return true;