VM: Use PC offset instead of absolute PC in exception handler info.

runtime/vm/object_test.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 "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 2715 matching lines @@
 #endif  // ARCH_IS_64_BIT
 
 
 TEST_CASE(ExceptionHandlers) {
   const int kNumEntries = 4;
   // Add an exception handler table to the code.
   ExceptionHandlers& exception_handlers = ExceptionHandlers::Handle();
   exception_handlers ^= ExceptionHandlers::New(kNumEntries);
   const bool kNeedsStacktrace = true;
   const bool kNoStacktrace = false;
-  exception_handlers.SetHandlerInfo(0, -1, 20, kNeedsStacktrace, false);
-  exception_handlers.SetHandlerInfo(1, 0, 30, kNeedsStacktrace, false);
-  exception_handlers.SetHandlerInfo(2, -1, 40, kNoStacktrace, true);
-  exception_handlers.SetHandlerInfo(3, 1, 150, kNoStacktrace, true);
+  exception_handlers.SetHandlerInfo(0, -1, 20u, kNeedsStacktrace, false);
+  exception_handlers.SetHandlerInfo(1, 0, 30u, kNeedsStacktrace, false);
+  exception_handlers.SetHandlerInfo(2, -1, 40u, kNoStacktrace, true);
+  exception_handlers.SetHandlerInfo(3, 1, 150u, kNoStacktrace, true);
 
   extern void GenerateIncrement(Assembler* assembler);
   Assembler _assembler_;
   GenerateIncrement(&_assembler_);
   Code& code = Code::Handle(Code::FinalizeCode(
       *CreateFunction("Test_Code"), &_assembler_));
   code.set_exception_handlers(exception_handlers);
 
   // Verify the exception handler table entries by accessing them.
   const ExceptionHandlers& handlers =
       ExceptionHandlers::Handle(code.exception_handlers());
   EXPECT_EQ(kNumEntries, handlers.num_entries());
   RawExceptionHandlers::HandlerInfo info;
   handlers.GetHandlerInfo(0, &info);
   EXPECT_EQ(-1, handlers.OuterTryIndex(0));
   EXPECT_EQ(-1, info.outer_try_index);
-  EXPECT_EQ(20, handlers.HandlerPC(0));
+  EXPECT_EQ(20u, handlers.HandlerPCOffset(0));
   EXPECT(handlers.NeedsStacktrace(0));
   EXPECT(!handlers.HasCatchAll(0));
-  EXPECT_EQ(20, info.handler_pc);
+  EXPECT_EQ(20u, info.handler_pc_offset);
   EXPECT_EQ(1, handlers.OuterTryIndex(3));
-  EXPECT_EQ(150, handlers.HandlerPC(3));
+  EXPECT_EQ(150u, handlers.HandlerPCOffset(3));
   EXPECT(!handlers.NeedsStacktrace(3));
   EXPECT(handlers.HasCatchAll(3));
 }
 
 
 TEST_CASE(PcDescriptors) {
   const int kNumEntries = 6;
   // Add PcDescriptors to the code.
   PcDescriptors& descriptors = PcDescriptors::Handle();
   descriptors ^= PcDescriptors::New(kNumEntries, true);
@@ skipping 1706 matching lines @@
   EXPECT_VALID(h_result);
   Integer& result = Integer::Handle();
   result ^= Api::UnwrapHandle(h_result);
   String& foo = String::Handle(String::New("foo"));
   Integer& expected = Integer::Handle();
   expected ^= foo.HashCode();
   EXPECT(result.IsIdenticalTo(expected));
 }
 
 }  // namespace dart