--- /dev/null	2019-11-19 22:05:02.069813242 -0800
+++ new/src/java.base/share/classes/jdk/internal/module/ArchivedBootLayer.java	2020-08-12 15:05:02.385771663 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2020, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 jdk.internal.module;
+
+import jdk.internal.misc.VM;
+
+/**
+ * Used by ModuleBootstrap for archiving the boot layer and the builder needed to
+ * set the IllegalAccessLogger.
+ */
+class ArchivedBootLayer {
+    private static ArchivedBootLayer archivedBootLayer;
+
+    private final ModuleLayer bootLayer;
+    private final IllegalAccessLogger.Builder builder;
+
+    private ArchivedBootLayer(ModuleLayer bootLayer,
+                              IllegalAccessLogger.Builder builder) {
+        this.bootLayer = bootLayer;
+        this.builder = builder;
+    }
+
+    ModuleLayer bootLayer() {
+        return bootLayer;
+    }
+    
+    IllegalAccessLogger.Builder illegalAccessLoggerBuilder() {
+        return builder;
+    }
+
+    static ArchivedBootLayer get() {
+        return archivedBootLayer;
+    }
+
+    static void archive(ModuleLayer layer, IllegalAccessLogger.Builder builder) {
+        archivedBootLayer = new ArchivedBootLayer(layer, builder);
+    }
+
+    static {
+        VM.initializeFromArchive(ArchivedBootLayer.class);
+    }
+}