Adapt to upstream changes after rebase

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotDescrGet.java

@@ -175,11 +175,6 @@ public Object execute(VirtualFrame frame, Object self, Object objIn, Object type
             }
             return wrapped.execute(frame, self, obj, type);
         }
-
-        @Override
-        protected Object execute1(VirtualFrame frame, Object self, Object obj, Object type) {
-            return execute(frame, self, obj, type);
-        }
     }
 
     public abstract static class DescrGetBuiltinNode extends PythonTernaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/slots/TpSlotDescrSet.java

@@ -175,12 +175,6 @@ public final Object execute(VirtualFrame frame, Object arg, Object arg2, Object
             executeVoid(frame, arg, arg2, arg3);
             return PNone.NONE;
         }
-
-        @Override
-        protected final Object execute1(VirtualFrame frame, Object arg, Object arg2, Object arg3) {
-            executeVoid(frame, arg, arg2, arg3);
-            return PNone.NONE;
-        }
     }
 
     @GenerateInline