2b899adb4c
This reverts commit cb9ecbc363.
Reason for revert: causes failures during Dart->Flutter roll and on Flutter HHH bots (see comments on the original CL).
Original change's description:
> [vm] Enforce that entry points must be annotated by default.
>
> Changes the default value of the --verify-entry-points flag
> to true.
>
> Changes the default value for the check_is_entrypoint argument to
> to the Invoke/InvokeGetter/InvokeSetter flags to true. The mirrors
> library implementation and calls via vm-service explicitly pass
> false for this argument now.
>
> Add annotations as needed, such as annotating classes with
> annotated generative constructors. In some cases, the annotations
> were more general than needed (e.g., annotating with a no-argument
> entry point annotation when only the setter is needed), so make
> those annotations more specific.
>
> As this pattern is already common in downstream code, allow
> Dart_Invoke on fields as long as the field is annotated for getter
> access. (That is, calling Dart_Invoke for a field is equivalent to
> retrieving the closure value via Dart_GetField and then calling
> Dart_InvokeClosure.)
>
> TEST=vm/cc/DartAPI_MissingEntryPoints
> vm/dart/entrypoints_verification_test
>
> Issue: https://github.com/dart-lang/sdk/issues/50649
> Issue: https://github.com/flutter/flutter/issues/118608
>
> Change-Id: Ibb3bf15632ab2958d8791b449af8651d47f871a5
> Cq-Include-Trybots: luci.dart.try:vm-aot-linux-product-x64-try,vm-aot-linux-debug-x64-try,vm-aot-mac-release-arm64-try,vm-aot-mac-product-arm64-try,vm-aot-dwarf-linux-product-x64-try
> CoreLibraryReviewExempt: adding/editing vm-only pragma annotations
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/363566
> Reviewed-by: Martin Kustermann <kustermann@google.com>
> Commit-Queue: Tess Strickland <sstrickl@google.com>
Issue: https://github.com/dart-lang/sdk/issues/50649
Issue: https://github.com/flutter/flutter/issues/118608
Change-Id: Idba168f77b0636a50ad93309e29dc9989cc1f388
Cq-Include-Trybots: luci.dart.try:vm-aot-linux-product-x64-try,vm-aot-linux-debug-x64-try,vm-aot-mac-release-arm64-try,vm-aot-mac-product-arm64-try,vm-aot-dwarf-linux-product-x64-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/391460
Auto-Submit: Alexander Markov <alexmarkov@google.com>
Reviewed-by: Tess Strickland <sstrickl@google.com>
Commit-Queue: Tess Strickland <sstrickl@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
129 lines
4.5 KiB
C++
129 lines
4.5 KiB
C++
// Copyright (c) 2012, 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 "include/dart_api.h"
|
|
#include "platform/assert.h"
|
|
#include "vm/dart_api_impl.h"
|
|
#include "vm/unit_test.h"
|
|
|
|
namespace dart {
|
|
|
|
#define FUNCTION_NAME(name) UnhandledExcp_##name
|
|
#define REGISTER_FUNCTION(name, count) {"" #name, FUNCTION_NAME(name), count},
|
|
|
|
void FUNCTION_NAME(Unhandled_equals)(Dart_NativeArguments args) {
|
|
NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
|
|
TransitionNativeToVM transition(arguments->thread());
|
|
Zone* zone = arguments->thread()->zone();
|
|
const Instance& expected =
|
|
Instance::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
const Instance& actual =
|
|
Instance::CheckedHandle(zone, arguments->NativeArgAt(1));
|
|
if (!expected.CanonicalizeEquals(actual)) {
|
|
OS::PrintErr("expected: '%s' actual: '%s'\n", expected.ToCString(),
|
|
actual.ToCString());
|
|
FATAL("Unhandled_equals fails.\n");
|
|
}
|
|
}
|
|
|
|
void FUNCTION_NAME(Unhandled_invoke)(Dart_NativeArguments args) {
|
|
// Invoke the specified entry point.
|
|
Dart_Handle cls = Dart_GetClass(TestCase::lib(), NewString("Second"));
|
|
Dart_Handle result = Dart_Invoke(cls, NewString("method2"), 0, nullptr);
|
|
ASSERT(Dart_IsError(result));
|
|
ASSERT(Dart_ErrorHasException(result));
|
|
return;
|
|
}
|
|
|
|
void FUNCTION_NAME(Unhandled_invoke2)(Dart_NativeArguments args) {
|
|
// Invoke the specified entry point.
|
|
Dart_Handle cls = Dart_GetClass(TestCase::lib(), NewString("Second"));
|
|
Dart_Handle result = Dart_Invoke(cls, NewString("method2"), 0, nullptr);
|
|
ASSERT(Dart_IsError(result));
|
|
ASSERT(Dart_ErrorHasException(result));
|
|
Dart_Handle exception = Dart_ErrorGetException(result);
|
|
ASSERT(!Dart_IsError(exception));
|
|
Dart_ThrowException(exception);
|
|
UNREACHABLE();
|
|
return;
|
|
}
|
|
|
|
// List all native functions implemented in the vm or core boot strap dart
|
|
// libraries so that we can resolve the native function to it's entry
|
|
// point.
|
|
#define UNHANDLED_NATIVE_LIST(V) \
|
|
V(Unhandled_equals, 2) \
|
|
V(Unhandled_invoke, 0) \
|
|
V(Unhandled_invoke2, 0)
|
|
|
|
static struct NativeEntries {
|
|
const char* name_;
|
|
Dart_NativeFunction function_;
|
|
int argument_count_;
|
|
} BuiltinEntries[] = {UNHANDLED_NATIVE_LIST(REGISTER_FUNCTION)};
|
|
|
|
static Dart_NativeFunction native_lookup(Dart_Handle name,
|
|
int argument_count,
|
|
bool* auto_setup_scope) {
|
|
ASSERT(auto_setup_scope != nullptr);
|
|
*auto_setup_scope = true;
|
|
TransitionNativeToVM transition(Thread::Current());
|
|
const Object& obj = Object::Handle(Api::UnwrapHandle(name));
|
|
ASSERT(obj.IsString());
|
|
const char* function_name = obj.ToCString();
|
|
ASSERT(function_name != nullptr);
|
|
int num_entries = sizeof(BuiltinEntries) / sizeof(struct NativeEntries);
|
|
for (int i = 0; i < num_entries; i++) {
|
|
struct NativeEntries* entry = &(BuiltinEntries[i]);
|
|
if ((strcmp(function_name, entry->name_) == 0) &&
|
|
(argument_count == entry->argument_count_)) {
|
|
return reinterpret_cast<Dart_NativeFunction>(entry->function_);
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
// Unit test case to verify unhandled exceptions.
|
|
TEST_CASE(UnhandledExceptions) {
|
|
const char* kScriptChars =
|
|
R"(
|
|
class UnhandledExceptions {
|
|
@pragma('vm:external-name', 'Unhandled_equals')
|
|
external static equals(var obj1, var obj2);
|
|
|
|
@pragma('vm:external-name', 'Unhandled_invoke')
|
|
external static invoke();
|
|
|
|
@pragma('vm:external-name', 'Unhandled_invoke2')
|
|
external static invoke2();
|
|
}
|
|
class Second {
|
|
Second() { }
|
|
static int method1(int param) {
|
|
UnhandledExceptions.invoke();
|
|
return 2;
|
|
}
|
|
static int method2() {
|
|
throw new Second();
|
|
}
|
|
static int method3(int param) {
|
|
try {
|
|
UnhandledExceptions.invoke2();
|
|
} on Second catch (e) {
|
|
return 3;
|
|
}
|
|
return 2;
|
|
}
|
|
}
|
|
testMain() {
|
|
UnhandledExceptions.equals(2, Second.method1(1));
|
|
UnhandledExceptions.equals(3, Second.method3(1));
|
|
}
|
|
)";
|
|
Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, native_lookup);
|
|
EXPECT_VALID(Dart_Invoke(lib, NewString("testMain"), 0, nullptr));
|
|
}
|
|
|
|
} // namespace dart
|