diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-14 10:56:35 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-14 17:18:03 +0200 |
| commit | 93751072ef9ce684a5a8282bbf619f62736c30f4 (patch) | |
| tree | 8d84eee3dde2789681de02d1b3266025ec426bfa /src | |
| parent | a6b0250b812f189939bd12edf4f543feb801f7c2 (diff) | |
| download | scala-93751072ef9ce684a5a8282bbf619f62736c30f4.tar.gz scala-93751072ef9ce684a5a8282bbf619f62736c30f4.tar.bz2 scala-93751072ef9ce684a5a8282bbf619f62736c30f4.zip | |
With -Yno-generic-signatures, exit GenASM.getGenericSignature early
This allows using -Yno-generic-signatures as a workaround for SI-4365.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala | 3 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala index 9a2cd5259c..756d90bc53 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala @@ -850,7 +850,8 @@ abstract class GenASM extends SubComponent with BytecodeWriters { // without it. This is particularly bad because the availability of // generic information could disappear as a consequence of a seemingly // unrelated change. - sym.isHidden + settings.Ynogenericsig.value + || sym.isHidden || sym.isLiftedMethod || sym.isBridge || (sym.ownerChain exists (_.isImplClass)) diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 9661ae6b3e..912a5b0e90 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -727,7 +727,8 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with // without it. This is particularly bad because the availability of // generic information could disappear as a consequence of a seemingly // unrelated change. - sym.isHidden + settings.Ynogenericsig.value + || sym.isHidden || sym.isLiftedMethod || sym.isBridge || (sym.ownerChain exists (_.isImplClass)) |