Tess Strickland
cf63eaed4d
Previously there were several pieces of information shared between both FunctionType and Function, mostly in the packed fields, but named argument names were also kept in both places. Now the FunctionType is the primary source for this information, with the Function only keeping the names of positional arguments, which are discarded in AOT snapshots. This does mean extra work to access this information via the function object, but for the most part, this information is only accessed in the compiler or during dynamic lookups or checks in the runtime. After adding the count of type parameters to the packed information in FunctionType, the packed information has been split into two pieces: one for parameter counts, another for type parameter counts. This split does not increase the size of UntaggedFunctionType, as there were 2 bytes available in the existing padding. Changes on flutter gallery in release mode: * ARM7 code size: total -0.91%, readonly -0.22%, isolate -4.32% * ARM7 heap size: total -2.00% * ARM8 code size: total -0.93%, readonly -0.22%, isolate -4.32% * ARM8 heap size: total -2.12% Changes on flutter gallery in release-sizeopt mode: * ARM7 code size: total -0.24%, readonly -0.08%, isolate -1.49% * ARM7 heap size: total -0.88% * ARM8 code size: total -0.26%, readonly -0.11%, isolate -1.49% * ARM8 heap size: total -1.01% TEST=Refactoring, so existing tests. Cq-Include-Trybots: luci.dart.try:vm-kernel-linux-debug-x64-try,vm-kernel-nnbd-linux-debug-x64-try,vm-kernel-precomp-linux-debug-x64-try,vm-kernel-precomp-nnbd-linux-debug-x64-try,vm-kernel-reload-linux-debug-x64-try,vm-kernel-reload-rollback-linux-debug-x64-try,vm-kernel-precomp-linux-debug-simarm_x64-try,vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try,vm-kernel-linux-debug-ia32-try,vm-kernel-nnbd-linux-debug-ia32-try,vm-kernel-linux-release-simarm-try,vm-kernel-linux-release-simarm64-try,vm-kernel-precomp-linux-debug-simarm_x64-try,vm-kernel-precomp-linux-release-simarm-try,vm-kernel-precomp-linux-release-simarm64-try,vm-kernel-precomp-nnbd-linux-debug-simarm_x64-try,vm-kernel-precomp-nnbd-linux-release-simarm64-try Change-Id: Ic4d59a7b4acca039a5647f9163e716f6019163f5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203241 Commit-Queue: Tess Strickland <sstrickl@google.com> Reviewed-by: Ryan Macnak <rmacnak@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com> Reviewed-by: Régis Crelier <regis@google.com>
81 lines
3.3 KiB
C++
81 lines
3.3 KiB
C++
// Copyright (c) 2020, 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/compiler/ffi/callback.h"
|
|
|
|
#include "vm/class_finalizer.h"
|
|
#include "vm/symbols.h"
|
|
|
|
namespace dart {
|
|
|
|
namespace compiler {
|
|
|
|
namespace ffi {
|
|
|
|
FunctionPtr NativeCallbackFunction(const FunctionType& c_signature,
|
|
const Function& dart_target,
|
|
const Instance& exceptional_return) {
|
|
Thread* const thread = Thread::Current();
|
|
const int32_t callback_id = thread->AllocateFfiCallbackId();
|
|
|
|
// Create a new Function named '<target>_FfiCallback' and stick it in the
|
|
// 'dart:ffi' library. Note that these functions will never be invoked by
|
|
// Dart, so they may have duplicate names.
|
|
Zone* const zone = thread->zone();
|
|
const auto& name = String::Handle(
|
|
zone, Symbols::FromConcat(thread, Symbols::FfiCallback(),
|
|
String::Handle(zone, dart_target.name())));
|
|
const Library& lib = Library::Handle(zone, Library::FfiLibrary());
|
|
const Class& owner_class = Class::Handle(zone, lib.toplevel_class());
|
|
auto& signature = FunctionType::Handle(zone, FunctionType::New());
|
|
const Function& function = Function::Handle(
|
|
zone, Function::New(signature, name, UntaggedFunction::kFfiTrampoline,
|
|
/*is_static=*/true,
|
|
/*is_const=*/false,
|
|
/*is_abstract=*/false,
|
|
/*is_external=*/false,
|
|
/*is_native=*/false, owner_class,
|
|
TokenPosition::kNoSource));
|
|
function.set_is_debuggable(false);
|
|
|
|
// Set callback-specific fields which the flow-graph builder needs to generate
|
|
// the body.
|
|
function.SetFfiCSignature(c_signature);
|
|
function.SetFfiCallbackId(callback_id);
|
|
function.SetFfiCallbackTarget(dart_target);
|
|
|
|
// We need to load the exceptional return value as a constant in the generated
|
|
// function. Even though the FE ensures that it is a constant, it could still
|
|
// be a literal allocated in new space. We need to copy it into old space in
|
|
// that case.
|
|
//
|
|
// Exceptional return values currently cannot be pointers because we don't
|
|
// have constant pointers.
|
|
ASSERT(exceptional_return.IsNull() || exceptional_return.IsNumber());
|
|
if (!exceptional_return.IsSmi() && exceptional_return.IsNew()) {
|
|
function.SetFfiCallbackExceptionalReturn(Instance::Handle(
|
|
zone, exceptional_return.CopyShallowToOldSpace(thread)));
|
|
} else {
|
|
function.SetFfiCallbackExceptionalReturn(exceptional_return);
|
|
}
|
|
|
|
// The dart type of the FfiCallback has no arguments or type arguments and
|
|
// has a result type of dynamic, as the callback is never invoked via Dart,
|
|
// only via native calls that do not use this information. Having no Dart
|
|
// arguments ensures the scope builder does not add inappropriate parameter
|
|
// variables.
|
|
signature.set_result_type(Object::dynamic_type());
|
|
// Finalize (and thus canonicalize) the signature.
|
|
signature ^= ClassFinalizer::FinalizeType(signature);
|
|
function.SetSignature(signature);
|
|
|
|
return function.ptr();
|
|
}
|
|
|
|
} // namespace ffi
|
|
|
|
} // namespace compiler
|
|
|
|
} // namespace dart
|