summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sources/scalac/transformer/AddInterfaces.java3
-rw-r--r--sources/scalac/transformer/AddInterfacesPhase.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java
index fec955fdfe..c5b6b94fab 100644
--- a/sources/scalac/transformer/AddInterfaces.java
+++ b/sources/scalac/transformer/AddInterfaces.java
@@ -97,7 +97,8 @@ public class AddInterfaces extends GenTransformer {
case Ident(_):
Symbol symbol = tree.symbol();
if (symbol.isInitializer()) return getClassMember(symbol);
- if (symbol.isParameter()) return getClassVParam(symbol);
+ if (symbol.isParameter() && !symbol.owner().isStatic())
+ return getClassVParam(symbol);
return symbol;
default:
return tree.symbol();
diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java
index 388510059d..e018abb00e 100644
--- a/sources/scalac/transformer/AddInterfacesPhase.java
+++ b/sources/scalac/transformer/AddInterfacesPhase.java
@@ -102,7 +102,7 @@ public class AddInterfacesPhase extends Phase {
}
protected boolean memberGoesInInterface(Symbol member) {
- return member.isType() || member.isMethod();
+ return !member.isStatic() && (member.isType() || member.isMethod());
}
protected final SymbolNameWriter uniqueNameWriter = new SymbolNameWriter()