[mycpp] Fix tests, and move cheney_heap.cc out of binary

Rename to bump_alloc.h -> bump_leak_heap.h Eventually we should unify gc_heap.h and marksweep_heap.h.
oilshell · Oct 25, 2022 · aef3a59 · aef3a59
1 parent 39fb6ec
commit aef3a59
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/mycpp/NINJA_subgraph.py b/mycpp/NINJA_subgraph.py
@@ -16,12 +16,15 @@ def DefineTargets(ru):
       deps_base_dir = 'prebuilt/ninja',
       template = 'mycpp')
 
+  ru.cc_library(
+      '//mycpp/cheney_heap', 
+      srcs = ['mycpp/cheney_heap.cc'])
+
   ru.cc_library(
       '//mycpp/runtime', 
       srcs = [
         'mycpp/gc_mylib.cc',
-        'mycpp/bump_alloc.cc',
-        'mycpp/cheney_heap.cc',
+        'mycpp/bump_leak_heap.cc',
         'mycpp/marksweep_heap.cc',
 
         # files we haven't added StackRoots to

diff --git a/mycpp/TEST.sh b/mycpp/TEST.sh
@@ -289,9 +289,6 @@ test-translator() {
   # Test with more collections -- 5 failures above
   examples-variant '' gcevery
 
-  # Sanity check that doesn't collect garbage
-  examples-variant '' mallocleak
-
   run-test-func test-invalid-examples _test/mycpp/test-invalid-examples.log
 
   # Runs test in cxx-asan variant, and benchmarks in cxx-opt variant

diff --git a/mycpp/bump_alloc.cc → mycpp/bump_leak_heap.cc b/mycpp/bump_alloc.cc → mycpp/bump_leak_heap.cc
@@ -1,6 +1,6 @@
-// mycpp/bump_alloc.cc: Leaky Bump Allocator
+// mycpp/bump_leak_heap.cc: Leaky Bump Allocator
 
-#include "mycpp/bump_alloc.h"
+#include "mycpp/bump_leak_heap.h"
 
 #include <stddef.h>
 #include <stdio.h>

diff --git a/mycpp/bump_alloc.h → mycpp/bump_leak_heap.h b/mycpp/bump_alloc.h → mycpp/bump_leak_heap.h
@@ -1,7 +1,7 @@
-// mycpp/bump_alloc.h: Leaky Bump Allocator
+// mycpp/bump_leak_heap.h: Leaky Bump Allocator
 
-#ifndef BUMP_ALLOC_H
-#define BUMP_ALLOC_H
+#ifndef MYCPP_BUMP_LEAK_HEAP_H
+#define MYCPP_BUMP_LEAK_HEAP_H
 
 #include <stdint.h>  // int64_t
 
@@ -67,4 +67,4 @@ class BumpLeakHeap {
 extern BumpLeakHeap gHeap;
 #endif
 
-#endif  // BUMP_ALLOC_H
+#endif  // MYCPP_BUMP_LEAK_HEAP_H
diff --git a/mycpp/cheney_heap.h b/mycpp/cheney_heap.h
@@ -232,15 +232,6 @@ class CheneyHeap {
 void ShowFixedChildren(Obj* obj);
 #endif
 
-// LayoutForwarded and LayoutFixed aren't real types.  You can cast arbitrary
-// objs to them to access a HOMOGENEOUS REPRESENTATION useful for garbage
-// collection.
-
-class LayoutForwarded : public Obj {
- public:
-  Obj* new_location;  // valid if and only if heap_tag_ == Tag::Forwarded
-};
-
 #if !defined(MARK_SWEEP) && !defined(BUMP_LEAK)
 extern CheneyHeap gHeap;
 #endif

diff --git a/mycpp/gc_heap.h b/mycpp/gc_heap.h
@@ -1,8 +1,7 @@
 #ifndef GC_HEAP_H
 #define GC_HEAP_H
 
-#include "mycpp/bump_alloc.h"
-#include "mycpp/cheney_heap.h"
+#include "mycpp/bump_leak_heap.h"
 #include "mycpp/marksweep_heap.h"
 
 #if defined(MARK_SWEEP)
@@ -62,6 +61,15 @@ class StackRoots {
   int n_;
 };
 
+// LayoutForwarded and LayoutFixed aren't real types.  You can cast arbitrary
+// objs to them to access a HOMOGENEOUS REPRESENTATION useful for garbage
+// collection.
+
+class LayoutForwarded : public Obj {
+ public:
+  Obj* new_location;  // valid if and only if heap_tag_ == Tag::Forwarded
+};
+
 // for Tag::FixedSize
 class LayoutFixed : public Obj {
  public: