summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-05-17 06:00:57 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-05-17 06:00:57 -0700
commite927cbc39a081dc0eeddc1bc264bcbe3f9b3c7d0 (patch)
tree710b99b185d385676cc3ff4eea9beca1d5e3efce
parent4f8c306aca703c63282295c9f74f0cb35f9f85d4 (diff)
parent61140384f628b703797ab7ccc3466ad90350abec (diff)
downloadscala-e927cbc39a081dc0eeddc1bc264bcbe3f9b3c7d0.tar.gz
scala-e927cbc39a081dc0eeddc1bc264bcbe3f9b3c7d0.tar.bz2
scala-e927cbc39a081dc0eeddc1bc264bcbe3f9b3c7d0.zip
Merge pull request #2550 from scalamacros/2.10.x
[nomaster] unbreaks test.bc
-rw-r--r--src/reflect/scala/reflect/runtime/JavaMirrors.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index 09b07bb2c7..ed4458c455 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -287,6 +287,9 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
// if (!symbol.isMutable) ErrorSetImmutableField(symbol)
jfield.set(receiver, value)
}
+ // this dummy method is necessary to prevent the optimizer from stripping off ErrorSetImmutableField
+ // which would break binary compatibility with 2.10.0
+ private def dummy(symbol: Symbol) = ErrorSetImmutableField(symbol)
override def toString = s"field mirror for ${symbol.fullName} (bound to $receiver)"
}