[wasm] sundry trap handler fixes

src/objects.h

Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index c0085e3773f7f6b7f55564b1042f61ed43bdcb32..9760007051298749efcebc43d2c2a4c80b847154 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -5488,7 +5488,10 @@ class Code: public HeapObject {
   // For FUNCTION kind, we store the type feedback info here.
   static const int kTypeFeedbackInfoOffset =
       kSourcePositionTableOffset + kPointerSize;
-  static const int kNextCodeLinkOffset = kTypeFeedbackInfoOffset + kPointerSize;
+  static const int kProtectedInstructionOffset =
+      kTypeFeedbackInfoOffset + kPointerSize;
+  static const int kNextCodeLinkOffset =
+      kProtectedInstructionOffset + kPointerSize;
   static const int kGCMetadataOffset = kNextCodeLinkOffset + kPointerSize;
   static const int kInstructionSizeOffset = kGCMetadataOffset + kPointerSize;
   static const int kICAgeOffset = kInstructionSizeOffset + kIntSize;
@@ -5501,12 +5504,10 @@ class Code: public HeapObject {
   static const int kConstantPoolOffset = kPrologueOffset + kIntSize;
   static const int kBuiltinIndexOffset =
       kConstantPoolOffset + kConstantPoolSize;
-  static const int kProtectedInstructionOffset = kBuiltinIndexOffset + kIntSize;
+  static const int kHeaderPaddingStart = kBuiltinIndexOffset + kIntSize;
 
   enum TrapFields { kTrapCodeOffset, kTrapLandingOffset, kTrapDataSize };
 
-  static const int kHeaderPaddingStart =
-      kProtectedInstructionOffset + kPointerSize;
 
   // Add padding to align the instruction start following right after
   // the Code object header.