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

runtime/vm/code_generator_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 149 matching lines @@
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   __ movl(EAX, raw_null);
   __ ret();
 }
 
 
 
 bool CodeGenerator::TryIntrinsify() {
   if (!CanOptimize()) return false;
-  if (FLAG_intrinsify && !FLAG_trace_functions) {
+  // Intrinsification skips arguments checks, therefore disable if in checked
+  // mode.
+  if (FLAG_intrinsify && !FLAG_trace_functions && !FLAG_enable_type_checks) {
     if ((parsed_function_.function().kind() == RawFunction::kImplicitGetter)) {
       IntrinsifyGetter();
       return true;
     }
-    // Intrinsification skips arguments checks, therefore disable if in checked
-    // mode.
-    if ((parsed_function_.function().kind() == RawFunction::kImplicitSetter) &&
-        !FLAG_enable_type_checks) {
+    if ((parsed_function_.function().kind() == RawFunction::kImplicitSetter)) {
       IntrinsifySetter();
       return true;
     }
   }
   // Even if an intrinsified version of the function was successfully
   // generated, it may fall through to the non-intrinsified method body.
   if (!FLAG_trace_functions) {
     return Intrinsifier::Intrinsify(parsed_function().function(), assembler_);
   }
   return false;
@@ skipping 579 matching lines @@
   } else {
     // Pop the previously evaluated result value into EAX.
     __ popl(EAX);
   }
 
   // Generate type check.
   if (FLAG_enable_type_checks) {
     const bool returns_null = node->value()->IsLiteralNode() &&
        node->value()->AsLiteralNode()->literal().IsNull();
     const RawFunction::Kind kind = parsed_function().function().kind();
-    // Implicit getters do not need a type check at return.
-    if (!returns_null &&
-        (kind != RawFunction::kImplicitGetter) &&
-        (kind != RawFunction::kConstImplicitGetter)) {
+    const bool is_implicit_getter =
+        (kind == RawFunction::kImplicitGetter) ||
+        (kind == RawFunction::kConstImplicitGetter);
+    const bool is_static = 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 (!returns_null && (is_static || !is_implicit_getter)) {
       GenerateAssertAssignable(
           node->id(),
           node->value()->token_index(),
           AbstractType::ZoneHandle(parsed_function().function().result_type()),
           String::ZoneHandle(String::NewSymbol("function result")));
     }
   }
   GenerateReturnEpilog(node);
 }
 
@@ skipping 2047 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32