Merge remote-tracking branch 'upstream/master'

src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java

@@ -72,12 +72,12 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
     PrintStreamLogger logger = new PrintStreamLogger(System.out);
     ConsoleDecompiler decompiler = new ConsoleDecompiler(destination, mapOptions, logger);
 
-    for (File source : sources) {
-      decompiler.addSource(source);
-    }
     for (File library : libraries) {
       decompiler.addLibrary(library);
     }
+    for (File source : sources) {
+      decompiler.addSource(source);
+    }
 
     decompiler.decompileContext();
   }

src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java

@@ -1,13 +1,10 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * @author egor
- */
 public class DummyExitStatement extends Statement {
   public Set<Integer> bytecode = null;  // offsets of bytecode instructions mapped to dummy exit