Fix a bug in optimized ARM code.

runtime/vm/simulator_arm.cc

 // Copyright (c) 2013, 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 <math.h>  // for isnan.
 #include <setjmp.h>
 #include <stdlib.h>
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM)
@@ skipping 96 matching lines @@
     ((AL << kConditionShift) | (0xf << 24) | kBreakpointSvcCode);
   static const int32_t kNopInstr =  // nop
     ((AL << kConditionShift) | (0x32 << 20) | (0xf << 12));
 
   Simulator* sim_;
 
   bool GetValue(char* desc, uint32_t* value);
   bool GetFValue(char* desc, float* value);
   bool GetDValue(char* desc, double* value);
 
-  void PrintDartFrame(uword pc, uword fp, uword sp,
-                      const Function& function,
-                      intptr_t token_pos,
-                      bool is_optimized,
-                      bool is_inlined);
+  static intptr_t GetApproximateTokenIndex(const Code& code, uword pc);
+
+  static void PrintDartFrame(uword pc, uword fp, uword sp,
+                             const Function& function,
+                             intptr_t token_pos,
+                             bool is_optimized,
+                             bool is_inlined);
   void PrintBacktrace();
 
   // Set or delete a breakpoint. Returns true if successful.
   bool SetBreakpoint(Instr* breakpc);
   bool DeleteBreakpoint(Instr* breakpc);
 
   // Undo and redo all breakpoints. This is needed to bracket disassembly and
   // execution to skip past breakpoints when run from the debugger.
   void UndoBreakpoints();
   void RedoBreakpoints();
@@ skipping 123 matching lines @@
         return false;
       }
       *value = *(reinterpret_cast<double*>(addr));
       return true;
     }
   }
   return false;
 }
 
 
+intptr_t SimulatorDebugger::GetApproximateTokenIndex(const Code& code,
+                                                     uword pc) {
+  intptr_t token_pos = -1;
+  const PcDescriptors& descriptors =
+      PcDescriptors::Handle(code.pc_descriptors());
+  for (intptr_t i = 0; i < descriptors.Length(); i++) {
+    if (descriptors.PC(i) == pc) {
+      token_pos = descriptors.TokenPos(i);
+      break;
+    } else if ((token_pos <= 0) && (descriptors.PC(i) > pc)) {
+      token_pos = descriptors.TokenPos(i);
+    }
+  }
+  return token_pos;
+}
+
+
 void SimulatorDebugger::PrintDartFrame(uword pc, uword fp, uword sp,
                                        const Function& function,
                                        intptr_t token_pos,
                                        bool is_optimized,
                                        bool is_inlined) {
   const Script& script = Script::Handle(function.script());
   const String& func_name = String::Handle(function.QualifiedUserVisibleName());
   const String& url = String::Handle(script.url());
   intptr_t line = -1;
   intptr_t column = -1;
@@ skipping 31 matching lines @@
         while (!it.Done()) {
           // Print each inlined frame with its pc in the corresponding
           // unoptimized frame.
           inlined_function = it.function();
           unoptimized_code = it.code();
           uword unoptimized_pc = it.pc();
           it.Advance();
           if (!it.Done()) {
             PrintDartFrame(unoptimized_pc, frame->fp(), frame->sp(),
                            inlined_function,
-                           unoptimized_code.GetTokenIndexOfPC(unoptimized_pc),
+                           GetApproximateTokenIndex(unoptimized_code,
+                                                    unoptimized_pc),
                            true, true);
           }
         }
         // Print the optimized inlining frame below.
       }
       PrintDartFrame(frame->pc(), frame->fp(), frame->sp(),
                      function,
-                     code.GetTokenIndexOfPC(frame->pc()),
+                     GetApproximateTokenIndex(code, frame->pc()),
                      code.is_optimized(), false);
     } else {
       OS::Print("pc=0x%"Px" fp=0x%"Px" sp=0x%"Px" %s frame\n",
                 frame->pc(), frame->fp(), frame->sp(),
                 frame->IsEntryFrame() ? "entry" :
                     frame->IsExitFrame() ? "exit" :
                         frame->IsStubFrame() ? "stub" : "invalid");
     }
     frame = frames.NextFrame();
   }
@@ skipping 2675 matching lines @@
     set_register(kStackTraceObjectReg, bit_cast<int32_t>(raw_stacktrace));
   }
   buf->Longjmp();
 }
 
 }  // namespace dart
 
 #endif  // !defined(HOST_ARCH_ARM)
 
 #endif  // defined TARGET_ARCH_ARM