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

Unified Diff: runtime/vm/runtime_entry.cc

Issue 2941643002: Check for a passed-in type argument vector in the prolog of generic functions. (Closed)
Patch Set: address review comments Created 3 years, 6 months 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/parser.cc ('k') | runtime/vm/scopes.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/runtime_entry.cc
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index eb14e4031499a76d0781ea9ef422f75f6b61f8f2..5483676159bd6f78ed36828833da47f7f73e5e8d 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -518,8 +518,7 @@ static void UpdateTypeTestCache(
(last_instance_type_arguments.raw() == instance_type_arguments.raw()) &&
(last_instantiator_type_arguments.raw() ==
instantiator_type_arguments.raw()) &&
- (last_function_type_arguments.raw() ==
- last_function_type_arguments.raw())) {
+ (last_function_type_arguments.raw() == function_type_arguments.raw())) {
OS::PrintErr(" Error in test cache %p ix: %" Pd ",", new_cache.raw(), i);
PrintTypeCheck(" duplicate cache entry", instance, type,
instantiator_type_arguments, function_type_arguments,
@@ -549,8 +548,7 @@ static void UpdateTypeTestCache(
" instance [class: (%p '%s' cid: %" Pd
"), type-args: %p %s]\n"
" test-type [class: (%p '%s' cid: %" Pd
- "), i-type-args: %p %s, "
- ", f-type-args: %p %s]\n",
+ "), i-type-args: %p %s, f-type-args: %p %s]\n",
new_cache.raw(), len,
instance_class_id_or_function.raw(), instance_type_arguments.raw(),
@@ -566,9 +564,8 @@ static void UpdateTypeTestCache(
.ToCString(),
Class::Handle(test_type.type_class()).id(),
instantiator_type_arguments.raw(),
- instantiator_type_arguments.ToCString(),
- instantiator_type_arguments.raw(),
- instantiator_type_arguments.ToCString());
+ instantiator_type_arguments.ToCString(), function_type_arguments.raw(),
+ function_type_arguments.ToCString());
}
}
« no previous file with comments | « runtime/vm/parser.cc ('k') | runtime/vm/scopes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698