merge

Author: DaniilStepanov

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "AbiComparator"]
+	path = AbiComparator
+	url = https://github.com/dnpetrov/AbiComparator/

bbf.conf

@@ -8,8 +8,16 @@ BACKENDS.JVM_NEW_IR="-Xuse-ir"
 #BACKENDS.JS_FIR="-Xuse-fir"
 #BACKENDS.NATIVE=""
 
+#Miscompilation mode
+MISCOMPILATION_MODE = false
+STRICT_MODE = false
+
+#ABI mode
+ABI_CHECK_MODE = false
+IGNORE_MISSING_CLOSURE_CONVERTED_METHOD = true
+
 #Oracle settings
-USE_JAVA_AS_ORACLE = false
+USE_JAVA_AS_ORACLE = true
 
 #Mutator settings
 SAVE_BACKEND_EXCEPTIONS = true
@@ -28,6 +36,7 @@ FASTREDUCE = false
 
 #Paths
 MUTATING_DIR = "tmp/arrays"
+#MUTATING_DIR = "tmp/abiTests/"
 JAVA_FILES_DIR = "tmp/javaDB"
 TMPFILE = "tmp/tmp.kt"
 RESULTS = "tmp/results/"
@@ -38,12 +47,15 @@ LOG = true
 #REPORT PROPERTIES
 TEXT_REPORTER = false
 FILE_REPORTER = true
+SAVE_STATS = true
 
 #Text
 PATH_TO_TEXT_FILE = tmp/results/result.log
 
 #Timeout for one file (in seconds)
-BBF_TIMEOUT = 1200
+BBF_TIMEOUT = 600
+#BBF_TIMEOUT = 1200
+#BBF_TIMEOUT = 2400
 
 #ReduKtor
 # Backend

bugsPerMinute.txt

@@ -0,0 +1,3 @@
+Bugs: 10
+Time: 217
+Bugs per minute: 0.04608294930875576 

build.gradle

@@ -1,5 +1,7 @@
 buildscript {
-    ext.kotlin_version = '1.4-M1'
+    //Do not forget to update intellij core
+    ext.kotlin_version = '1.5.0-dev-309'
+    ext.kotlin_plugin_version = '1.4.20'
     repositories {
         maven() {
             url "https://dl.bintray.com/kotlin/kotlin-eap/"
@@ -10,35 +12,42 @@ buildscript {
         }
     }
 
-
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4-M1"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlin_version}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_plugin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_plugin_version"
+    }
+
+    //ABI COMPARATOR
+    ext {
+        asm_debug_version = '6.0_BETA'
+        apache_commons_text_version = '1.8'
+        kotlinx_metadata_version = '0.1.0'
+        diff_version = '4.5'
     }
 }
 
 plugins {
     id 'java'
-//    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.jvm' version "$kotlin_plugin_version"
     id 'application'
 }
 
 group 'com.stepanov.bbf'
 version '1.0'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 11
 
 repositories {
     mavenCentral()
     jcenter()
     maven() {
-        url "http://dl.bintray.com/vorpal-research/kotlin-maven"
+        url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/"
     }
     maven() {
         url "https://dl.google.com/dl/android/maven2"
     }
     maven() {
-        url "http://jcenter.bintray.com"
+        url "https://jcenter.bintray.com"
     }
     maven() {
         url "https://dl.bintray.com/kotlin/kotlin-dev"
@@ -49,6 +58,12 @@ repositories {
     maven() {
         url 'https://jitpack.io'
     }
+    maven() {
+        url "http://dl.bintray.com/vorpal-research/kotlin-maven"
+    }
+    maven() {
+        url "https://oss.sonatype.org/content/repositories/snapshots"
+    }
 }
 
 
@@ -57,13 +72,13 @@ apply plugin: 'kotlin' // or 'kotlin-multiplatform' for multiplatform projects
 apply plugin: 'kotlinx-serialization'
 
 ext {
-    //kotlinVersion = '1.3.70'
-    //kotlinVersion = '1.4-M1-release-99'
     aetherVersion = '1.1.0'
     javaMainClass = "com.stepanov.bbf.bugfinder.MainKt"
 }
 
 dependencies {
+    //Intellij core
+    compile group: 'com.android.tools.external.com-intellij', name: 'intellij-core', version: '27.3.0-alpha01'
 
     //Log
     compile "log4j:log4j:1.2.17"
@@ -74,16 +89,28 @@ dependencies {
     //Decompiler
     compile 'com.github.fesh0r:fernflower:e35da00aec'
 
+    //Antlr4
+    compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.8-1'
+    compile group: 'org.antlr', name: 'antlr4', version: '4.8-1'
+
     //Serialization
-    compile "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
-    compile group: 'com.android.tools.external.com-intellij', name: 'intellij-core', version: '27.1.0-alpha03'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
+    //compile "org.jetbrains.kotlin:kotlin-compiler:1.4.255-20201110.102611-685"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${kotlin_version}"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-common', version: "${kotlin_version}"
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-compiler', version: "${kotlin_version}"
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-compiler-embeddable', version: "${kotlin_version}"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-daemon-embeddable', version: "${kotlin_version}"
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: "${kotlin_version}"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-test-common', version: "${kotlin_version}"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: "${kotlin_version}"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-test-annotations-common', version: "${kotlin_version}"
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-js', version: "${kotlin_version}"
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-test-js', version: "${kotlin_version}"
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: "${kotlin_version}"
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: "${kotlin_version}"
 
     //Reduktor
@@ -108,17 +135,24 @@ dependencies {
 
     compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
 
+    //AbiComparator
+    compile group: 'org.jsoup', name: 'jsoup', version: '1.13.1'
+    implementation "org.ow2.asm:asm-debug-all:$asm_debug_version"
+    implementation "org.apache.commons:commons-text:$apache_commons_text_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-metadata-jvm:$kotlinx_metadata_version"
+    implementation "io.github.java-diff-utils:java-diff-utils:$diff_version"
+
     //Test
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test', version: '1.3.61'
 
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 
 application {

database.txt

@@ -1,6 +1,5 @@
-#Wed Dec 04 13:11:58 MSK 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,12 +1,13 @@
 package com.stepanov.bbf
 
+import com.stepanov.bbf.bugfinder.manager.ReportProperties
 import org.apache.commons.exec.*
 import org.apache.commons.io.FileUtils
 import java.io.File
 import java.util.*
 
 
-const val COMMAND = "./gradlew runBBF"
+const val COMMAND = "gradle runBBF"
 val TIMEOUT_SEC = Properties()
     .also { it.load(File("bbf.conf").inputStream()) }
     .getProperty("BBF_TIMEOUT")?.toLongOrNull() ?: throw IllegalArgumentException("Can't init timeout value")
@@ -30,6 +31,12 @@ val TIMEOUT_SEC = Properties()
 
 const val pathToErrorLogs = "tmp/results/errorLogs"
 fun main(args: Array<String>) {
+    File("logs/stats.log").let { if (it.exists()) it.delete() }
+    File("bugsPerMinute.txt").writeText("""
+Bugs: 0
+Time: 0
+Bugs per minute: 0.0  
+    """.trimIndent())
     val file = File(pathToErrorLogs)
     if (!file.exists()) file.mkdirs()
     //val dir = File(args[0]).listFiles()
@@ -68,11 +75,25 @@ fun main(args: Array<String>) {
 
 
     //if (joinedArgs.contains("-f") || joinedArgs.contains("--fuzzing")) {
+    var globalCounter = 0L
     while (true) {
         println("Elapsed: $timeElapsed")
         if (handler.hasResult()) {
+            if (timeElapsed > TIMEOUT_SEC * 1000) {
+                var i = 0
+                var newPath: String
+                while (true) {
+                    newPath = "$pathToErrorLogs/logs$i"
+                    if (File(newPath).exists()) i++
+                    else break
+                }
+                val dstDir = File(newPath)
+                dstDir.mkdirs()
+                File("$dstDir/timeout").writeText("timeout")
+                FileUtils.copyDirectory(File("logs"), dstDir)
+            }
             //IF error then save logs
-            if (handler.exitValue != 0) {
+            else if (handler.exitValue != 0) {
                 var i = 0
                 var newPath: String
                 while (true) {
@@ -98,12 +119,28 @@ fun main(args: Array<String>) {
             executor.execute(cmdLine, handler)
             timeElapsed = 0
         }
+        globalCounter += 1000
+        if ((globalCounter / 1000) % 60 == 0L) {
+            if (ReportProperties.getPropAsBoolean("SAVE_STATS") == true) saveStats((globalCounter / 1000) / 60)
+        }
         timeElapsed += 1000
         Thread.sleep(1000)
     }
     /*} else {
         while (true) {
-            if (handler.hasResult()) System.exit(0)
+            if (handler.hasRe sult()) System.exit(0)
         }
     } */
+}
+
+private fun saveStats(timeElapsedInMinutes: Long) {
+    val f = File("bugsPerMinute.txt")
+    val curText = StringBuilder(f.readText())
+    val bugs = curText.split("\n").first().split(": ").last().toInt()
+    val newText = """
+        Bugs: $bugs
+        Time: $timeElapsedInMinutes
+        Bugs per minute: ${bugs.toDouble() / timeElapsedInMinutes.toDouble()} 
+    """.trimIndent()
+    f.writeText(newText)
 }

src/main/kotlin/com/stepanov/bbf/Main.kt

@@ -0,0 +1,26 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+*.kotlin_module
+/gradlew
+/gradlew.bat
+/build/
+/.gradle/
+/gradle/