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

runtime/vm/raw_object.h

 // 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.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/globals.h"
@@ skipping 1005 matching lines @@
     kRuntimeCall     = kClosureCall << 1,  // Runtime call.
     kOsrEntry        = kRuntimeCall << 1,  // OSR entry point in unopt. code.
     kOther           = kOsrEntry << 1,
     kAnyKind         = 0xFF
   };
 
   // Compressed version assumes try_index is always -1 and does not store it.
   struct PcDescriptorRec {
     uword pc_offset() const { return pc_offset_; }
     void set_pc_offset(uword value) {
-#if defined(TARGET_ARCH_X64) || defined(TARGET_ARCH_ARM64)
-      ASSERT(value <= static_cast<uword>(kMaxUint32));
-#endif
+      // Some C compilers warn about the comparison always being true when using
+      // <= due to limited range of data type.
+      ASSERT((value == static_cast<uword>(kMaxUint32)) ||
+             (value < static_cast<uword>(kMaxUint32)));
       pc_offset_ = value;
     }
 
     Kind kind() const {
       return static_cast<Kind>(deopt_id_and_kind_ & kAnyKind);
     }
     void set_kind(Kind kind) {
       deopt_id_and_kind_ = (deopt_id_and_kind_ & 0xFFFFFF00) | kind;
     }
 
@@ skipping 154 matching lines @@
 
   friend class Object;
 };
 
 
 class RawExceptionHandlers : public RawObject {
  public:
   // The index into the ExceptionHandlers table corresponds to
   // the try_index of the handler.
   struct HandlerInfo {
-    intptr_t handler_pc;       // PC value of handler.
+    uint32_t handler_pc_offset;  // PC offset value of handler.
     int16_t outer_try_index;   // Try block index of enclosing try block.
     int8_t needs_stacktrace;   // True if a stacktrace is needed.
     int8_t has_catch_all;      // Catches all exceptions.
   };
 
  private:
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExceptionHandlers);
 
   // Number of exception handler entries.
   int32_t num_entries_;
@@ skipping 944 matching lines @@
   COMPILE_ASSERT(kExternalTypedDataInt8ArrayCid ==
                  kTypedDataInt8ArrayViewCid + 15);
   COMPILE_ASSERT(kByteBufferCid == kExternalTypedDataInt8ArrayCid + 14);
   COMPILE_ASSERT(kNullCid == kByteBufferCid + 1);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_