diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-08 17:45:46 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-10 10:36:51 -0800 |
| commit | 85b63b81d5951a78547641e3feab0886f6013ea1 (patch) | |
| tree | 34dbc0c8054303eb92a6a6fea2d48b885f8c5ac4 /bincompat-forward.whitelist.conf | |
| parent | 2f9b708b748e7a2fb252ae1ab546f4824ec0f283 (diff) | |
| download | scala-85b63b81d5951a78547641e3feab0886f6013ea1.tar.gz scala-85b63b81d5951a78547641e3feab0886f6013ea1.tar.bz2 scala-85b63b81d5951a78547641e3feab0886f6013ea1.zip | |
[nomaster] Revert "SI-6548 reflection now correctly enters jinners"
This reverts commit 54a84a36d5b435a787d93ca48d45399136c7e162.
This is necessary to maintain binary compatibility with 2.10.0.
run/t6989.check had to be updated as it also (indirectly) tested SI-6548
Conflicts:
test/files/lib/javac-artifacts.jar.desired.sha1
test/files/run/t6548.check
test/files/run/t6548/Test_2.scala
Diffstat (limited to 'bincompat-forward.whitelist.conf')
| -rw-r--r-- | bincompat-forward.whitelist.conf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf index 66d2ba7154..529fab1e14 100644 --- a/bincompat-forward.whitelist.conf +++ b/bincompat-forward.whitelist.conf @@ -61,14 +61,14 @@ filter { }, # scala.reflect.runtime - { - matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$jclassAsScala" - problemName=IncompatibleResultTypeProblem - }, - { - matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$jclassAsScala1" - problemName=MissingMethodProblem - }, + # { + # matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$jclassAsScala" + # problemName=IncompatibleResultTypeProblem + # }, + # { + # matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$jclassAsScala1" + # problemName=MissingMethodProblem + # }, # { # matchName="scala.reflect.runtime.SymbolLoaders.initClassAndModule" # problemName=MissingMethodProblem |