Remove old code generator.

runtime/vm/dart_entry.cc

 // Copyright (c) 2011, 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.
 
 #include "vm/dart_entry.h"
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
@@ skipping 27 matching lines @@
   // Now Call the invoke stub which will invoke the dart function.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   const Context& context =
       Context::ZoneHandle(Isolate::Current()->object_store()->empty_context());
   ASSERT(context.isolate() == Isolate::Current());
   const Code& code = Code::Handle(function.CurrentCode());
   ASSERT(!code.IsNull());
   return entrypoint(
       code.EntryPoint(),
-      CodeGenerator::ArgumentsDescriptor(num_arguments,
-                                         optional_arguments_names),
+      ArgumentsDescriptor(num_arguments, optional_arguments_names),
       args.data(),
       context);
 }
 
 
 RawObject* DartEntry::InvokeStatic(
     const Function& function,
     const GrowableArray<const Object*>& arguments,
     const Array& optional_arguments_names) {
   // Get the entrypoint corresponding to the function specified, this
   // will result in a compilation of the function if it is not already
   // compiled.
   ASSERT(!function.IsNull());
   if (!function.HasCode()) {
     const Error& error = Error::Handle(Compiler::CompileFunction(function));
     if (!error.IsNull()) {
       return error.raw();
     }
   }
   // Now Call the invoke stub which will invoke the dart function.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   const Context& context =
       Context::ZoneHandle(Isolate::Current()->object_store()->empty_context());
   ASSERT(context.isolate() == Isolate::Current());
   const Code& code = Code::Handle(function.CurrentCode());
   ASSERT(!code.IsNull());
   return entrypoint(
       code.EntryPoint(),
-      CodeGenerator::ArgumentsDescriptor(arguments.length(),
-                                         optional_arguments_names),
+      ArgumentsDescriptor(arguments.length(), optional_arguments_names),
       arguments.data(),
       context);
 }
 
 
 RawObject* DartEntry::InvokeClosure(
     const Closure& closure,
     const GrowableArray<const Object*>& arguments,
     const Array& optional_arguments_names) {
   // Get the entrypoint corresponding to the closure specified, this
@@ skipping 10 matching lines @@
     }
   }
   // Now Call the invoke stub which will invoke the closure.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   ASSERT(context.isolate() == Isolate::Current());
   const Code& code = Code::Handle(function.CurrentCode());
   ASSERT(!code.IsNull());
   return entrypoint(
       code.EntryPoint(),
-      CodeGenerator::ArgumentsDescriptor(arguments.length(),
-                                         optional_arguments_names),
+      ArgumentsDescriptor(arguments.length(), optional_arguments_names),
       arguments.data(),
       context);
 }
 
 
+const Array& DartEntry::ArgumentsDescriptor(
+    int num_arguments,
+    const Array& optional_arguments_names) {
+  const intptr_t num_named_args =
+      optional_arguments_names.IsNull() ? 0 : optional_arguments_names.Length();
+  const intptr_t num_pos_args = num_arguments - num_named_args;
+
+  // Build the argument descriptor array, which consists of the total number of
+  // arguments, the number of positional arguments, alphabetically sorted
+  // pairs of name/position, and a terminating null.
+  const int descriptor_len = 3 + (2 * num_named_args);
+  Array& descriptor = Array::ZoneHandle(Array::New(descriptor_len, Heap::kOld));
+
+  // Set total number of passed arguments.
+  descriptor.SetAt(0, Smi::Handle(Smi::New(num_arguments)));
+  // Set number of positional arguments.
+  descriptor.SetAt(1, Smi::Handle(Smi::New(num_pos_args)));
+  // Set alphabetically sorted pairs of name/position for named arguments.
+  String& name = String::Handle();
+  Smi& pos = Smi::Handle();
+  for (int i = 0; i < num_named_args; i++) {
+    name ^= optional_arguments_names.At(i);
+    pos = Smi::New(num_pos_args + i);
+    int j = i;
+    // Shift already inserted pairs with "larger" names.
+    String& name_j = String::Handle();
+    Smi& pos_j = Smi::Handle();
+    while (--j >= 0) {
+      name_j ^= descriptor.At(2 + (2 * j));
+      const intptr_t result = name.CompareTo(name_j);
+      ASSERT(result != 0);  // Duplicate argument names checked in parser.
+      if (result > 0) break;
+      pos_j ^= descriptor.At(3 + (2 * j));
+      descriptor.SetAt(2 + (2 * (j + 1)), name_j);
+      descriptor.SetAt(3 + (2 * (j + 1)), pos_j);
+    }
+    // Insert pair in descriptor array.
+    descriptor.SetAt(2 + (2 * (j + 1)), name);
+    descriptor.SetAt(3 + (2 * (j + 1)), pos);
+  }
+  // Set terminating null.
+  descriptor.SetAt(descriptor_len - 1, Object::Handle());
+
+  // Share the immutable descriptor when possible by canonicalizing it.
+  descriptor.MakeImmutable();
+  descriptor ^= descriptor.Canonicalize();
+  return descriptor;
+}
+
+
 RawObject* DartLibraryCalls::ExceptionCreate(
     const Library& lib,
     const String& class_name,
     const GrowableArray<const Object*>& arguments) {
   const Class& cls = Class::Handle(lib.LookupClass(class_name));
   ASSERT(!cls.IsNull());
   // For now, we only support a non-parameterized or raw type.
   const Instance& exception_object = Instance::Handle(Instance::New(cls));
   GrowableArray<const Object*> constructor_arguments(arguments.length() + 2);
   constructor_arguments.Add(&exception_object);
@@ skipping 139 matching lines @@
   const String& func_name = String::Handle(Field::GetterName(field_name));
   const Function& func = Function::Handle(cls.LookupDynamicFunction(func_name));
   ASSERT(!func.IsNull());
   GrowableArray<const Object*> arguments;
   const Array& kNoArgumentNames = Array::Handle();
   return DartEntry::InvokeDynamic(port, func, arguments, kNoArgumentNames);
 }
 
 
 }  // namespace dart