diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-12 13:38:42 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-16 11:56:20 -0700 |
commit | 7f9feba0213fc210c7752ab210f900c016032699 (patch) | |
tree | 80bcfeab588097788c6e7fe1463b74a95de0c78e /test/files/run/t6989 | |
parent | 487584caa97d0905df06e32c292c00fcd82a2fa3 (diff) | |
download | scala-7f9feba0213fc210c7752ab210f900c016032699.tar.gz scala-7f9feba0213fc210c7752ab210f900c016032699.tar.bz2 scala-7f9feba0213fc210c7752ab210f900c016032699.zip |
[backport #1727] SI-7359 cyclic nested java class
The original commit message (from 54a84a36d5):
SI-6548 reflection correctly enters jinners
When completing Java classes, runtime reflection enumerates their
fields, methods, constructors and inner classes, loads them and
enters them into either the instance part (ClassSymbol) or the
static part (ModuleSymbol).
However unlike fields, methods and constructors, inner classes don't
need to be entered explicitly - they are entered implicitly when
being loaded.
This patch fixes the double-enter problem, make sure that enter-on-load
uses the correct owner, and also hardens jclassAsScala against double
enters that can occur in a different scenario.
Diffstat (limited to 'test/files/run/t6989')
-rw-r--r-- | test/files/run/t6989/JavaClass_1.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/files/run/t6989/JavaClass_1.java b/test/files/run/t6989/JavaClass_1.java index eb26a08700..72ec4d6ab6 100644 --- a/test/files/run/t6989/JavaClass_1.java +++ b/test/files/run/t6989/JavaClass_1.java @@ -7,6 +7,8 @@ package foo; // I'm leaving the incorrect results of FromJavaClassCompleters in the check // file, so that we get notified when something changes there. +// ^^^ It's not clear what those incorrect results were, but the fix for SI-7359 +// (backport of fix for SI-6548) has probably resolved some of these. OP, please revisit this comment. class PackagePrivateJavaClass { private int privateField = 0; |