-
Notifications
You must be signed in to change notification settings - Fork 121
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #264 from zehkae/issue101
Fix #101: Remove SimpleType
- Loading branch information
Showing
14 changed files
with
145 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
internal/zinc-benchmarks/src/main/scala/xsbt/ScalacBenchmark.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package xsbt | ||
|
|
||
| import java.util.concurrent.TimeUnit | ||
| import org.openjdk.jmh.annotations._ | ||
|
|
||
| class ScalacBenchmark extends BenchmarkBase { | ||
| _project = BenchmarkProjects.Scalac | ||
| } | ||
|
|
||
| @State(Scope.Benchmark) | ||
| @BenchmarkMode(Array(Mode.SingleShotTime)) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @Fork(value = 10, jvmArgs = Array("-XX:CICompilerCount=2")) | ||
| class ColdScalacBenchmark extends ScalacBenchmark { | ||
| _subprojectToRun = _project.subprojects.head | ||
| @Benchmark | ||
| override def compile(): Unit = { | ||
| super.compile() | ||
| } | ||
| } | ||
|
|
||
| @State(Scope.Benchmark) | ||
| @BenchmarkMode(Array(Mode.SampleTime)) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @Warmup(iterations = 0) | ||
| @Measurement(iterations = 1, time = 30, timeUnit = TimeUnit.SECONDS) | ||
| @Fork(value = 3) | ||
| class WarmScalacBenchmark extends ScalacBenchmark { | ||
| _subprojectToRun = _project.subprojects.head | ||
| @Benchmark | ||
| override def compile(): Unit = { | ||
| super.compile() | ||
| } | ||
| } | ||
|
|
||
| @State(Scope.Benchmark) | ||
| @BenchmarkMode(Array(Mode.SampleTime)) | ||
| @OutputTimeUnit(TimeUnit.MILLISECONDS) | ||
| @Warmup(iterations = 6, time = 10, timeUnit = TimeUnit.SECONDS) | ||
| @Measurement(iterations = 6, time = 10, timeUnit = TimeUnit.SECONDS) | ||
| @Fork(value = 3) | ||
| class HotScalacBenchmark extends ScalacBenchmark { | ||
| _subprojectToRun = _project.subprojects.head | ||
| @Benchmark | ||
| override def compile(): Unit = { | ||
| super.compile() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
zinc/src/sbt-test/source-dependencies/struct-projection/A.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| object A { | ||
| def m: ({type T <: Int})#T = ??? | ||
| } |
3 changes: 3 additions & 0 deletions
3
zinc/src/sbt-test/source-dependencies/struct-projection/B.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| object B { | ||
| val x: Int = A.m | ||
| } |
3 changes: 3 additions & 0 deletions
3
zinc/src/sbt-test/source-dependencies/struct-projection/changes/A.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| object A { | ||
| def m: ({type T <: String})#T = ??? | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| > compile | ||
| $ copy-file changes/A.scala A.scala | ||
| # Compilation of B.scala should fail because type of A.m changed | ||
| -> compile |