Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(305)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/class_finalizer.cc

Issue 8772009: Address Regis' comments, replace AbstractType with Type where possible. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/class_finalizer.h ('k') | runtime/vm/code_generator_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/class_finalizer.cc
===================================================================
--- runtime/vm/class_finalizer.cc (revision 1990)
+++ runtime/vm/class_finalizer.cc (working copy)
@@ -292,19 +292,12 @@
if (cls.is_finalized()) {
return;
}
- AbstractType& super_type = AbstractType::Handle(cls.super_type());
+ Type& super_type = Type::Handle(cls.super_type());
if (super_type.IsNull()) {
return;
}
// Resolve failures lead to a longjmp.
- super_type = ResolveType(cls, super_type);
- if (super_type.IsTypeParameter()) {
- String& class_name = String::Handle(cls.Name());
- String& type_parameter_name = String::Handle(super_type.Name());
- ReportError("'%s' cannot extend or implement type parameter '%s'.\n",
- class_name.ToCString(),
- type_parameter_name.ToCString());
- }
+ ResolveType(cls, super_type);
cls.set_super_type(super_type);
regis 2011/12/01 20:53:17 Since we now resolve the type in place, you do not
srdjan 2011/12/01 21:04:00 Done.
const Class& super_class = Class::Handle(super_type.type_class());
if (cls.is_interface() != super_class.is_interface()) {
@@ -441,12 +434,9 @@
}
-// TODO(regis): Now that we do not resolve type parameters anymore, we could
-// make this function void and resolve the type in place.
-RawAbstractType* ClassFinalizer::ResolveType(
- const Class& cls, const AbstractType& type) {
+void ClassFinalizer::ResolveType(const Class& cls, const AbstractType& type) {
if (type.IsResolved()) {
- return type.raw();
+ return;
}
if (FLAG_trace_type_finalization) {
OS::Print("Resolve type '%s'\n", String::Handle(type.Name()).ToCString());
@@ -480,11 +470,10 @@
AbstractType& type_argument = AbstractType::Handle();
for (intptr_t i = 0; i < num_arguments; i++) {
type_argument = arguments.TypeAt(i);
- type_argument = ResolveType(cls, type_argument);
+ ResolveType(cls, type_argument);
arguments.SetTypeAt(i, type_argument);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
}
}
- return type.raw();
}
@@ -505,9 +494,9 @@
void ClassFinalizer::FinalizeTypeArguments(const Class& cls,
const TypeArguments& arguments) {
ASSERT(arguments.Length() >= cls.NumTypeArguments());
- AbstractType& super_type = AbstractType::Handle(cls.super_type());
+ Type& super_type = Type::Handle(cls.super_type());
if (!super_type.IsNull()) {
- super_type = FinalizeType(super_type);
+ super_type ^= FinalizeType(super_type);
cls.set_super_type(super_type);
const Class& super_class = Class::Handle(super_type.type_class());
const TypeArguments& super_type_args =
@@ -568,7 +557,7 @@
}
}
}
- AbstractType& super_type = AbstractType::Handle(cls.super_type());
+ const Type& super_type = Type::Handle(cls.super_type());
if (!super_type.IsNull()) {
ASSERT(super_type.IsFinalized());
const Class& super_class = Class::Handle(super_type.type_class());
@@ -688,16 +677,16 @@
}
-RawAbstractType* ClassFinalizer::FinalizeAndCanonicalizeType(
- const AbstractType& type, String* errmsg) {
+RawType* ClassFinalizer::FinalizeAndCanonicalizeType(const Type& type,
+ String* errmsg) {
Isolate* isolate = Isolate::Current();
ASSERT(isolate != NULL);
LongJump* base = isolate->long_jump_base();
LongJump jump;
isolate->set_long_jump_base(&jump);
if (setjmp(*jump.Set()) == 0) {
- const AbstractType& canonical_type =
- AbstractType::Handle(FinalizeType(type));
+ Type& canonical_type = Type::Handle();
+ canonical_type ^= FinalizeType(type);
isolate->set_long_jump_base(base);
*errmsg = String::null();
return canonical_type.raw();
@@ -727,7 +716,7 @@
Class::Handle(unresolved_type_class.factory_signature_class());
ASSERT(!factory_signature_class.IsNull());
function.set_signature_class(factory_signature_class);
- type = ResolveType(cls, type);
+ ResolveType(cls, type);
function.set_result_type(type);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
const Class& type_class = Class::Handle(type.type_class());
// Verify that the factory signature declares the same number of type
@@ -761,7 +750,7 @@
}
}
} else {
- type = ResolveType(cls, type);
+ ResolveType(cls, type);
function.set_result_type(type);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
}
}
@@ -771,7 +760,7 @@
const intptr_t num_parameters = function.NumberOfParameters();
for (intptr_t i = 0; i < num_parameters; i++) {
type = function.ParameterTypeAt(i);
- type = ResolveType(cls, type);
+ ResolveType(cls, type);
function.SetParameterTypeAt(i, type);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
type = FinalizeType(type);
function.SetParameterTypeAt(i, type);
@@ -828,7 +817,7 @@
(extends_array.Length() == num_type_params));
for (intptr_t i = 0; i < num_type_params; i++) {
type_extends = extends_array.TypeAt(i);
- type_extends = ResolveType(cls, type_extends);
+ ResolveType(cls, type_extends);
extends_array.SetTypeAt(i, type_extends);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
type_extends = FinalizeType(type_extends);
extends_array.SetTypeAt(i, type_extends);
@@ -858,7 +847,7 @@
for (intptr_t i = 0; i < num_fields; i++) {
field ^= array.At(i);
type = field.type();
- type = ResolveType(cls, type);
+ ResolveType(cls, type);
field.set_type(type);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
type = FinalizeType(type);
field.set_type(type);
@@ -1004,12 +993,12 @@
}
GrowableArray<const Class*> visited;
ResolveInterfaces(cls, &visited);
- AbstractType& super_type = AbstractType::Handle(cls.super_type());
+ Type& super_type = Type::Handle(cls.super_type());
if (!super_type.IsNull()) {
const Class& super_class = Class::Handle(super_type.type_class());
// Finalize super class and super type.
FinalizeClass(super_class, generating_snapshot);
- super_type = FinalizeType(super_type);
+ super_type ^= FinalizeType(super_type);
cls.set_super_type(super_type);
}
if (cls.is_interface()) {
@@ -1156,7 +1145,7 @@
AbstractType& interface = AbstractType::Handle();
for (intptr_t i = 0; i < super_interfaces.Length(); i++) {
interface ^= super_interfaces.At(i);
- interface = ResolveType(cls, interface);
+ ResolveType(cls, interface);
super_interfaces.SetAt(i, interface);
regis 2011/12/01 20:53:17 ditto
srdjan 2011/12/01 21:04:00 Done.
if (interface.IsTypeParameter()) {
const Script& script = Script::Handle(cls.script());
« no previous file with comments | « runtime/vm/class_finalizer.h ('k') | runtime/vm/code_generator_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698