Revert "Handle metadata on nested function parameters."

sdk/lib/_internal/compiler/implementation/elements/elements.dart

Index: sdk/lib/_internal/compiler/implementation/elements/elements.dart
diff --git a/sdk/lib/_internal/compiler/implementation/elements/elements.dart b/sdk/lib/_internal/compiler/implementation/elements/elements.dart
index 1babeb30afdf752ca00edc0fc8443fe5dcf49108..327ccffd392201177d4c729ebfb9a905cfccdd36 100644
--- a/sdk/lib/_internal/compiler/implementation/elements/elements.dart
+++ b/sdk/lib/_internal/compiler/implementation/elements/elements.dart
@@ -386,9 +386,7 @@ abstract class Element implements Spannable {
 
   void diagnose(Element context, DiagnosticListener listener);
 
-  // TODO(johnniwinther): Move this to [AstElement].
-  /// Returns the [Element] that holds the [TreeElements] for this element.
-  AnalyzableElement get analyzableElement;
+  TreeElements get treeElements;
 
   accept(ElementVisitor visitor);
 }
@@ -784,8 +782,7 @@ abstract class CompilationUnitElement extends Element {
   int compareTo(CompilationUnitElement other);
 }
 
-abstract class LibraryElement extends Element
-    implements ScopeContainerElement, AnalyzableElement {
+abstract class LibraryElement extends Element implements ScopeContainerElement {
   /**
    * The canonical uri for this library.
    *
@@ -1229,6 +1226,9 @@ abstract class MetadataAnnotation implements Spannable {
   Token get beginToken;
   Token get endToken;
 
+  // TODO(kasperl): Try to get rid of these.
+  void set annotatedElement(Element value);
+
   MetadataAnnotation ensureResolved(Compiler compiler);
 }
 
@@ -1244,17 +1244,10 @@ abstract class FunctionTypedElement extends Element {
   FunctionSignature get functionSignature;
 }
 
-/// An [Element] that holds a [TreeElements] mapping.
-abstract class AnalyzableElement extends Element {
-  /// Returns the [TreeElements] that hold the resolution information for the
-  /// AST nodes of this element.
-  TreeElements get treeElements;
-}
-
 /// An [Element] that (potentially) has a node.
 ///
 /// Synthesized elements may return `null` from [node].
-abstract class AstElement extends AnalyzableElement {
+abstract class AstElement extends Element {
   Node get node;
 }