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

Unified Diff: runtime/vm/code_generator.cc

Issue 1162033005: Fix http://dartbug.com/23578: (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Update to ToT. Created 5 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
Index: runtime/vm/code_generator.cc
diff --git a/runtime/vm/code_generator.cc b/runtime/vm/code_generator.cc
index 08e9e165bc9d78222811de70a8e5276b71fc275f..4485c5805227d4a233ff785db0b9a708b42021e8 100644
--- a/runtime/vm/code_generator.cc
+++ b/runtime/vm/code_generator.cc
@@ -225,7 +225,7 @@ DEFINE_RUNTIME_ENTRY(InstantiateTypeArguments, 2) {
// Code inlined in the caller should have optimized the case where the
// instantiator can be reused as type argument vector.
ASSERT(instantiator.IsNull() || !type_arguments.IsUninstantiatedIdentity());
- if (Isolate::Current()->TypeChecksEnabled()) {
+ if (isolate->flags().type_checks()) {
Error& bound_error = Error::Handle();
type_arguments =
type_arguments.InstantiateAndCanonicalizeFrom(instantiator,
@@ -530,7 +530,7 @@ DEFINE_RUNTIME_ENTRY(TypeCheck, 6) {
}
String& bound_error_message = String::Handle();
if (!bound_error.IsNull()) {
- ASSERT(Isolate::Current()->TypeChecksEnabled());
+ ASSERT(isolate->flags().type_checks());
bound_error_message = String::New(bound_error.ToErrorCString());
}
if (src_type_name.Equals(dst_type_name)) {

Powered by Google App Engine
This is Rietveld 408576698