- Renamed isFinal into isMethodFinal

- Moved additional tests from TailCall into method isMethodFinal

2 files changed, 8 insertions, 7 deletions

diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index 5acaec4dee..e87c4d201e 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -250,9 +250,13 @@ public abstract class Symbol implements Modifiers, Kinds {
         return kind == VAL && (flags & MUTABLE) != 0;
     }
 
-    /** Does this symbol denote a final symbol? */
-    public final boolean isFinal() {
-        return (flags & FINAL) != 0;
+    /**
+     * Does this symbol denote a final method? A final method is one
+     * that can't be overridden in a subclass. This method assumes
+     * that this symbol denotes a method. It doesn't test it.
+     */
+    public final boolean isMethodFinal() {
+        return (flags & FINAL) != 0 || isPrivate() || isLifted();
     }
 
     /** Does this symbol denote a sealed class symbol? */
diff --git a/sources/scalac/transformer/TailCall.java b/sources/scalac/transformer/TailCall.java
index 19914f78ba..39095ac5d6 100644
--- a/sources/scalac/transformer/TailCall.java
+++ b/sources/scalac/transformer/TailCall.java
@@ -152,10 +152,7 @@ public class TailCall extends Transformer {
 			    (qual instanceof This && qual.symbol() == state.currentClass)){
 
 			    // We can only rewrite final functions in a safe way.
-			    if(state.currentFunction.isFinal() ||
-			       state.currentFunction.isPrivate() ||
-			       state.currentFunction.isLifted()
-			       ) { // It would be nice if we had a cant-be-overridden function in symbol...
+			    if(state.currentFunction.isMethodFinal()) {
 
 				Tree[] newArgs = tail_transform(args,false);
 				// Redirect the call to the LabelDef.