VM: Fix checked mode crash (issue 13831).

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 4206 matching lines @@
     const Object& obj = Object::Handle(raw_ptr()->data_);
     ASSERT(!obj.IsNull());
     ClosureData::Cast(obj).set_parent_function(value);
     return;
   }
   UNREACHABLE();
 }
 
 
 RawFunction* Function::implicit_closure_function() const {
-  if (IsClosureFunction() || IsSignatureFunction()) {
+  if (IsClosureFunction() ||
+      IsSignatureFunction() ||
+      IsStaticInitializerFunction()) {
     return Function::null();
   }
   const Object& obj = Object::Handle(raw_ptr()->data_);
   ASSERT(obj.IsNull() || obj.IsFunction());
   return (obj.IsNull()) ? Function::null() : Function::Cast(obj).raw();
 }
 
 
 void Function::set_implicit_closure_function(const Function& value) const {
   ASSERT(!IsClosureFunction() && !IsSignatureFunction());
@@ skipping 1182 matching lines @@
                 ToFullyQualifiedCString(),
                 fp,
                 SourceFingerprint());
       return false;
     }
   }
   return true;
 }
 
 
+RawFunction* Function::NewStaticInitializer(const String& field_name,
+                                            const AbstractType& result_type,
+                                            const Class& cls,
+                                            intptr_t initializer_pos) {
+  const String& init_name =
+      String::Handle(Symbols::New(String::Handle(
+      String::Concat(Symbols::InitPrefix(), field_name))));

[srdjan, 2013/10/30 17:54:15]

Indent another 4 spaces

[Florian Schneider, 2013/10/31 16:34:53]

Done.

+  const Function& init_function = Function::ZoneHandle(
+      Function::New(init_name,
+                    RawFunction::kStaticInitializer,
+                    true,  // static
+                    false,  // !const
+                    false,  // !abstract
+                    false,  // !external
+                    cls,
+                    initializer_pos));
+  init_function.set_result_type(result_type);

[srdjan, 2013/10/30 17:54:15]

Please add a comment describing the special settings.

[Florian Schneider, 2013/10/31 16:34:53]

Done.

+  init_function.set_is_visible(false);
+  init_function.set_is_optimizable(false);
+  init_function.set_is_inlinable(false);
+  return init_function.raw();
+}
+
+
 const char* Function::ToCString() const {
   const char* static_str = is_static() ? " static" : "";
   const char* abstract_str = is_abstract() ? " abstract" : "";
   const char* kind_str = NULL;
   const char* const_str = is_const() ? " const" : "";
   switch (kind()) {
     case RawFunction::kRegularFunction:
     case RawFunction::kClosureFunction:
     case RawFunction::kGetterFunction:
     case RawFunction::kSetterFunction:
       kind_str = "";
       break;
     case RawFunction::kSignatureFunction:
       kind_str = " signature";
       break;
     case RawFunction::kConstructor:
       kind_str = is_static() ? " factory" : " constructor";
       break;
     case RawFunction::kImplicitGetter:
       kind_str = " getter";
       break;
     case RawFunction::kImplicitSetter:
       kind_str = " setter";
       break;
+    case RawFunction::kStaticInitializer:
+      kind_str = " static-initializer";
+      break;
     case RawFunction::kImplicitStaticFinalGetter:
       kind_str = " static-final-getter";
       break;
     case RawFunction::kMethodExtractor:
       kind_str = " method-extractor";
       break;
     case RawFunction::kNoSuchMethodDispatcher:
       kind_str = " no-such-method-dispatcher";
       break;
     case RawFunction::kInvokeFieldDispatcher:
@@ skipping 51 matching lines @@
         break;
       case RawFunction::kNoSuchMethodDispatcher:
         kind_string = "no such method";
         break;
       case RawFunction::kClosureFunction:
         kind_string = "closure";
         break;
       case RawFunction::kConstructor:
         kind_string = "constructor";
         break;
+      case RawFunction::kStaticInitializer:
+        kind_string = "static initializer";
+        break;
       case RawFunction::kImplicitStaticFinalGetter:
         kind_string = "static final getter";
         break;
       default:
         UNREACHABLE();
   }
   jsobj.AddProperty("kind", kind_string);
   jsobj.AddProperty("unoptimized_code", Object::Handle(unoptimized_code()));
   jsobj.AddProperty("usage_counter", usage_counter());
   jsobj.AddProperty("optimized_call_site_count", optimized_call_site_count());
@@ skipping 10061 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart