diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-01-29 23:53:45 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-01-29 23:54:17 +0100 |
| commit | 98d7f7e9b5409af08630253756dd38805b81edb0 (patch) | |
| tree | 7407ac20e790590786b208cbb6bf7db4dd27b988 /test/files/pos | |
| parent | a03c34c140709e95bb6ab6a8984747b83d630eea (diff) | |
| parent | 3e49826ca0c0c57ef14bc107a45084def5520d80 (diff) | |
| download | scala-98d7f7e9b5409af08630253756dd38805b81edb0.tar.gz scala-98d7f7e9b5409af08630253756dd38805b81edb0.tar.bz2 scala-98d7f7e9b5409af08630253756dd38805b81edb0.zip | |
Merge remote-tracking branch 'paulp/inline' into topic/inline
Temporarily removed getClass from AnyVal to get build going.
Disabled anyval-childen test.
Fixed some other build problems.
Implemented step 1 + 2 of inline classes proposal.
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/trait-force-info.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/trait-force-info.scala | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/test/files/pos/trait-force-info.flags b/test/files/pos/trait-force-info.flags new file mode 100644 index 0000000000..eb4d19bcb9 --- /dev/null +++ b/test/files/pos/trait-force-info.flags @@ -0,0 +1 @@ +-optimise
\ No newline at end of file diff --git a/test/files/pos/trait-force-info.scala b/test/files/pos/trait-force-info.scala new file mode 100644 index 0000000000..e01d225c84 --- /dev/null +++ b/test/files/pos/trait-force-info.scala @@ -0,0 +1,18 @@ +/** This does NOT crash unless it's in the interactive package. + */ + +package scala.tools.nsc +package interactive + +trait MyContextTrees { + val self: Global + val NoContext = self.analyzer.NoContext +} +// +// error: java.lang.AssertionError: assertion failed: trait Contexts.NoContext$ linkedModule: <none>List() +// at scala.Predef$.assert(Predef.scala:160) +// at scala.tools.nsc.symtab.classfile.ClassfileParser$innerClasses$.innerSymbol$1(ClassfileParser.scala:1211) +// at scala.tools.nsc.symtab.classfile.ClassfileParser$innerClasses$.classSymbol(ClassfileParser.scala:1223) +// at scala.tools.nsc.symtab.classfile.ClassfileParser.classNameToSymbol(ClassfileParser.scala:489) +// at scala.tools.nsc.symtab.classfile.ClassfileParser.sig2type$1(ClassfileParser.scala:757) +// at scala.tools.nsc.symtab.classfile.ClassfileParser.sig2type$1(ClassfileParser.scala:789) |