More cleanup related to malformed and malbounded types.

runtime/vm/raw_object_snapshot.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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/symbols.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
-DECLARE_FLAG(bool, error_on_malformed_type);
+DECLARE_FLAG(bool, error_on_bad_type);
 
 
 #define NEW_OBJECT(type)                                                       \
   ((kind == Snapshot::kFull) ? reader->New##type() : type::New())
 
 #define NEW_OBJECT_WITH_LEN(type, len)                                         \
   ((kind == Snapshot::kFull) ? reader->New##type(len) : type::New(len))
 
 #define NEW_OBJECT_WITH_LEN_SPACE(type, len, kind)                             \
   ((kind == Snapshot::kFull) ?                                                 \
@@ skipping 215 matching lines @@
 }
 
 
 void RawType::WriteTo(SnapshotWriter* writer,
                       intptr_t object_id,
                       Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Only resolved and finalized types should be written to a snapshot.
   // TODO(regis): Replace the test below by an ASSERT() or remove the flag test.
-  if (FLAG_error_on_malformed_type &&
+  if (FLAG_error_on_bad_type &&
       (ptr()->type_state_ != RawType::kFinalizedInstantiated) &&
       (ptr()->type_state_ != RawType::kFinalizedUninstantiated)) {
     // Print the name of the class of the unfinalized type, as well as the
     // token location from where it is referred to, making sure not
     // to allocate any handles. Unfortunately, we cannot print the script name.
     const intptr_t cid = ClassIdTag::decode(*reinterpret_cast<uword*>(
         reinterpret_cast<uword>(ptr()->type_class_) - kHeapObjectTag +
             Object::tags_offset()));
     if (cid == kUnresolvedClassCid) {
       OS::Print("Snapshotting unresolved type '%s' at token pos %" Pd "\n",
@@ skipping 67 matching lines @@
 }
 
 
 void RawTypeParameter::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Only finalized type parameters should be written to a snapshot.
   // TODO(regis): Replace the test below by an ASSERT() or remove the flag test.
-  if (FLAG_error_on_malformed_type &&
+  if (FLAG_error_on_bad_type &&
       (ptr()->type_state_ != RawTypeParameter::kFinalizedUninstantiated)) {
     // Print the name of the unfinalized type parameter, the name of the class
     // it parameterizes, as well as the token location from where it is referred
     // to, making sure not to allocate any handles. Unfortunately, we cannot
     // print the script name.
     OS::Print("Snapshotting unfinalized type parameter '%s' of class '%s' at "
               "token pos %" Pd "\n",
               RawOneByteStringToCString(
                   reinterpret_cast<RawOneByteString*>(ptr()->name_)),
               RawOneByteStringToCString(
@@ skipping 2295 matching lines @@
 }
 
 
 void RawMirrorReference::WriteTo(SnapshotWriter* writer,
                                  intptr_t object_id,
                                  Snapshot::Kind kind) {
   UNREACHABLE();
 }
 
 }  // namespace dart