Merge pull request #1 from JetBrains/master

sync with upstream

.bunch

@@ -1,8 +1,7 @@
-191
 192
-183
-182_183
-as33_182_183
-as34_183
-as35
-as36_192
+193
+191
+183_191
+as34_183_191
+as35_191
+as36

.gitignore

@@ -51,5 +51,6 @@ build/
 kotlin-ultimate/
 node_modules/
 .rpt2_cache/
-libraries/tools/kotlin-test-nodejs-runner/lib/
+libraries/tools/kotlin-test-js-runner/lib/
+libraries/tools/kotlin-source-map-loader/lib/
 local.properties

ReadMe.md

@@ -99,7 +99,7 @@ Development for some particular platform is possible after 'switching' that can
 cd kotlin-project-dir
 
 # switching to IntelliJ Idea 2018.2
-bunch switch . 182
+bunch switch 182
 ```
 
 ## <a name="working-in-idea"></a> Working with the project in IntelliJ IDEA

benchmarks/build.gradle.kts

@@ -0,0 +1,82 @@
+import kotlinx.benchmark.gradle.benchmark
+
+val benchmarks_version = "0.2.0-dev-4"
+buildscript {
+    val benchmarks_version = "0.2.0-dev-4"
+
+    repositories {
+        val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
+        if (cacheRedirectorEnabled) {
+            maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlinx")
+            maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev")
+        } else {
+            maven("https://dl.bintray.com/kotlin/kotlinx")
+            maven("https://dl.bintray.com/kotlin/kotlin-dev")
+        }
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlinx:kotlinx.benchmark.gradle:$benchmarks_version")
+    }
+}
+
+apply(plugin = "kotlinx.benchmark")
+
+plugins {
+    java
+    kotlin("jvm")
+}
+
+repositories {
+    val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
+    if (cacheRedirectorEnabled) {
+        maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlinx")
+        maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev")
+    } else {
+        maven("https://dl.bintray.com/kotlin/kotlinx")
+        maven("https://dl.bintray.com/kotlin/kotlin-dev")
+    }
+}
+
+dependencies {
+    compile(kotlinStdlib())
+    compile(project(":compiler:frontend"))
+    compile(project(":compiler:cli"))
+    compile(intellijCoreDep()) { includeJars("intellij-core") }
+    compile(jpsStandalone()) { includeJars("jps-model") }
+    Platform[192].orHigher {
+        compile(intellijPluginDep("java"))
+    }
+    compile(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    compile("org.jetbrains.kotlinx:kotlinx.benchmark.runtime-jvm:$benchmarks_version")
+}
+
+sourceSets {
+    "main" { projectDefault() }
+}
+
+benchmark {
+    configurations {
+        named("main") {
+            warmups = 10
+            iterations = 10
+            iterationTime = 1
+            iterationTimeUnit = "sec"
+            param("size", 1000)
+        }
+
+        register("fir") {
+            warmups = 10
+            iterations = 10
+            iterationTime = 1
+            iterationTimeUnit = "sec"
+            param("isIR", true)
+            param("size", 1000)
+
+            include("CommonCallsBenchmark")
+            //include("InferenceBaselineCallsBenchmark")
+        }
+    }
+    targets {
+        register("main")
+    }
+}

benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractInferenceBenchmark.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.benchmarks
+
+import org.openjdk.jmh.annotations.Param
+import org.openjdk.jmh.annotations.Scope
+import org.openjdk.jmh.annotations.State
+
+@State(Scope.Benchmark)
+abstract class AbstractInferenceBenchmark : AbstractSimpleFileBenchmark() {
+    @Param("true", "false")
+    private var useNI: Boolean = false
+
+    override val useNewInference: Boolean
+        get() = useNI
+}