[VM generic function types] Properly set the scope function after parsing a

runtime/vm/clustered_snapshot.cc

 // Copyright (c) 2016, 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/clustered_snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 1581 matching lines @@
     intptr_t count = objects_.length();
     for (intptr_t i = 0; i < count; i++) {
       RawCode* code = objects_[i];
 
       intptr_t pointer_offsets_length =
           Code::PtrOffBits::decode(code->ptr()->state_bits_);
       if (pointer_offsets_length != 0) {
         FATAL("Cannot serialize code with embedded pointers");
       }
       if (kind == Snapshot::kFullAOT) {
-        // No disabled code in precompilation.
-        NOT_IN_PRECOMPILED(ASSERT(code->ptr()->instructions_ ==
-                                  code->ptr()->active_instructions_));
+        if (code->ptr()->instructions_ != code->ptr()->active_instructions_) {
+          // TODO(rmacnak): Fix references to disabled code before serializing.
+          // s->UnexpectedObject(code, "Disabled code");
+        }

[siva, 2017/07/18 23:52:25]

the empty if statement seems like a NOP, do we need it?

[regis, 2017/07/18 23:59:07]

True. We could remove the 'kind' local as well, but there is a TODO there that
we should not forget about and the dead code provides context to address this
later.
But I am happy to remove the code, up to Ryan. 

[rmacnak, 2017/07/19 19:56:39]

Please leave the commented out code.

[regis, 2017/07/19 20:14:23]

Acknowledged.

       }
 
       RawInstructions* instr = code->ptr()->instructions_;
       int32_t text_offset = s->GetTextOffset(instr, code);
       s->Write<int32_t>(text_offset);
       if (s->kind() == Snapshot::kFullJIT) {
         // TODO(rmacnak): Fix references to disabled code before serializing.
         if (code->ptr()->active_instructions_ != code->ptr()->instructions_) {
           instr = code->ptr()->active_instructions_;
           text_offset = s->GetTextOffset(instr, code);
@@ skipping 3105 matching lines @@
 
   cluster->Trace(this, object);
 
 #if defined(SNAPSHOT_BACKTRACE)
   current_parent_ = Object::null();
 #endif
 }
 
 
 void Serializer::UnexpectedObject(RawObject* raw_object, const char* message) {
+  // Exit the no safepoint scope so we can allocate while printing.
+  while (thread()->no_safepoint_scope_depth() > 0) {
+    thread()->DecrementNoSafepointScopeDepth();
+  }
   Object& object = Object::Handle(raw_object);
-  OS::PrintErr("Unexpected object (%s): %s\n", message, object.ToCString());
+  OS::PrintErr("Unexpected object (%s): 0x%" Px " %s\n", message,
+               reinterpret_cast<uword>(object.raw()), object.ToCString());
 #if defined(SNAPSHOT_BACKTRACE)
   while (!object.IsNull()) {
     object = ParentOf(object);
-    OS::PrintErr("referenced by %s\n", object.ToCString());
+    OS::PrintErr("referenced by 0x%" Px " %s\n",
+                 reinterpret_cast<uword>(object.raw()), object.ToCString());
   }
 #endif
   OS::Abort();
 }
 
 
 #if defined(SNAPSHOT_BACKTRACE)
 RawObject* Serializer::ParentOf(const Object& object) {
   for (intptr_t i = 0; i < parent_pairs_.length(); i += 2) {
     if (parent_pairs_[i]->raw() == object.raw()) {
@@ skipping 896 matching lines @@
     thread_->isolate()->SetupImagePage(data_buffer_,
                                        /* is_executable */ false);
   }
 
   deserializer.ReadIsolateSnapshot(thread_->isolate()->object_store());
 
   return ApiError::null();
 }
 
 }  // namespace dart