Check if any changes in branch master need to be merged into java-10-gradle

[cyrille-artho]

Before we make the Java 11 version official, let's ensure we are not missing out on any important changes/fixes from master.

[cyrille-artho]

We can use the branch comparison feature in GitHub to see if some of the 1300+ deletions are things we want to keep: master...java-10-gradle
Most deletions are parts of changes (- for master branch, + for java-10-gradle branch), but perhaps a few were fixes that were only applied to master. These could also be documentation or typos in comments.
We would like that several of us review this branch comparison to ensure we don't miss anything.

[varad64]

Hello @cyrille-artho, upon thoroughly reviewing all the changes via GitHub's comparison feature, I have found that the 1,327 deletions are direct replacements, changes to ensure better compatibility and refactoring. None of the deletions made show up in the branch comparison feature.

However, when these files are compared by looking within their respective branches, there are fixes that were applied to only the master branch. The files which have had fixes only on the master branch are as follows:

• build.gradle : Misses fixes from Added a recursive look-up mechanism for the java.lang.ClassLoader.defineClass() native method and the necessary unit test testDefineClass for this change (#199) #203, add PolDet (Pollution Detection) implementation #285 and Add ptml plugin #296

• jpf.properties : Misses fixes from Added a recursive look-up mechanism for the java.lang.ClassLoader.defineClass() native method and the necessary unit test testDefineClass for this change (#199) #203

• Model class:

  1. classes/java/lang/System.java : Misses @cyrille-artho's fix for Fix for System.in.available()

• JPF source:

  1. jpf/vm/ClassInfo.java : Misses fixes from Fixed missing ClassNotFoundException due to oversimplifying the checks in the ClassLoader.loadClass() method call (#205) #209
  2. jpf/vm/MJIEnv.java : Misses @cyrille-artho's fix - FIX: "java.lang.Char" should be "java.lang.Character"
  3. jpf/vm/StackFrame.java : Misses fix from [fix-bug]: checking attrs is not null in method StackFrame:replaceLocalAttr( ) #166 and Systematically explore bit-flip faults in user-specified variables in Java programs. #295

• Native peers:

  1. peers/JPF_java_lang_ClassLoader.java : Misses fixes from Added a recursive look-up mechanism for the java.lang.ClassLoader.defineClass() native method and the necessary unit test testDefineClass for this change (#199) #203
  2. peers/JPF_java_lang_String.java : Misses @cyrille-artho's fix - Fixed out-of-bounds cases for substring

• Test files:

  1. test/java/lang/ClassTest.java : Misses fix from Fixed Class.forName for primitive array types #372
  2. test/java/lang/ClassLoaderTest.java : Misses fix from Added a recursive look-up mechanism for the java.lang.ClassLoader.defineClass() native method and the necessary unit test testDefineClass for this change (#199) #203
  3. test/java/lang/RunTimeTest.java : Misses @cyrille-artho's fix for Support Runtime.halt
  4. test/java/lang/StringTest.java : Misses @cyrille-artho's fix Added StringIndexOutOfBoundsException for charAt, with unit tests and A bug in java.lang.String.lastIndexOf #197 fix
  5. test/java/text/DecimalFormatTest.java : Misses fix from Issue #163: Support java.nio.Buffer #171

Out of the 217 changed files reviewed, the above 13 files have fixes that need to be incorporated into the java-10-gradle branch.

Some files do exist such that, they have changed on the master branch but are not included by the branch comparison tool as the same file has not been modified on the java-10-gradle branch. For example, jpf/vm/Types.java file which has been updated with a fix for #204.

I am reviewing all files to make sure we do not miss such fixes.

Thanks!

cc @pparizek

[varad64]

Hello @cyrille-artho and @pparizek, following up on my last comment about identifying files modified only on the master branch, so as to not skip any fixes/features before making the java-10-gradle the default branch. All such files have been identified after thorough investigation and there are 43 such files, please find them categorised as below:

• Model classes: (src/classes)

  1. classes/java/lang/ThreadLocal.java : Misses the update for java.lang.ThreadLocal.withInitial method missing #292
  2. classes/java/nio/Buffer.java : Misses the fix Issue #163: Support java.nio.Buffer #171
  3. classes/java/nio/ByteBuffer.java : Misses the fix Issue #163: Support java.nio.Buffer #171
  4. classes/java/text/NumberFormat.java : Misses the fix Issue #163: Support java.nio.Buffer #171
  5. classes/java/util/regex/Matcher.java : Misses the fix Issue #163: Support java.nio.Buffer #171
  6. classes/java/util/regex/Pattern.java : Misses the fix Fix testBufferConstructor Test #244

• JPF source: (src/main/gov/nasa/jpf)

  1. jpf/jvm/bytecode/DDIV.java : Misses @cyrille-artho's fix for division by zero for doubles.
  2. jpf/listener/BitFlipListener.java : Added as part of Systematically explore bit-flip faults in user-specified variables in Java programs. #295
  3. jpf/report/Publisher.java : Misses @cyrille-artho's fix to address missing code.
  4. jpf/search/RandomSearch.java : Misses the fix from fixed random search where only one path is explored even with limit > 1 #212
  5. jpf/search/Search.java : Documentation update as part of Updated Search.java documentation #184
  6. jpf/search/SearchListener.java : Documentation update as part of Expanded the javadoc for SearchListener.java and SearchListenerAdapter.java #178
  7. jpf/search/SearchListenerAdapter.java : Documentation update as part of Expanded the javadoc for SearchListener.java and SearchListenerAdapter.java #178
  8. jpf/vm/serialize/PolDetSerializer.java : Added per add PolDet (Pollution Detection) implementation #285
  9. jpf/vm/JPF_gov_nasa_jpf_vm_Verify.java : Updated as part of Systematically explore bit-flip faults in user-specified variables in Java programs. #295
  10. jpf/vm/NativePeer.java : Typo fixed as part of Add Peer for java.util.concurrent.atomic.AtomicReference #182
  11. jpf/vm/Types.java : Misses the fix made for Systematically explore bit-flip faults in user-specified variables in Java programs. #295
  12. jpf/vm/Verify.java : Code refactored per remove the empty bodies of some methods in Verify.java, and add native qualifiers for them #299 and missing fix from Systematically explore bit-flip faults in user-specified variables in Java programs. #295

• Native peers: (src/peers)

  1. JPF_PolDetListener.java : Added as part of add PolDet (Pollution Detection) implementation #285
  2. JPF_java_lang_Runtime.java : Misses @cyrille-artho's fix for "Support runtime.halt"
  3. JPF_java_lang_reflect_Field.java : Misses @cyrille-artho's fix to use Character instead of Char
  4. JPF_java_util_concurrent_atomic_AtomicReference.java : Added as part of Add Peer for java.util.concurrent.atomic.AtomicReference #182
  5. JPF_java_util_regex_Matcher.java : Misses the fix Issue #163: Support java.nio.Buffer #171

• Tests: (src/tests)

  1. PolDet : Tests added as part of add PolDet (Pollution Detection) implementation #285
  2. ThreadLocalTest : Added as part of java.lang.ThreadLocal.withInitial method missing #292
  3. test/basic/ConsolePublisherTest.java : Misses @cyrille-artho's fix to address missing code. Test does not exist on the java-10-gradle branch
  4. test/java/concurrent/AtomicReferenceTest.java : Added as part of Add Peer for java.util.concurrent.atomic.AtomicReference #182
  5. test/java/io/FileIOTest.java : Added as part of @cyrille-artho's test on redirecting stdout to file
  6. test/java/io/PrintStream.java : Missing the fix Rectifies the java.lang.NoSuchMethodError when usinf printf #172. Test does not exist on the java-10-gradle branch
  7. test/java/lang/FloatTest.java : Added as part of @cyrille-artho's fix for division by zero for doubles.
  8. test/java/lang/DoubleTest.java : Added as part of @cyrille-artho's fix for division by zero for doubles.
  9. test/java/lang/SystemTest.java : Misses @cyrille-artho's fix for System.in.available()
  10. test/java/nio/ByteBufferTest.java : Added as part of Issue #163: Support java.nio.Buffer #171
  11. test/java/util/CalendarTest.java : Added as part of Calendar peer bug demonstration #181. Not sure if this should be considered
  12. test/mc/basic/StatelessTest.java : Updated as part of fixed random search where only one path is explored even with limit > 1 #212
  13. test/mc/data/BitFlipTest.java : Added as part of Systematically explore bit-flip faults in user-specified variables in Java programs. #295
  14. test/vm/StackFrameTest.java : Added as part of [fix-bug]: checking attrs is not null in method StackFrame:replaceLocalAttr( ) #166
  15. test/java8/functionTest/FunctionsTest.java : Added as part of Unit test for Package java.util.function #308
  16. test/java8/timeTest : Added as part of Unit test for java.time #312
  17. test/java8/StreamTest.java : Added as part of Support for java.util.stream library #302

• Examples: (src/examples)

  • ConcurrentCount.java and ConcurrentCount.jpf : Added as part of Implements a jpf example ConcurrentCount #177. Not sure if these should be considered

• Annotations: (src/annotations)

  • annotation/BitFlip.java : Added as part of Systematically explore bit-flip faults in user-specified variables in Java programs. #295.

Thank you!

[varad64]

Hello @cyrille-artho and @pparizek, a total of 35 pull requests / commits were identified which modify the above listed files only on the master branch. The changes comprise bug fixes, addition of functionality and documentation updates.

After going through all the 35 patches, please find the updates as below:

1. 27 patches successfully pass. Updates were necessary for some patches to work as expected.
2. 3 patches related to Types, ClassLoaderTest are on hold as Modify Types.instanceOf to take a ClassInfo as LHS #410 which modifies the same set of files and tests modified by the patches
3. 4 patches related to the String class and its native peer as the implementation of the String class has changed, and these patches are no longer relevant and 1 patch which adds a JPF example has been skipped as it does not meet the standards prescribed and lacks proper documentation.

All of the details about the patches applied has been maintained here.

Thanks!

[varad64]

Hello @cyrille-artho and @pparizek, the exercise of applying patches that either add new functionality or fix bugs, from the master branch to the java-10-gradle branch is now complete.

The patches that were on hold due to #388 and 388 itself have now been included in the list and a related patch, #208 is also added. This takes the total tally of patches to 37, and of these:

1. 32 patches have been applied and successfully pass.
2. 4 patches, related to the String class and its native peer have been skipped as the implementation of the class has been changed.
3. 1 patch has been skipped as Modify Types.instanceOf to take a ClassInfo as LHS #388 redefines and adds to the former.

All details about can be found in this spreadsheet.

Thanks!

[cyrille-artho]

Great, so we can close this issue now, right?

[varad64]

Yes @cyrille-artho, good to close this issue now.
Thanks!