summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2008-08-07 12:20:46 +0000
committerMartin Odersky <odersky@gmail.com>2008-08-07 12:20:46 +0000
commit059f4e7611783974852624a8a7f698d5723c4173 (patch)
tree3647a2eb8d89f5d5deac9519c5ac8098383f1582 /src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
parent47fb4c71effb56201931562c70d7055b8fe66d69 (diff)
downloadscala-059f4e7611783974852624a8a7f698d5723c4173.tar.gz
scala-059f4e7611783974852624a8a7f698d5723c4173.tar.bz2
scala-059f4e7611783974852624a8a7f698d5723c4173.zip
reverted unncessary change
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 70df7c9f17..760cb819ca 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -414,17 +414,14 @@ abstract class ClassfileParser {
def parseMethod() {
val jflags = in.nextChar
var sflags = transFlags(jflags)
- var dropIt = false
if ((jflags & JAVA_ACC_PRIVATE) != 0 && !global.settings.XO.value) {
val name = pool.getName(in.nextChar)
if (name == nme.CONSTRUCTOR)
sawPrivateConstructor = true
in.skip(2); skipAttributes()
} else {
- if ((jflags & JAVA_ACC_BRIDGE) != 0) {
- if (global.settings.target.value == "jvm-1.5") sflags |= BRIDGE
- else dropIt = true
- }
+ if ((jflags & JAVA_ACC_BRIDGE) != 0)
+ sflags |= BRIDGE
if ((sflags & PRIVATE) != 0 && global.settings.XO.value) {
in.skip(4); skipAttributes()
} else {
@@ -443,7 +440,7 @@ abstract class ClassfileParser {
if ((jflags & JAVA_ACC_VARARGS) != 0) {
sym.setInfo(arrayToRepeated(sym.info))
}
- if (!dropIt) getScope(jflags).enter(sym)
+ getScope(jflags).enter(sym)
}
}
}