Convert LruListElemObject to internal java class

and clean up

Author: qunaibit

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/LruCacheObject.java

@@ -41,16 +41,18 @@
 package com.oracle.graal.python.builtins.modules.functools;
 
 import com.oracle.graal.python.builtins.objects.common.ObjectHashMap;
+import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.truffle.api.object.Shape;
 
-public class LruCacheObject extends LruListElemObject {
+public class LruCacheObject extends PythonBuiltinObject {
 
     enum WrapperType {
         INFINITE,
         UNCACHED,
         BOUNDED,
     }
 
+    LruListElemObject root;
     WrapperType wrapper;
     int typed;
     final ObjectHashMap cache;
@@ -67,6 +69,7 @@ enum WrapperType {
 
     public LruCacheObject(Object cls, Shape instanceShape) {
         super(cls, instanceShape);
+        this.root = new LruListElemObject();
         this.cache = new ObjectHashMap();
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/LruCacheWrapperBuiltins.java

@@ -172,8 +172,8 @@ Object lruCacheNew(VirtualFrame frame, Object type,
 
             LruCacheObject obj = factory().createLruCacheObject(type);
 
-            obj.prev = obj;
-            obj.next = obj;
+            obj.root.prev = obj.root;
+            obj.root.next = obj.root;
             obj.wrapper = wrapper;
             obj.typed = typed;
             // obj.cache = new ObjectHashMap();
@@ -184,8 +184,6 @@ Object lruCacheNew(VirtualFrame frame, Object type,
 
             obj.kwdMark = getKwdMark(readAttr);
 
-            // obj.lru_list_elem_type = state.lru_list_elem_type;
-
             obj.cacheInfoType = cache_info_type;
             // obj.dict = null;
             // obj.weakreflist = null;
@@ -370,7 +368,7 @@ static void lru_cache_prepend_link(LruCacheObject self, LruListElemObject link)
 
         // lru_cache_append_link
         static void lruCacheAppendLink(LruCacheObject self, LruListElemObject link) {
-            LruListElemObject root = self;
+            LruListElemObject root = self.root;
             LruListElemObject last = root.prev;
             last.next = root.prev = link;
             link.prev = last;
@@ -434,10 +432,6 @@ Object boundedLruCacheWrapper(VirtualFrame frame, LruCacheObject self, Object[]
                 self.hits++;
                 return link.result;
             }
-            // mq: this might be needed if self.cache is a dict
-            // if (PyErr_Occurred()) {
-            // return NULL;
-            // }
             self.misses++;
             Object result = callNode.execute(frame, self.func, args, kwds);
             Object testresult = getItem.get(frame, self.cache, key, hash);
@@ -449,23 +443,15 @@ Object boundedLruCacheWrapper(VirtualFrame frame, LruCacheObject self, Object[]
                  */
                 return result;
             }
-            // mq: this will only occur if the cache is a dict.
-            // if (PyErr_Occurred()) {
-            // /* This is an unusual case since this same lookup
-            // did not previously trigger an error during lookup.
-            // Treat it the same as an error in user function
-            // and return with the error set. */
-            // return NULL;
-            // }
             /*
              * This is the normal case. The new key wasn't found before user function call and it is
              * still not there. So we proceed normally and update the cache with the new result.
              */
 
             assert (self.maxsize > 0);
-            if (self.cache.size() < self.maxsize || self.next == self) {
+            if (self.cache.size() < self.maxsize || self.root.next == self.root) {
                 /* Cache is not full, so put the result in a new link */
-                link = factory().createLruListElemObject();
+                link = new LruListElemObject();
 
                 link.hash = hash;
                 link.key = key;
@@ -494,7 +480,7 @@ Object boundedLruCacheWrapper(VirtualFrame frame, LruCacheObject self, Object[]
 
             /* Extract the oldest item. */
             // assert (self.next != self);
-            link = self.next;
+            link = self.root.next;
             lruCacheExtractLink(link);
             /*
              * Remove it from the cache. The cache dict holds one reference to the link. We created
@@ -544,7 +530,7 @@ public abstract static class ClearNode extends PythonUnaryBuiltinNode {
 
         // lru_cache_unlink_list
         static LruListElemObject lruCacheUnlinkList(LruCacheObject self) {
-            LruListElemObject root = self;
+            LruListElemObject root = self.root;
             LruListElemObject link = root.next;
             if (link == root) {
                 return null;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/functools/LruListElemObject.java

@@ -40,17 +40,10 @@
  */
 package com.oracle.graal.python.builtins.modules.functools;
 
-import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
-import com.oracle.truffle.api.object.Shape;
-
-public class LruListElemObject extends PythonBuiltinObject {
+final class LruListElemObject {
 
     LruListElemObject prev, next; /* borrowed links */
     long hash;
     Object key, result;
 
-    public LruListElemObject(Object cls, Shape instanceShape) {
-        super(cls, instanceShape);
-    }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -58,7 +58,6 @@
 import com.oracle.graal.python.builtins.modules.ctypes.StructParamObject;
 import com.oracle.graal.python.builtins.modules.ctypes.memory.Pointer;
 import com.oracle.graal.python.builtins.modules.functools.LruCacheObject;
-import com.oracle.graal.python.builtins.modules.functools.LruListElemObject;
 import com.oracle.graal.python.builtins.modules.functools.PKeyWrapper;
 import com.oracle.graal.python.builtins.modules.functools.PPartial;
 import com.oracle.graal.python.builtins.modules.hashlib.DigestObject;
@@ -835,10 +834,6 @@ public final PPartial createPartial(Object cls, Object function, Object[] args,
         return trace(new PPartial(cls, getShape(cls), function, args, kwDict));
     }
 
-    public LruListElemObject createLruListElemObject() {
-        return trace(new LruListElemObject(PythonBuiltinClassType.PLruListElem, getShape(PythonBuiltinClassType.PLruListElem)));
-    }
-
     public LruCacheObject createLruCacheObject(Object cls) {
         return trace(new LruCacheObject(cls, getShape(cls)));
     }