--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/Debug.java	Tue Nov 18 23:19:43 2014 +0100
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.object;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import com.oracle.truffle.object.debug.*;
+
+class Debug {
+    private static Collection<ShapeImpl> allShapes;
+
+    static void registerShape(ShapeImpl newShape) {
+        allShapes.add(newShape);
+    }
+
+    static {
+        if (ObjectStorageOptions.DumpShapes) {
+            allShapes = new ConcurrentLinkedQueue<>();
+        }
+
+        if (ObjectStorageOptions.DumpShapes) {
+            Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+                public void run() {
+                    try (PrintWriter out = new PrintWriter("shapes.json", "UTF-8")) {
+                        out.println("{\"shapes\": [");
+                        boolean first = true;
+                        for (ShapeImpl shape : allShapes) {
+                            if (!first) {
+                                out.println(",");
+                            }
+                            first = false;
+                            out.print(shape.accept(new JSONShapeVisitor()));
+                        }
+                        if (!first) {
+                            out.println();
+                        }
+                        out.println("]}");
+                    } catch (FileNotFoundException | UnsupportedEncodingException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }));
+        }
+    }
+}