diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-18 10:33:28 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-18 10:33:28 +0200 |
| commit | 133e7d053cc62ce0703d611e34fa750175cc3b48 (patch) | |
| tree | 918e2dd3d8523f41ad8b1da4cf09b5580a13bd25 /test/files/run/nothingTypeNoOpt.scala | |
| parent | 91cd6d1a3db422c576f15eceb0715c572ec44081 (diff) | |
| parent | 76269ca7a63848aee1f141da75be8ca436bf9e6c (diff) | |
| download | scala-133e7d053cc62ce0703d611e34fa750175cc3b48.tar.gz scala-133e7d053cc62ce0703d611e34fa750175cc3b48.tar.bz2 scala-133e7d053cc62ce0703d611e34fa750175cc3b48.zip | |
Merge remote-tracking branch 'upstream/2.12.x' into opt/heuristics
Diffstat (limited to 'test/files/run/nothingTypeNoOpt.scala')
| -rw-r--r-- | test/files/run/nothingTypeNoOpt.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/nothingTypeNoOpt.scala b/test/files/run/nothingTypeNoOpt.scala index 5c5a20fa3b..454539a4b1 100644 --- a/test/files/run/nothingTypeNoOpt.scala +++ b/test/files/run/nothingTypeNoOpt.scala @@ -26,7 +26,7 @@ class C { } def f5(x: Boolean) = { - // stack heights need to be the smae. ??? looks to the jvm like returning a value of + // stack heights need to be the same. ??? looks to the jvm like returning a value of // type Nothing$, need to drop or throw it. println( if (x) { ???; 10 } |