Allow setting breakpoints in function literal field initializers under --dfe.

runtime/vm/debugger.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/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "platform/address_sanitizer.h"
 
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/deopt_instructions.h"
 #include "vm/disassembler.h"
 #include "vm/flags.h"
 #include "vm/globals.h"
 #include "vm/json_stream.h"
+#include "vm/kernel_reader.h"
 #include "vm/longjump.h"
 #include "vm/message_handler.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 #include "vm/port.h"
 #include "vm/runtime_entry.h"
 #include "vm/service.h"
 #include "vm/service_event.h"
@@ skipping 21 matching lines @@
 DEFINE_FLAG(bool, verbose_debug, false, "Verbose debugger messages");
 DEFINE_FLAG(bool,
             steal_breakpoints,
             false,
             "Intercept breakpoints and other pause events before they "
             "are sent to the embedder and use a generic VM breakpoint "
             "handler instead.  This handler dispatches breakpoints to "
             "the VM service.");
 
 DECLARE_FLAG(bool, warn_on_pause_with_no_debugger);
+DECLARE_FLAG(bool, use_dart_frontend);
 
 #ifndef PRODUCT
 
 Debugger::EventHandler* Debugger::event_handler_ = NULL;
 
 class RemoteObjectCache : public ZoneAllocated {
  public:
   explicit RemoteObjectCache(intptr_t initial_size);
   intptr_t AddObject(const Object& obj);
   RawObject* GetObj(intptr_t obj_id) const;
@@ skipping 2585 matching lines @@
       for (intptr_t pos = 0; pos < num_fields; pos++) {
         TokenPosition start;
         TokenPosition end;
         field ^= fields.At(pos);
         ASSERT(!field.IsNull());
         if (field.Script() != script.raw()) {
           // The field should be defined in the script we want to set
           // the breakpoint in.
           continue;
         }
-        if (Parser::FieldHasFunctionLiteralInitializer(field, &start, &end)) {
+        if (!field.has_initializer()) {
+          continue;
+        }
+
+        bool has_func_literal_initializer = false;
+#ifndef DART_PRECOMPILED_RUNTIME
+        if (FLAG_use_dart_frontend) {
+          has_func_literal_initializer =
+              kernel::KernelReader::FieldHasFunctionLiteralInitializer(
+                  field, &start, &end);
+        } else {
+#endif  // !DART_PRECOMPILED_RUNTIME
+          has_func_literal_initializer =
+              Parser::FieldHasFunctionLiteralInitializer(field, &start, &end);
+#ifndef DART_PRECOMPILED_RUNTIME
+        }
+#endif  // !DART_PRECOMPILED_RUNTIME

[siva, 2017/07/18 22:49:07]

Strictly speaking this entire function and most of other Debugger functionality
should not be included in DART_PRECOMPILED_RUNTIME, so maybe it is not necessary
to bracket this code here and instead look at excluding debugger stuff in
another CL.

[sivachandra, 2017/07/19 00:14:21]

Acknowledged.

+
+        if (has_func_literal_initializer) {
           if ((start <= token_pos && token_pos <= end) ||
               (token_pos <= start && start <= last_token_pos)) {
             return true;
           }
         }
       }
     }
   }
   return false;
 }
@@ skipping 1664 matching lines @@
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart