Half-disabled productElementName until I have t...

Half-disabled productElementName until I have time to reimplement it
more to martin's liking. ("Half" because full disabling is not possible
until starr has forgotten about it.) No review.

3 files changed, 7 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 08a7227a7f..d3b1d4dabe 100644
--- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
@@ -289,7 +289,7 @@ trait Definitions extends reflect.generic.StandardDefinitions {
     lazy val ProductRootClass: Symbol = getClass("scala.Product")
       def Product_productArity = getMember(ProductRootClass, nme.productArity)
       def Product_productElement = getMember(ProductRootClass, nme.productElement)
-      def Product_productElementName = getMember(ProductRootClass, nme.productElementName)
+      // def Product_productElementName = getMember(ProductRootClass, nme.productElementName)
       def Product_productPrefix = getMember(ProductRootClass, nme.productPrefix)
       def Product_canEqual = getMember(ProductRootClass, nme.canEqual_)
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
index 042343ac16..1e8b89cb6f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
@@ -271,7 +271,9 @@ trait SyntheticMethods extends ast.TreeDSL {
             Product_productPrefix   -> (() => productPrefixMethod),
             Product_productArity    -> (() => productArityMethod(accessors.length)),
             Product_productElement  -> (() => productElementMethod(accessors)),
-            Product_productElementName  -> (() => productElementNameMethod(accessors)),
+            // This is disabled pending a reimplementation which doesn't add any
+            // weight to case classes (i.e. inspects the bytecode.)
+            // Product_productElementName  -> (() => productElementNameMethod(accessors)),
             Product_canEqual        -> (() => canEqualMethod)
           )
         }
diff --git a/src/library/scala/Product.scala b/src/library/scala/Product.scala
index 417b87f191..a0503cfe4c 100644
--- a/src/library/scala/Product.scala
+++ b/src/library/scala/Product.scala
@@ -29,6 +29,9 @@ trait Product extends Equals {
    */
   def productElement(n: Int): Any
 
+  // !!! This will be disabled pending reimplementation, but it can't be removed
+  // until starr forgets about it.
+
   /** Returns the name of the field at the given index from the definition
    *  of the class.
    *