Revert "Remove definitions from Kernel canonical names."

runtime/vm/kernel_to_il.h

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef RUNTIME_VM_KERNEL_TO_IL_H_
 #define RUNTIME_VM_KERNEL_TO_IL_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include "vm/growable_array.h"
@@ skipping 283 matching lines @@
   const dart::String& DartString(const char* content, Heap::Space space);
 
   dart::String& DartString(String* content) {
     return DartString(content, allocation_space_);
   }
   dart::String& DartString(String* content, Heap::Space space);
 
   const dart::String& DartSymbol(const char* content) const;
   dart::String& DartSymbol(String* content) const;
 
-  const dart::String& DartClassName(CanonicalName* kernel_class);
+  const dart::String& DartClassName(CanonicalName* kernel_klass);
+  const dart::String& DartConstructorName(Constructor* node);
+  const dart::String& DartProcedureName(Procedure* procedure);
 
-  const dart::String& DartConstructorName(CanonicalName* constructor);
-
-  const dart::String& DartProcedureName(CanonicalName* procedure);
-
-  const dart::String& DartSetterName(CanonicalName* setter);
-  const dart::String& DartSetterName(Name* setter_name);
-
-  const dart::String& DartGetterName(CanonicalName* getter);
-  const dart::String& DartGetterName(Name* getter_name);
-
+  const dart::String& DartSetterName(Name* kernel_name);
+  const dart::String& DartGetterName(Name* kernel_name);
   const dart::String& DartFieldName(Name* kernel_name);
-
   const dart::String& DartInitializerName(Name* kernel_name);
-
-  const dart::String& DartMethodName(CanonicalName* method);
-  const dart::String& DartMethodName(Name* method_name);
-
-  const dart::String& DartFactoryName(CanonicalName* factory);
+  const dart::String& DartMethodName(Name* kernel_name);
+  const dart::String& DartFactoryName(Class* klass, Name* kernel_name);
 
   const Array& ArgumentNames(List<NamedExpression>* named);
 
   // A subclass overrides these when reading in the Kernel program in order to
   // support recursive type expressions (e.g. for "implements X" ...
   // annotations).
   virtual RawLibrary* LookupLibraryByKernelLibrary(CanonicalName* library);
   virtual RawClass* LookupClassByKernelClass(CanonicalName* klass);
 
-  RawField* LookupFieldByKernelField(CanonicalName* field);
-  RawFunction* LookupStaticMethodByKernelProcedure(CanonicalName* procedure);
-  RawFunction* LookupConstructorByKernelConstructor(CanonicalName* constructor);
+  RawField* LookupFieldByKernelField(Field* field);
+  RawFunction* LookupStaticMethodByKernelProcedure(Procedure* procedure);
+  RawFunction* LookupConstructorByKernelConstructor(Constructor* constructor);
   dart::RawFunction* LookupConstructorByKernelConstructor(
       const dart::Class& owner,
-      CanonicalName* constructor);
+      Constructor* constructor);
 
   dart::Type& GetCanonicalType(const dart::Class& klass);
 
   void ReportError(const char* format, ...);
   void ReportError(const Error& prev_error, const char* format, ...);
 
  private:
-  // This will mangle [name_to_modify] if necessary and make the result a symbol
-  // if asked.  The result will be avilable in [name_to_modify] and it is also
-  // returned.  If the name is private, the canonical name [parent] will be used
-  // to get the import URI of the library where the name is visible.
-  dart::String& ManglePrivateName(CanonicalName* parent,
+  // This will mangle [kernel_name] (if necessary) and make the result a symbol.
+  // The result will be avilable in [name_to_modify] and it is also returned.
+  dart::String& ManglePrivateName(CanonicalName* kernel_library,
                                   dart::String* name_to_modify,
                                   bool symbolize = true);
 
-  const dart::String& DartSetterName(CanonicalName* parent, String* setter);
-  const dart::String& DartGetterName(CanonicalName* parent, String* getter);
-  const dart::String& DartMethodName(CanonicalName* parent, String* method);
-
   dart::Thread* thread_;
   dart::Zone* zone_;
   dart::Isolate* isolate_;
   Heap::Space allocation_space_;
 };
 
 // Regarding malformed types:
 // The spec says in section "19.1 Static Types" roughly:
 //
 //   A type T is malformed iff:
@@ skipping 458 matching lines @@
 
   void SetupDefaultParameterValues(FunctionNode* function);
 
   TargetEntryInstr* BuildTargetEntry();
   JoinEntryInstr* BuildJoinEntry();
   JoinEntryInstr* BuildJoinEntry(intptr_t try_index);
 
   Fragment TranslateArguments(Arguments* node, Array* argument_names);
   ArgumentArray GetArguments(int count);
 
-  Fragment TranslateInitializers(Class* kernel_class,
+  Fragment TranslateInitializers(Class* kernel_klass,
                                  List<Initializer>* initialiers);
 
   Fragment TranslateStatement(Statement* statement);
   Fragment TranslateCondition(Expression* expression, bool* negate);
   Fragment TranslateExpression(Expression* expression);
 
   Fragment TranslateFinallyFinalizers(TryFinallyBlock* outer_finally,
                                       intptr_t target_context_depth);
 
   Fragment TranslateFunctionNode(FunctionNode* node, TreeNode* parent);
@@ skipping 106 matching lines @@
                                         const dart::String& dst_name);
 
   Fragment AssertBool();
   Fragment AssertAssignable(const dart::AbstractType& dst_type,
                             const dart::String& dst_name);
 
   bool NeedsDebugStepCheck(const Function& function, TokenPosition position);
   bool NeedsDebugStepCheck(Value* value, TokenPosition position);
   Fragment DebugStepCheck(TokenPosition position);
 
-  dart::RawFunction* LookupMethodByMember(CanonicalName* target,
+  dart::RawFunction* LookupMethodByMember(Member* target,
                                           const dart::String& method_name);
 
   LocalVariable* MakeTemporary();
   LocalVariable* MakeNonTemporary(const dart::String& symbol);
 
   intptr_t CurrentTryIndex();
   intptr_t AllocateTryIndex() { return next_used_try_index_++; }
 
   void AddVariable(VariableDeclaration* declaration, LocalVariable* variable);
   void AddParameter(VariableDeclaration* declaration,
@@ skipping 119 matching lines @@
 namespace kernel {
 
 RawObject* EvaluateMetadata(TreeNode* const kernel_node);
 RawObject* BuildParameterDescriptor(TreeNode* const kernel_node);
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_TO_IL_H_