Merge pull request #631 from kmod/perf4

more rewriting

src/asm_writing/icinfo.cpp

@@ -290,6 +290,10 @@ bool ICInfo::shouldAttempt() {
         retry_in--;
         return false;
     }
+    // Note(kmod): in some pathological deeply-recursive cases, it's important that we set the
+    // retry counter even if we attempt it again.  We could probably handle this by setting
+    // the backoff to 0 on commit, and then setting the retry to the backoff here.
+
     return !isMegamorphic();
 }
 

src/asm_writing/rewriter.h

@@ -321,7 +321,7 @@ private:
         // Loads the constant into any register or if already in a register just return it
         assembler::Register loadConst(uint64_t val, Location otherThan = Location::any());
 
-        llvm::DenseMap<uint64_t, RewriterVar*> constToVar;
+        std::unordered_map<uint64_t, RewriterVar*> constToVar;
     };
 
 

test/tests/weakref1.py

@@ -19,4 +19,10 @@ def fact(n):
 
 w = doStuff()
 fact(10) # try to clear some memory
+
+def recurse(f, n):
+    if n:
+        return recurse(f, n - 1)
+    return f()
+recurse(gc.collect, 50)
 gc.collect()

test/tests/weakref_proxy.py

@@ -21,6 +21,12 @@ def getWR():
 
 wr = getWR()
 fact(100) # try to clear some memory
+
+def recurse(f, n):
+    if n:
+        return recurse(f, n - 1)
+    return f()
+recurse(gc.collect, 50)
 gc.collect()
 
 try: