# HG changeset patch
# User bobv
# Date 1487957580 18000
# Node ID 7db0c62b659d5b520dc257fda2bc4582338f0c61
# Parent  4a79ad46e578112fce68f1af9dd931025cc235cb# Parent  c0382298afc7d7be0cbd477909c3e2f62e6f28b2
Merge

diff -r 4a79ad46e578 -r 7db0c62b659d jdk/src/java.base/unix/classes/module-info.java.extra
--- a/jdk/src/java.base/unix/classes/module-info.java.extra	Wed Jul 05 22:55:08 2017 +0200
+++ b/jdk/src/java.base/unix/classes/module-info.java.extra	Fri Feb 24 12:33:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
@@ -32,5 +32,3 @@
 
 exports jdk.internal.module to jdk.vm.compiler;
 
-// AOT uses jdk.internal.misc.Unsafe
-exports jdk.internal.misc to jdk.aot;
diff -r 4a79ad46e578 -r 7db0c62b659d jdk/src/java.base/windows/classes/module-info.java.extra
--- a/jdk/src/java.base/windows/classes/module-info.java.extra	Wed Jul 05 22:55:08 2017 +0200
+++ b/jdk/src/java.base/windows/classes/module-info.java.extra	Fri Feb 24 12:33:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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
@@ -26,3 +26,13 @@
 exports sun.security.rsa to jdk.crypto.mscapi;
 exports sun.security.internal.spec to jdk.crypto.mscapi;
 exports sun.security.util to jdk.crypto.mscapi;
+
+// jdk.vm.compiler uses Unsafe and VM classes from jdk.internal.misc
+exports jdk.internal.misc to jdk.vm.compiler;
+opens   jdk.internal.misc to jdk.vm.compiler;
+
+// jdk.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics
+opens com.sun.crypto.provider to jdk.vm.compiler;
+
+exports jdk.internal.module to jdk.vm.compiler;
+