diff options
| author | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-03-08 16:07:46 +0100 |
|---|---|---|
| committer | Miguel Garcia <miguelalfredo.garcia@epfl.ch> | 2012-03-08 16:07:46 +0100 |
| commit | 1c9a3e87661fc94306f51279ecc18df895780e61 (patch) | |
| tree | b8d99ca73b97519fe2bd9afdd0645369e50d25ae /src/compiler | |
| parent | ab897b6515e6aa28c1715aca8b64c9c5cdcf9052 (diff) | |
| parent | 42f90593538a16a285a9bb605da9fd9116e71a57 (diff) | |
| download | scala-1c9a3e87661fc94306f51279ecc18df895780e61.tar.gz scala-1c9a3e87661fc94306f51279ecc18df895780e61.tar.bz2 scala-1c9a3e87661fc94306f51279ecc18df895780e61.zip | |
Merge branch 'master' into GenASM
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 891c55ba1e..e350902cb6 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -1918,7 +1918,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with ((sym.rawflags & (Flags.FINAL | Flags.MODULE)) != 0) && !sym.enclClass.isInterface && !sym.isClassConstructor - && (sym.isLazy || sym.isPrivate || !sym.isMutable) // fix for SI-3569, is it sufficient? + && !sym.isMutable // fix for SI-3569, it is too broad? ) mkFlags( |