summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
Diffstat (limited to 'sources')
-rw-r--r--sources/scalac/symtab/classfile/AttributeParser.java5
-rw-r--r--sources/scalac/symtab/classfile/CLRClassParser.java17
2 files changed, 4 insertions, 18 deletions
diff --git a/sources/scalac/symtab/classfile/AttributeParser.java b/sources/scalac/symtab/classfile/AttributeParser.java
index 23c84bf662..183e96785b 100644
--- a/sources/scalac/symtab/classfile/AttributeParser.java
+++ b/sources/scalac/symtab/classfile/AttributeParser.java
@@ -129,10 +129,7 @@ public class AttributeParser implements ClassfileConstants {
alias.setInfo(parser.make.classType(inner));
alias.allConstructors()
.setInfo(new Type.MethodType(Symbol.EMPTY_ARRAY, inner.info()));
- Scope.Entry e = parser.statics.lookupEntry(alias.name); // Why is this ??????
- if (e != Scope.Entry.NONE)
- parser.statics.unlink(e);
- parser.statics.enter(alias);
+ parser.statics.enterNoHide(alias);
}
//in.skip(attrLen);
return;
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index 3e66d59fdc..026755a73f 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -103,21 +103,10 @@ public class CLRClassParser extends SymbolLoader {
nclazz.allConstructors().setInfo(this);
nclazz.module().setInfo(this);
//
- alias.setInfo(scalac.symtab.Type
- .typeRef(clazz.owner().thisType(),
- nclazz, scalac.symtab.Type.EMPTY_ARRAY));
+ alias.setInfo(make.classType(nclazz));
alias.allConstructors()
- .setInfo(MethodType(Symbol.EMPTY_ARRAY, nclazz.info()));
-// statics.enter(nclazz);
-// Scope.Entry e = statics.lookupEntry(clazz.module().name);
-// if (e != Scope.Entry.NONE)
-// statics.unlink(e);
-// statics.enter(nclazz.module());
-
- Scope.Entry e = statics.lookupEntry(alias.name); // Why is this ???
- if (e != Scope.Entry.NONE)
- statics.unlink(e);
- statics.enter(alias);
+ .setInfo(MethodType(Symbol.EMPTY_ARRAY, alias.info()));
+ statics.enterNoHide(alias);
}
// read field information