diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-01-24 13:03:22 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-01-24 13:03:22 +0100 |
| commit | b0831e774e290148ce28cb7957794542dffe0366 (patch) | |
| tree | 1380b224b4fe31598b07b3ddee9a46ff2e3eaf10 /test/files/run/programmatic-main.check | |
| parent | 1a9e649e34cda4306537d74ab425c33d5f6a77db (diff) | |
| parent | 1081e718f8f8e174dbf615e42b157e187d3d3886 (diff) | |
| download | scala-b0831e774e290148ce28cb7957794542dffe0366.tar.gz scala-b0831e774e290148ce28cb7957794542dffe0366.tar.bz2 scala-b0831e774e290148ce28cb7957794542dffe0366.zip | |
Merge remote-tracking branch 'upstream/2.12.x' into opt/elimBoxes
Diffstat (limited to 'test/files/run/programmatic-main.check')
| -rw-r--r-- | test/files/run/programmatic-main.check | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 1cd94ccb45..280a4f43d5 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -22,6 +22,5 @@ superaccessors 6 add super accessors in traits and nested classes mixin 20 mixin composition cleanup 21 platform-specific cleanups, generate reflective calls delambdafy 22 remove lambdas - icode 23 generate portable intermediate code - jvm 24 generate JVM bytecode - terminal 25 the last phase during a compilation run + jvm 23 generate JVM bytecode + terminal 24 the last phase during a compilation run |