Fix 5442338: Return true if the pc descriptor verifier skips verification because of too many des...

runtime/vm/code_generator_ia32.cc

 // Copyright (c) 2011, 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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 338 matching lines @@
 // - No two deopt descriptors have the same node id (deoptimization).
 // - No two ic-call descriptors have the same node id (type feedback).
 // - No two descriptors of same kind have the same PC.
 // A function without unique ids is marked as non-optimizable (e.g., because of
 // finally blocks).
 static bool VerifyPcDescriptors(const PcDescriptors& descriptors,
                                 bool check_ids) {
 #if defined(DEBUG)
   // TODO(srdjan): Implement a more efficient way to check, currently drop
   // the check for too large number of descriptors.
-  if (descriptors.Length() > 1000) {
+  if (descriptors.Length() > 3000) {
     if (FLAG_trace_compiler) {
       OS::Print("Not checking pc decriptors, length %d\n",
                 descriptors.Length());
     }
-    return false;
+    return true;

[ngeoffray, 2011/10/17 12:19:04]

Do you actually need the return now that the method always returns true? Will
you improve the method in a way that you know will return false?

[srdjan, 2011/10/17 12:23:48]

Remove return, use ASSERTS as already implemented.

   }
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     intptr_t pc = descriptors.PC(i);
     PcDescriptors::Kind kind = descriptors.DescriptorKind(i);
     // 'node_id' is set for kDeopt and kIcCall and must be unique for one kind.
     intptr_t node_id = AstNode::kInvalidId;
     if (check_ids) {
       if ((descriptors.DescriptorKind(i) == PcDescriptors::kDeopt) ||
           (descriptors.DescriptorKind(i) == PcDescriptors::kIcCall)) {
         node_id = descriptors.NodeId(i);
@@ skipping 12 matching lines @@
   return true;
 }
 
 
 void CodeGenerator::FinalizePcDescriptors(const Code& code) {
   ASSERT(pc_descriptors_list_ != NULL);
   const PcDescriptors& descriptors = PcDescriptors::Handle(
       pc_descriptors_list_->FinalizePcDescriptors(code.EntryPoint()));
   bool ok = VerifyPcDescriptors(
       descriptors, parsed_function_.function().is_optimizable());
-  if (!ok) {
-    // TODO(5442338) Fix bad pc descriptor generation.
-    parsed_function_.function().set_is_optimizable(false);
-  }
+  ASSERT(ok);
   code.set_pc_descriptors(descriptors);
 }
 
 
 void CodeGenerator::FinalizeExceptionHandlers(const Code& code) {
   ASSERT(exception_handlers_list_ != NULL);
   const ExceptionHandlers& handlers = ExceptionHandlers::Handle(
       exception_handlers_list_->FinalizeExceptionHandlers(code.EntryPoint()));
   code.set_exception_handlers(handlers);
 }
@@ skipping 2248 matching lines @@
   const Class& cls = Class::Handle(parsed_function_.function().owner());
   const Script& script = Script::Handle(cls.script());
   Parser::ReportMsg(script, token_index, "Error", error_msg, format, args);
   Isolate::Current()->long_jump_base()->Jump(1, error_msg);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32