[GR-20371] Do not save image generator paths in the image heap.

PullRequest: truffleruby/1222

Author: eregon

src/main/java/org/truffleruby/RubyContext.java

@@ -94,6 +94,7 @@ public class RubyContext {
     @CompilationFinal private Options options;
     @CompilationFinal private String rubyHome;
     @CompilationFinal private TruffleFile rubyHomeTruffleFile;
+    @CompilationFinal private boolean hadHome;
 
     private final PrimitiveManager primitiveManager = new PrimitiveManager();
     private final SafepointManager safepointManager = new SafepointManager(this);
@@ -122,7 +123,7 @@ public class RubyContext {
 
     @CompilationFinal private SecureRandom random;
     private final Hashing hashing;
-    @CompilationFinal BacktraceFormatter defaultBacktraceFormatter;
+    @CompilationFinal private BacktraceFormatter defaultBacktraceFormatter;
     private final BacktraceFormatter userBacktraceFormatter;
     private final RopeCache ropeCache;
     private final PathToRopeCache pathToRopeCache = new PathToRopeCache(this);
@@ -258,6 +259,11 @@ public void initialize() {
             random = null;
             // Cannot save the root Java Thread instance in the image
             threadManager.resetMainThread();
+            // Do not save image generator paths in the image heap
+            hadHome = rubyHome != null;
+            rubyHome = null;
+            rubyHomeTruffleFile = null;
+            featureLoader.setWorkingDirectory(null);
         } else {
             initialized = true;
         }
@@ -275,9 +281,8 @@ protected boolean patch(Env newEnv) {
 
         final Options oldOptions = this.options;
         final Options newOptions = createOptions(newEnv);
-        final String oldHome = this.rubyHome;
         final String newHome = findRubyHome(newOptions);
-        if (!compatibleOptions(oldOptions, newOptions, oldHome, newHome)) {
+        if (!compatibleOptions(oldOptions, newOptions, this.hadHome, newHome != null)) {
             return false;
         }
         this.options = newOptions;
@@ -337,7 +342,7 @@ protected boolean patchContext(Env newEnv) {
         }
     }
 
-    private boolean compatibleOptions(Options oldOptions, Options newOptions, String oldHome, String newHome) {
+    private boolean compatibleOptions(Options oldOptions, Options newOptions, boolean hadHome, boolean hasHome) {
         final String notReusingContext = "not reusing pre-initialized context: ";
 
         if (!newOptions.PREINITIALIZATION) {
@@ -350,9 +355,8 @@ private boolean compatibleOptions(Options oldOptions, Options newOptions, String
             return false; // Should load the specified core files
         }
 
-        if ((oldHome != null) != (newHome != null)) {
-            RubyLanguage.LOGGER
-                    .fine(notReusingContext + "Ruby home is " + (newHome != null ? "set (" + newHome + ")" : "unset"));
+        if (hadHome != hasHome) {
+            RubyLanguage.LOGGER.fine(notReusingContext + "Ruby home is " + (hasHome ? "set" : "unset"));
             return false;
         }
 

src/main/java/org/truffleruby/language/loader/MainLoader.java

@@ -10,7 +10,6 @@
 package org.truffleruby.language.loader;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 
 import org.jcodings.specific.UTF8Encoding;
@@ -97,7 +96,7 @@ public RubySource loadFromFile(Env env, RubyNode currentNode, String path) throw
         final Rope sourceRope = transformScript(currentNode, path, sourceBytes);
 
         final Source source = fileLoader.buildSource(file, path, sourceRope, false);
-        context.setMainSource(source, new File(path).getAbsolutePath());
+        context.setMainSource(source, file.getAbsoluteFile().getPath());
 
         return new RubySource(source, sourceRope);
     }

src/main/ruby/truffleruby/post-boot/post-boot.rb

@@ -71,14 +71,21 @@
   if old_home
     # We need to fix all paths which capture the image build-time home to point
     # to the runtime home.
+
+    paths_starting_with_home = []
+    [$LOAD_PATH, $LOADED_FEATURES].each do |array|
+      array.each do |path|
+        if path.start_with?(old_home)
+          paths_starting_with_home << path[old_home.size..-1]
+        end
+      end
+    end
+    old_home = nil
+
     Truffle::Boot.delay do
       new_home = Truffle::Boot.ruby_home
-      [$LOAD_PATH, $LOADED_FEATURES].each do |array|
-        array.each do |path|
-          if path.start_with?(old_home)
-            path.replace(new_home + path[old_home.size..-1])
-          end
-        end
+      paths_starting_with_home.each do |path|
+        path.replace(new_home + path)
       end
     end
   end