Add flag to block optimizations of large implicit getters. Implicit getters have a 0 size in tokens…

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/bigint_operations.h"
@@ skipping 24 matching lines @@
 #include "vm/timer.h"
 #include "vm/unicode.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, show_internal_names, false,
     "Show names of internal classes (e.g. \"OneByteString\") in error messages "
     "instead of showing the corresponding interface names (e.g. \"String\")");
 DEFINE_FLAG(bool, trace_disabling_optimized_code, false,
     "Trace disabling optimized code.");
-DEFINE_FLAG(int, huge_method_cutoff, 20000,
-            "Huge method cutoff: Disables optimizations for huge methods.");
+DEFINE_FLAG(int, huge_method_cutoff_in_tokens, 20000,
+    "Huge method cutoff in tokens: Disables optimizations for huge methods.");
+DEFINE_FLAG(int, huge_method_cutoff_in_code_size, 200000,
+    "Huge method cutoff in unoptimized code size: disables optimization.");

[siva, 2013/02/13 21:31:17]

I think the code cut of size should be in words so that we get an appropriate
number for 64 bit architectures too.

[srdjan, 2013/02/13 21:37:10]

Done.

 DECLARE_FLAG(bool, trace_compiler);
 DECLARE_FLAG(bool, eliminate_type_checks);
 DECLARE_FLAG(bool, enable_type_checks);
 
 static const char* kGetterPrefix = "get:";
 static const intptr_t kGetterPrefixLength = strlen(kGetterPrefix);
 static const char* kSetterPrefix = "set:";
 static const intptr_t kSetterPrefixLength = strlen(kSetterPrefix);
 
 cpp_vtable Object::handle_vtable_ = 0;
@@ skipping 3600 matching lines @@
 void Function::SetNumOptionalParameters(intptr_t num_optional_parameters,
                                         bool are_optional_positional) const {
   ASSERT(num_optional_parameters >= 0);
   set_num_optional_parameters(are_optional_positional ?
                               num_optional_parameters :
                               -num_optional_parameters);
 }
 
 
 bool Function::is_optimizable() const {
-  return OptimizableBit::decode(raw_ptr()->kind_tag_) &&
-         (script() != Script::null()) &&
-         !is_native() &&
-         ((end_token_pos() - token_pos()) < FLAG_huge_method_cutoff);
+  if (OptimizableBit::decode(raw_ptr()->kind_tag_) &&
+      (script() != Script::null()) &&
+      !is_native() &&
+      ((end_token_pos() - token_pos()) < FLAG_huge_method_cutoff_in_tokens)) {
+    // Additional check needed for implicit getters.
+    if (HasCode() &&
+       (Code::Handle(unoptimized_code()).Size() >=
+        FLAG_huge_method_cutoff_in_code_size)) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return false;
 }
 
 
 void Function::set_is_optimizable(bool value) const {
   set_kind_tag(OptimizableBit::update(value, raw_ptr()->kind_tag_));
 }
 
 
 void Function::set_has_finally(bool value) const {
   set_kind_tag(HasFinallyBit::update(value, raw_ptr()->kind_tag_));
@@ skipping 9113 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart