Merge pull request graalvm#6 in G/simpletool from st_update_vm-19.3.1 to master

* commit '3d18c287956b16d4d4a958c8c1237479aade191e':
  update 19.3.1

Author: boris-spas

.travis.yml

@@ -5,8 +5,8 @@ os:
 language: java
 
 env:
-    - GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="8"
-    - GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="11"
+    - GRAALVM_VERSION="19.3.1" GRAALVM_JAVA_VERSION="8"
+    - GRAALVM_VERSION="19.3.1" GRAALVM_JAVA_VERSION="11"
 
 install:
     - cd .. && mv simpletool "simple tool" && cd "simple tool"

ci.jsonnet

@@ -11,7 +11,7 @@
 
   local graalvm = {
     downloads+: {
-      JAVA_HOME: { name: 'graalvm', version: '19.3.0', platformspecific: true },
+      JAVA_HOME: { name: 'graalvm', version: '19.3.1', platformspecific: true },
     },
   },
 

pom.xml

@@ -4,15 +4,15 @@
 
     <groupId>com.oracle</groupId>
     <artifactId>simpletool</artifactId>
-    <version>19.3.0</version>
+    <version>19.3.1</version>
 
     <name>simpletool</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <graalvm.version>19.3.0</graalvm.version>
+        <graalvm.version>19.3.1</graalvm.version>
     </properties>
     <profiles>
         <profile>

simpletool

@@ -15,6 +15,6 @@ shift
 
 "$JAVA_HOME/bin/$LAUNCHER" \
     --jvm \
-    --vm.Dtruffle.class.path.append=target/simpletool-19.3.0.jar \
+    --vm.Dtruffle.class.path.append=target/simpletool-19.3.1.jar \
     --simple-code-coverage \
     "$@"

src/main/java/com/oracle/truffle/st/Coverage.java

@@ -62,7 +62,8 @@ void addLoaded(SourceSection sourceSection) {
     }
 
     private Set<SourceSection> nonCoveredSections() {
-        final HashSet<SourceSection> nonCovered = new HashSet<>(loaded);
+        final HashSet<SourceSection> nonCovered = new HashSet<>();
+        nonCovered.addAll(loaded);
         nonCovered.removeAll(covered);
         return nonCovered;
     }

src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java

@@ -67,7 +67,7 @@
  * Example for simple version of an expression coverage instrument.
  *
  * The instrument {@link #coverageMap keeps track} of all loaded {@link SourceSection}s and all
- * covered (i.e. executed) {@link SourceSection}s for each {@link Source}. At the end of the
+ * coverd (i.e. executed) {@link SourceSection}s for each {@link Source}. At the end of the
  * execution this information can be used to calculate coverage.
  *
  * The instrument is registered with the Truffle framework using the {@link Registration}
@@ -77,7 +77,7 @@
  * In this case the instrument itself is exported as a service and used in the
  * SimpleCoverageInstrumentTest.
  * 
- * NOTE: For the registration annotation to work the truffle dsl processor must be used (i.e. Must
+ * NOTE: Fot the registration annotation to work the truffle dsl processor must be used (i.e. Must
  * be a dependency. This is so in this maven project, as can be seen in the pom file.
  */
 @Registration(id = SimpleCoverageInstrument.ID, name = "Simple Code Coverage", version = "0.1", services = SimpleCoverageInstrument.class)
@@ -176,7 +176,7 @@ private void enable(final Env env) {
     /**
      * Ensures that the coverage info gathered by the instrument is printed at the end of execution.
      *
-     * @param env The environment, used to get the {@link Instrumenter}
+     * @param env
      */
     @Override
     protected void onDispose(Env env) {
@@ -191,7 +191,7 @@ protected void onDispose(Env env) {
      * The printing is one the the {@link Env#out output stream} specified by the {@link Env
      * enviroment}.
      *
-     * @param env The environment, used to get the {@link Instrumenter}
+     * @param env
      */
     private synchronized void printResults(final Env env) {
         final PrintStream printStream = new PrintStream(env.out());
@@ -223,7 +223,7 @@ private static char getCoverageCharacter(Set<Integer> nonCoveredLineNumbers, Set
     }
 
     /**
-     * @param source The source of interest
+     * @param source
      * @return A sorted list of line numbers for not-yet-covered lines of source code in the given
      *         {@link Source}
      */