add adupt heuristic

src/host/c/es.c

@@ -130,6 +130,13 @@ void check_spanning_tree_impl();
 // )@@
 
 static inline bool adupt_start_heuristic(obj adoptee, int depth) {
+  #ifdef NO_RERANK_FROM_ATOMIC
+  obj tag = get_field(rib, 2);
+  if (tag != PAIR_TAG || tag != CLOSURE_TAG) {
+    return false;
+  }
+  #endif
+
   #ifdef ADUPT_DROP_DEPTH_ALWAYS
   return true;
   #endif
@@ -165,6 +172,10 @@ static inline bool adupt_start_heuristic(obj adoptee, int depth) {
 #endif
 // )@@
 
+// @@(feature adupt-no-rerank-from-atomic (use stack-pair-tag)
+#define NO_RERANK_FROM_ATOMIC
+// )
+
 static inline bool adupt_continue_heuristic(int depth) {
   #ifdef ADUPT_RERANK_DEPTH
   return depth < ADUPT_RERANK_DEPTH;

src/makefile

@@ -129,7 +129,7 @@ check-es: rsc.exe
 	HOST=c \
 	RSC_COMPILER="./rsc.exe --rvm ./host/c/es.c -f+ c/gc/es -f+ check-spanning-tree -f+ runtime-checks" \
 	POST_TEST_VALIDATION="***REMAINING_RIBS = 0\n***ALIVE_BUT_COLLECTED = 0" \
-	TEST_FEATURES="-f+ adupt-drop-depth-25 -f+ adupt-rerank-depth-25,-f+ adupt-avoid-lists,-f+ adupt-drop-depth-always, -f+ stack-pair-tag" \
+	TEST_FEATURES="-f+ adupt-drop-depth-25 -f+ adupt-rerank-depth-25,-f+ adupt-avoid-lists,-f+ adupt-no-rerank-from-atomic,-f+ adupt-drop-depth-always, -f+ stack-pair-tag" \
 	TEST_TAGS="c core variadics r4rs flat-closure bench" \
 	make check