Make ParseEnvironment#yarpSource final

Author: eregon

src/main/java/org/truffleruby/parser/ParseEnvironment.java

@@ -25,25 +25,28 @@ public final class ParseEnvironment {
     public final RubyLanguage language;
     public final RubySource rubySource;
     public final Source source;
+    /** Used to compute line numbers */
+    public final Nodes.Source yarpSource;
     public final ParserContext parserContext;
     public final Node currentNode;
 
     private final boolean inCore;
     private final boolean coverageEnabled;
 
-    public Nodes.Source yarpSource = null;
 
     // Set once after parsing and before translating
     public Boolean allowTruffleRubyPrimitives = null;
 
     public ParseEnvironment(
             RubyLanguage language,
             RubySource rubySource,
+            Nodes.Source yarpSource,
             ParserContext parserContext,
             Node currentNode) {
         this.language = language;
         this.rubySource = rubySource;
         this.source = rubySource.getSource();
+        this.yarpSource = yarpSource;
         this.parserContext = parserContext;
         this.currentNode = currentNode;
 

src/main/java/org/truffleruby/parser/TranslatorDriver.java

@@ -104,7 +104,7 @@ public TranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, null, parserContext, currentNode);
 
         if (language.options.PRISM) {
             return new YARPTranslatorDriver(context).parse(rubySource, parserContext, argumentNames,

src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java

@@ -109,7 +109,8 @@ public YARPTranslatorDriver(RubyContext context) {
 
     public RootCallTarget parse(RubySource rubySource, ParserContext parserContext, String[] argumentNames,
             MaterializedFrame parentFrame, LexicalScope staticLexicalScope, Node currentNode) {
-        this.parseEnvironment = new ParseEnvironment(language, rubySource, parserContext, currentNode);
+        Nodes.Source yarpSource = createYARPSource(rubySource.getBytes(), rubySource);
+        this.parseEnvironment = new ParseEnvironment(language, rubySource, yarpSource, parserContext, currentNode);
 
         assert rubySource.isEval() == parserContext.isEval();
 
@@ -457,8 +458,7 @@ public static org.prism.ParseResult parseToYARPAST(RubyContext context, RubyLang
                 version, scopes);
         byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes, parsingOptions);
 
-        Nodes.Source yarpSource = createYARPSource(sourceBytes, rubySource);
-        parseEnvironment.yarpSource = yarpSource;
+        Nodes.Source yarpSource = parseEnvironment.yarpSource;
         ParseResult parseResult = YARPLoader.load(serializedBytes, yarpSource, context.getEncodingManager(),
                 rubySource);