Use the mime type to detect which Source should report coverage

Author: eregon

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

@@ -250,11 +250,6 @@ public RubyRootNode parse(RubySource rubySource, ParserContext parserContext, St
 
         // Translate to Ruby Truffle nodes
 
-        // Like MRI, do not track coverage of eval's. This also avoids having to merge multiple Sources with the same RubyContext.getPath().
-        if (!rubySource.isEval()) {
-            language.coverageManager.loadingSource(source);
-        }
-
         final BodyTranslator translator = new BodyTranslator(
                 language,
                 null,

src/main/java/org/truffleruby/stdlib/CoverageManager.java

@@ -11,10 +11,8 @@
 
 import java.io.PrintStream;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLongArray;
 
@@ -45,7 +43,6 @@ public static class LineTag extends Tag {
     private final Instrumenter instrumenter;
     private EventBinding<?> binding;
     private final Map<Source, AtomicLongArray> counters = new ConcurrentHashMap<>();
-    private final Set<Source> coveredSources = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
     private volatile boolean enabled;
 
@@ -57,21 +54,13 @@ public CoverageManager(LanguageOptions options, Instrumenter instrumenter) {
         }
     }
 
-    public synchronized void loadingSource(Source source) {
-        if (enabled) {
-            coveredSources.add(source);
-        }
-    }
-
     private int lineToIndex(int line) {
         return line - 1;
     }
 
     public void setLineHasCode(Source source, int line) {
-        if (coveredSources.contains(source)) {
-            final AtomicLongArray counters = getCounters(source);
-            counters.set(lineToIndex(line), 0);
-        }
+        final AtomicLongArray counters = getCounters(source);
+        counters.set(lineToIndex(line), 0);
     }
 
     private boolean getLineHasCode(Source source, int line) {
@@ -88,7 +77,7 @@ public synchronized void enable() {
         binding = instrumenter.attachExecutionEventFactory(
                 SourceSectionFilter
                         .newBuilder()
-                        .sourceIs(coveredSources::contains)
+                        .mimeTypeIs(RubyLanguage.MIME_TYPE_COVERAGE)
                         .tagIs(LineTag.class)
                         .build(),
                 eventContext -> new ExecutionEventNode() {
@@ -135,7 +124,6 @@ public synchronized void disable() {
 
         binding.dispose();
         counters.clear();
-        coveredSources.clear();
 
         enabled = false;
     }