Add "no trash" CDMap elements, so that CDMap elements can themselves

be allocated in context memory.  CDMap black-box test extended.

1 files changed, 10 insertions, 4 deletions

diff --git a/test/unit/context/cdmap_black.h b/test/unit/context/cdmap_black.h
index 7b8953dc0..37beb5054 100644
--- a/test/unit/context/cdmap_black.h
+++ b/test/unit/context/cdmap_black.h
@@ -930,9 +930,8 @@ public:
   };
 
   void testMapOfLists() {
-    try{
-      //Debug.on("gc");
-      //Debug.on("context");
+    //Debug.on("gc");
+    //Debug.on("context");
 
     CDMap<int, CDList<myint>*, int_hasher> map(d_context);
 
@@ -1055,6 +1054,13 @@ public:
     }
 
     TS_ASSERT(d_context->getLevel() == 0);
-  } catch(Exception& e) { cout << e << std::endl; throw e; }
+  }
+
+  void testCmmElementsAtLevel0() {
+    // this was crashing
+
+    CDMap<int, int*, int_hasher> map(d_context);
+    int* a = (int*)d_context->getCMM()->newData(sizeof(int));
+    map.insertDataFromContextMemory(1, a);
   }
 };