Fixes CowMap implementation

Ensures that `statics.snapshot()` actually shares the CowMaps.

Conflicts:
	svm-classloading/src/main/java/com/lexicalscope/svm/classloading/StaticsImpl.java

Author: drognanar

svm-classloading/src/main/java/com/lexicalscope/svm/classloading/CowMap.java

@@ -9,11 +9,7 @@ public class CowMap<K, V> implements Map<K, V> {
     private MapInternal internal;
 
     public CowMap() {
-        this(new HashMap<K, V>());
-    }
-
-    public CowMap(Map<K, V> delegate) {
-        this.internal = new MapInternal(delegate);
+        internal = new MapInternal(new HashMap<K, V>());
     }
 
     public CowMap(CowMap<K, V> map) {

svm-classloading/src/main/java/com/lexicalscope/svm/classloading/StaticsImpl.java

@@ -4,9 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import com.lexicalscope.svm.classloading.asm.AsmSClass;
 import com.lexicalscope.svm.heap.ObjectRef;
@@ -21,11 +19,11 @@
 public class StaticsImpl implements Statics {
    // TODO[tim]: need fast-clone version
    private static final KlassInternalName klassKlassName = internalName(Class.class);
-   private final Map<KlassInternalName, SClass> defined;
+   private final CowMap<KlassInternalName, SClass> defined;
 
    // TODO[tim]: combine these maps for efficiency
-   private final Map<SClass, ObjectRef> staticsAddresses;
-   private final Map<SClass, ObjectRef> classAddresses;
+   private final CowMap<SClass, ObjectRef> staticsAddresses;
+   private final CowMap<SClass, ObjectRef> classAddresses;
 
    private final SClassLoader classLoader;
 
@@ -38,13 +36,13 @@ public StaticsImpl(final SClassLoader classLoader) {
 
    private StaticsImpl(
          final SClassLoader classLoader,
-         final Map<KlassInternalName, SClass> defined,
-         final Map<SClass, ObjectRef> staticsAddresses,
-         final Map<SClass, ObjectRef> classAddresses) {
-      this.defined = defined;
-      this.classLoader = classLoader;
-      this.staticsAddresses = staticsAddresses;
-      this.classAddresses = classAddresses;
+         final CowMap<KlassInternalName, SClass> defined,
+         final CowMap<SClass, ObjectRef> staticsAddresses,
+         final CowMap<SClass, ObjectRef> classAddresses) {
+       this.defined = defined;
+       this.classLoader = classLoader;
+       this.staticsAddresses = staticsAddresses;
+       this.classAddresses = classAddresses;
    }
 
    @Override public Statics snapshot() {