Changes to postmortem data

Author: kvakil

src/llv8-constants.cc

@@ -93,6 +93,11 @@ void Map::Load() {
   kMaybeConstructorOffset =
       LoadConstant("class_Map__constructor_or_backpointer__Object",
                    "class_Map__constructor__Object");
+  if (kMaybeConstructorOffset == -1) {
+    kMaybeConstructorOffset =
+        LoadConstant("class_Map__constructor_or_back_pointer__Object");
+  }
+
   kInstanceDescriptorsOffset = LoadConstant({
       "class_Map__instance_descriptors__DescriptorArray",
       "class_Map__instance_descriptors_offset",
@@ -300,7 +305,7 @@ void Context::Load() {
 void Script::Load() {
   kNameOffset = LoadConstant("class_Script__name__Object");
   kLineOffsetOffset = LoadConstant("class_Script__line_offset__SMI");
-  kSourceOffset = LoadConstant("class_Script__source__Object");
+  kSourceOffset = LoadConstant("class_Script__source__Object", 8);
   kLineEndsOffset = LoadConstant("class_Script__line_ends__Object");
 }
 

src/llv8-inl.h

@@ -483,7 +483,7 @@ inline CheckedType<int32_t> String::Length(Error& err) {
 
 ACCESSOR(Script, Name, script()->kNameOffset, String)
 ACCESSOR(Script, LineOffset, script()->kLineOffsetOffset, Smi)
-ACCESSOR(Script, Source, script()->kSourceOffset, HeapObject)
+ACCESSOR(Script, Source, script()->kSourceOffset, String)
 ACCESSOR(Script, LineEnds, script()->kLineEndsOffset, HeapObject)
 
 ACCESSOR(SharedFunctionInfo, function_data, shared_info()->kFunctionDataOffset,

src/llv8.cc

@@ -484,7 +484,7 @@ void Script::GetLineColumnFromPos(int64_t pos, int64_t& line, int64_t& column,
   line = 0;
   column = 0;
 
-  HeapObject source = Source(err);
+  String source = Source(err);
   if (err.Fail()) return;
 
   int64_t type = source.GetType(err);
@@ -496,8 +496,7 @@ void Script::GetLineColumnFromPos(int64_t pos, int64_t& line, int64_t& column,
     return;
   }
 
-  String str(source);
-  std::string source_str = str.ToString(err);
+  std::string source_str = source.ToString(err);
   int64_t limit = source_str.length();
   if (limit > pos) limit = pos;
 

src/llv8.h

@@ -182,7 +182,7 @@ class Script : public HeapObject {
 
   inline String Name(Error& err);
   inline Smi LineOffset(Error& err);
-  inline HeapObject Source(Error& err);
+  inline String Source(Error& err);
   inline HeapObject LineEnds(Error& err);
 
   void GetLines(uint64_t start_line, std::string lines[], uint64_t line_limit,