Fix a bug in where Turbine would add java.base to the module graph of…

… java.base itself. PiperOrigin-RevId: 688642422
google · Oct 22, 2024 · ffafaff · ffafaff
1 parent d8c1bf2
commit ffafaff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/java/com/google/turbine/binder/ModuleBinder.java b/java/com/google/turbine/binder/ModuleBinder.java
@@ -136,7 +136,7 @@ private SourceModuleInfo bind() {
           break;
       }
     }
-    if (!requiresJavaBase) {
+    if (!requiresJavaBase && !module.module().moduleName().equals(ModuleSymbol.JAVA_BASE.name())) {
       // Everything requires java.base, either explicitly or implicitly.
       ModuleInfo javaBaseModule = moduleEnv.get(ModuleSymbol.JAVA_BASE);
       // Tolerate a missing java.base module, e.g. when compiling a module against a non-modular

diff --git a/javatests/com/google/turbine/lower/ModuleIntegrationTest.java b/javatests/com/google/turbine/lower/ModuleIntegrationTest.java
@@ -47,6 +47,7 @@ public static Iterable<Object[]> parameters() {
       "module-info.test", //
       "classpath.test",
       "multimodule.test",
+      "module-info-for-base.test",
       "module-info-open.test",
       "module-requires-static-transitive.test",
       "module-requires-transitive-static.test",

diff --git a/javatests/com/google/turbine/lower/moduletestdata/module-info-for-base.test b/javatests/com/google/turbine/lower/moduletestdata/module-info-for-base.test
@@ -0,0 +1,7 @@
+=== java/lang/Object.java ===
+package java.lang;
+
+public class Object {}
+
+=== module-info.java ===
+module java.base {}