Add missing type checks for top level static initializers (issue 1980 and

runtime/vm/flow_graph_builder.cc

 // 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 "vm/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/flags.h"
 #include "vm/intermediate_language.h"
 #include "vm/longjump.h"
@@ skipping 136 matching lines @@
   for (intptr_t i = 0; i < node->inlined_finally_list_length(); i++) {
     EffectGraphVisitor for_effect(owner(), for_value.temp_index());
     node->InlinedFinallyNodeAt(i)->Visit(&for_effect);
     Append(for_effect);
     if (!is_open()) return;
   }
 
   Value* return_value = for_value.value();
   if (FLAG_enable_type_checks) {
     const RawFunction::Kind kind = owner()->parsed_function().function().kind();
-    // Implicit getters do not need a type check at return.
-    if ((kind != RawFunction::kImplicitGetter) &&
-        (kind != RawFunction::kConstImplicitGetter)) {
+    const bool is_implicit_getter =
+        (kind == RawFunction::kImplicitGetter) ||
+        (kind == RawFunction::kConstImplicitGetter);
+    const bool is_static = owner()->parsed_function().function().is_static();
+    // Implicit getters do not need a type check at return, unless they compute
+    // the initial value of a static field.
+    if (is_static || !is_implicit_getter) {
       const AbstractType& type =
           AbstractType::ZoneHandle(
               owner()->parsed_function().function().result_type());
       AssertAssignableComp* assert =
           new AssertAssignableComp(return_value, type);
       AddInstruction(new BindInstr(temp_index(), assert));
       return_value = new TempVal(temp_index());
     }
   }
 
@@ skipping 1939 matching lines @@
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart