diff options
| author | Samuel Gruetter <samuel.gruetter@epfl.ch> | 2014-03-21 23:49:11 +0100 |
|---|---|---|
| committer | Samuel Gruetter <samuel.gruetter@epfl.ch> | 2014-03-21 23:49:11 +0100 |
| commit | f40007e5dfec2c7316c4b12ec2b33f4351819aa4 (patch) | |
| tree | a94cbc0ac335d3b32de9b4a19389812f1a21a6c3 /src/dotty/tools/dotc/core/pickling/ClassfileParser.scala | |
| parent | 357d5ccd88a11db8cb11ebccf4675fc34c133134 (diff) | |
| download | dotty-f40007e5dfec2c7316c4b12ec2b33f4351819aa4.tar.gz dotty-f40007e5dfec2c7316c4b12ec2b33f4351819aa4.tar.bz2 dotty-f40007e5dfec2c7316c4b12ec2b33f4351819aa4.zip | |
ClassfileParser: apply scala commit e78896f (invokedynamic)
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/ClassfileParser.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/ClassfileParser.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala b/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala index bde723c9c..c33d5c18f 100644 --- a/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala +++ b/src/dotty/tools/dotc/core/pickling/ClassfileParser.scala @@ -773,10 +773,13 @@ class ClassfileParser( (in.nextByte.toInt: @switch) match { case CONSTANT_UTF8 | CONSTANT_UNICODE => in.skip(in.nextChar) - case CONSTANT_CLASS | CONSTANT_STRING => + case CONSTANT_CLASS | CONSTANT_STRING | CONSTANT_METHODTYPE => in.skip(2) + case CONSTANT_METHODHANDLE => + in.skip(3) case CONSTANT_FIELDREF | CONSTANT_METHODREF | CONSTANT_INTFMETHODREF - | CONSTANT_NAMEANDTYPE | CONSTANT_INTEGER | CONSTANT_FLOAT => + | CONSTANT_NAMEANDTYPE | CONSTANT_INTEGER | CONSTANT_FLOAT + | CONSTANT_INVOKEDYNAMIC => in.skip(4) case CONSTANT_LONG | CONSTANT_DOUBLE => in.skip(8) |