Fix deferred library code disabling for inlined functions.

runtime/vm/parser.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/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "platform/utils.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 118 matching lines @@
 void ParsedFunction::SetNodeSequence(SequenceNode* node_sequence) {
   ASSERT(node_sequence_ == NULL);
   ASSERT(node_sequence != NULL);
   node_sequence_ = node_sequence;
 }
 
 
 void ParsedFunction::AddDeferredPrefix(const LibraryPrefix& prefix) {
   ASSERT(prefix.is_deferred_load());
   ASSERT(!prefix.is_loaded());
-  if (deferred_prefixes_ == NULL) {
-    deferred_prefixes_ =
-        &GrowableObjectArray::ZoneHandle(GrowableObjectArray::New());
-  }
-  for (intptr_t i = 0; i < deferred_prefixes_->Length(); i++) {
-    if (deferred_prefixes_->At(i) == prefix.raw()) {
+  for (intptr_t i = 0; i < deferred_prefixes_->length(); i++) {
+    if ((*deferred_prefixes_)[i]->raw() == prefix.raw()) {
       return;
     }
   }
-  deferred_prefixes_->Add(prefix);
+  deferred_prefixes_->Add(&LibraryPrefix::ZoneHandle(I, prefix.raw()));

[Ivan Posva, 2014/06/07 00:31:14]

Why do you have to get a new ZoneHandle here? I don't think we have an inner
zone while we are inlining.

[srdjan, 2014/06/12 20:25:46]

Generally: if a handle's lifetime escapes the scope (in this case function) we
make it a ZoneHandle.

 }
 
 
 void ParsedFunction::AllocateVariables() {
   LocalScope* scope = node_sequence()->scope();
   const intptr_t num_fixed_params = function().num_fixed_parameters();
   const intptr_t num_opt_params = function().NumOptionalParameters();
   const intptr_t num_params = num_fixed_params + num_opt_params;
   // Compute start indices to parameters and locals, and the number of
   // parameters to copy.
@@ skipping 10880 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart