nodejs
diff --git a/‎README.md‎
Lines changed: 1 addition & 6 deletions b/‎README.md‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎scripts/macho2segments.js‎
Lines changed: 0 additions & 78 deletions b/‎scripts/macho2segments.js‎
Lines changed: 0 additions & 78 deletions
diff --git a/‎scripts/otool2segments.py‎
Lines changed: 0 additions & 43 deletions b/‎scripts/otool2segments.py‎
Lines changed: 0 additions & 43 deletions
diff --git a/‎scripts/readelf2segments.py‎
Lines changed: 0 additions & 43 deletions b/‎scripts/readelf2segments.py‎
Lines changed: 0 additions & 43 deletions
diff --git a/‎src/llnode.cc‎
Lines changed: 0 additions & 9 deletions b/‎src/llnode.cc‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎src/llscan.cc‎
Lines changed: 4 additions & 110 deletions b/‎src/llscan.cc‎
Lines changed: 4 additions & 110 deletions
@@ -230,10 +230,6 @@ The following subcommands are supported:
       findjsobjects   -- List all object types and instance counts grouped by typename and sorted by instance count. Use
                          -d or --detailed to get an output grouped by type name, properties, and array length, as well as
                          more information regarding each type.
-                         With lldb < 3.9, requires the `LLNODE_RANGESFILE` environment variable to be set to a file
-                         containing memory ranges for the core file being debugged.
-                         There are scripts for generating this file on Linux and Mac in the scripts directory of the llnode
-                         repository.
       findrefs        -- Finds all the object properties which meet the search criteria.
                          The default is to list all the object properties that reference the specified value.
                          Flags:
@@ -341,7 +337,7 @@ TEST_LLDB_BINARY=`which lldb-4.0` npm run test-all
 
 * `LLNODE_DEBUG=true` to see additional debug info from llnode
 * `TEST_LLNODE_DEBUG=true` to see additional debug info coming from the tests
-* `LLNODE_CORE=/path/to/core/dump LLNODE_NODE_EXE=/path/to/node LLNODE_NO_RANGES=true`
+* `LLNODE_CORE=/path/to/core/dump LLNODE_NODE_EXE=/path/to/node`
   to use a prepared core dump instead of generating one on-the-fly when running
   the tests.
 
@@ -360,7 +356,6 @@ To debug `test/scan-test.js` with a prepared core dump:
 LLNODE_DEBUG=true TEST_LLNODE_DEBUG=true \
   LLNODE_CORE=/path/to/core/dump/of/inspect/scenario.js \
   LLNODE_NODE_EXE=/path/to/node \
-  LLNODE_NO_RANGES=true \
   node test/scan-test.js
 ```
 
 
@@ -83,7 +83,6 @@ bool BacktraceCmd::DoExecute(SBDebugger d, char** cmd,
       }
     }
 
-#ifdef LLDB_SBMemoryRegionInfoList_h_
     // Heuristic: a PC in WX memory is almost certainly a V8 builtin.
     // TODO(bnoordhuis) Find a way to map the PC to the builtin's name.
     {
@@ -95,7 +94,6 @@ bool BacktraceCmd::DoExecute(SBDebugger d, char** cmd,
         continue;
       }
     }
-#endif  // LLDB_SBMemoryRegionInfoList_h_
 
     // C++ stack frame.
     SBStream desc;
@@ -445,13 +443,6 @@ bool PluginInitialize(SBDebugger d) {
                 "name and sorted by instance count. Use -d or --detailed to "
                 "get an output grouped by type name, properties, and array "
                 "length, as well as more information regarding each type.\n"
-#ifndef LLDB_SBMemoryRegionInfoList_h_
-                "Requires `LLNODE_RANGESFILE` environment variable to be set "
-                "to a file containing memory ranges for the core file being "
-                "debugged.\n"
-                "There are scripts for generating this file on Linux and Mac "
-                "in the scripts directory of the llnode repository."
-#endif  // LLDB_SBMemoryRegionInfoList_h_
   );
 
   SBCommand settingsCmd =
 
@@ -1420,48 +1420,22 @@ bool LLScan::ScanHeapForObjects(lldb::SBTarget target,
   // Reload process anyway
   process_ = target.GetProcess();
 
-  // Need to reload memory ranges (though this does assume the user has also
-  // updated
-  // LLNODE_RANGESFILE with data for the new dump or things won't match up).
+  // Need to reload memory regions.
   if (target_ != target) {
-    ClearMemoryRanges();
     ClearMapsToInstances();
     ClearReferences();
     target_ = target;
   }
 
-#ifndef LLDB_SBMemoryRegionInfoList_h_
-  /* Fall back to environment variable containing pre-parsed list of memory
-   * ranges. */
-  if (nullptr == ranges_) {
-    const char* segmentsfilename = getenv("LLNODE_RANGESFILE");
-
-    if (segmentsfilename == nullptr) {
-      result.SetError(
-          "No memory range information available for this process. Cannot scan "
-          "for objects.\n"
-          "Please set `LLNODE_RANGESFILE` environment variable\n");
-      return false;
-    }
-
-    if (!GenerateMemoryRanges(target, segmentsfilename)) {
-      result.SetError(
-          "No memory range information available for this process. Cannot scan "
-          "for objects.\n");
-      return false;
-    }
-  }
-#endif  // LLDB_SBMemoryRegionInfoList_h_
-
   /* If we've reached here we have access to information about the valid memory
-   * ranges in the process and can scan for objects.
+   * regions in the process and can scan for objects.
    */
 
   /* Populate the map of objects. */
   if (mapstoinstances_.empty()) {
     FindJSObjectsVisitor v(target, this);
 
-    ScanMemoryRanges(v);
+    ScanMemoryRegions(v);
   }
 
   return true;
@@ -1539,25 +1513,14 @@ inline static ByteOrder GetHostByteOrder() {
   return u.b == 1 ? ByteOrder::eByteOrderBig : ByteOrder::eByteOrderLittle;
 }
 
-void LLScan::ScanMemoryRanges(FindJSObjectsVisitor& v) {
-  bool done = false;
-
+void LLScan::ScanMemoryRegions(FindJSObjectsVisitor& v) {
   const uint64_t addr_size = process_.GetAddressByteSize();
   bool swap_bytes = process_.GetByteOrder() != GetHostByteOrder();
 
   // Pages are usually around 1mb, so this should more than enough
   const uint64_t block_size = 1024 * 1024 * addr_size;
   unsigned char* block = new unsigned char[block_size];
 
-#ifndef LLDB_SBMemoryRegionInfoList_h_
-  MemoryRange* head = ranges_;
-
-  while (head != nullptr && !done) {
-    uint64_t address = head->start_;
-    uint64_t len = head->length_;
-    head = head->next_;
-
-#else  // LLDB_SBMemoryRegionInfoList_h_
   lldb::SBMemoryRegionInfoList memory_regions = process_.GetMemoryRegions();
   lldb::SBMemoryRegionInfo region_info;
 
@@ -1571,7 +1534,6 @@ void LLScan::ScanMemoryRanges(FindJSObjectsVisitor& v) {
     uint64_t address = region_info.GetRegionBase();
     uint64_t len = region_info.GetRegionEnd() - region_info.GetRegionBase();
 
-#endif  // LLDB_SBMemoryRegionInfoList_h_
     /* Brute force search - query every address - but allow the visitor code to
      * say how far to move on so we don't read every byte.
      */
@@ -1614,7 +1576,6 @@ void LLScan::ScanMemoryRanges(FindJSObjectsVisitor& v) {
       }
 
       if (increment == 0) {
-        done = true;
         break;
       }
     }
@@ -1623,73 +1584,6 @@ void LLScan::ScanMemoryRanges(FindJSObjectsVisitor& v) {
   delete[] block;
 }
 
-
-/* Read a file of memory ranges parsed from the core dump.
- * This is a work around for the lack of an API to get the memory ranges
- * within lldb.
- * There are scripts for generating this file on Mac and Linux stored in
- * the scripts directory of the llnode repository.
- * Export the name or full path to the ranges file in the LLNODE_RANGESFILE
- * env var before starting lldb and loading the llnode plugin.
- */
-bool LLScan::GenerateMemoryRanges(lldb::SBTarget target,
-                                  const char* segmentsfilename) {
-  std::ifstream input(segmentsfilename);
-
-  if (!input.is_open()) {
-    return false;
-  }
-
-  uint64_t address = 0;
-  uint64_t len = 0;
-
-  MemoryRange** tailptr = &ranges_;
-
-  lldb::addr_t address_byte_size = target.GetProcess().GetAddressByteSize();
-
-  while (input >> std::hex >> address >> std::hex >> len) {
-    /* Check if the range is accessible.
-     * The structure of a core file means if you check the start and the end of
-     * a range then the middle will be there, ranges are contiguous in the file,
-     * but cores often get truncated due to file size limits so ranges can be
-     * missing or truncated. Sometimes shared memory segments are omitted so
-     * it's also possible an entire section could be missing from the middle.
-     */
-    lldb::SBError error;
-
-    target.GetProcess().ReadPointerFromMemory(address, error);
-    if (!error.Success()) {
-      /* Could not access first word, skip. */
-      continue;
-    }
-
-    target.GetProcess().ReadPointerFromMemory(
-        (address + len) - address_byte_size, error);
-    if (!error.Success()) {
-      /* Could not access last word, skip. */
-      continue;
-    }
-
-    MemoryRange* newRange = new MemoryRange(address, len);
-
-    *tailptr = newRange;
-    tailptr = &(newRange->next_);
-  }
-  return true;
-}
-
-
-void LLScan::ClearMemoryRanges() {
-  MemoryRange* head = ranges_;
-  while (head != nullptr) {
-    MemoryRange* range = head;
-    head = head->next_;
-    delete range;
-  }
-  ranges_ = nullptr;
-}
-
-
 void LLScan::ClearMapsToInstances() {
   TypeRecord* t;
   for (auto entry : mapstoinstances_) {
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ bool BacktraceCmd::DoExecute(SBDebugger d, char** cmd,`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`-#ifdef LLDB_SBMemoryRegionInfoList_h_`
`87`	`86`	`// Heuristic: a PC in WX memory is almost certainly a V8 builtin.`
`88`	`87`	`// TODO(bnoordhuis) Find a way to map the PC to the builtin's name.`
`89`	`88`	`{`
`@@ -95,7 +94,6 @@ bool BacktraceCmd::DoExecute(SBDebugger d, char** cmd,`
`95`	`94`	`continue;`
`96`	`95`	`}`
`97`	`96`	`}`
`98`		`-#endif // LLDB_SBMemoryRegionInfoList_h_`
`99`	`97`
`100`	`98`	`// C++ stack frame.`
`101`	`99`	`SBStream desc;`
`@@ -445,13 +443,6 @@ bool PluginInitialize(SBDebugger d) {`
`445`	`443`	`"name and sorted by instance count. Use -d or --detailed to "`
`446`	`444`	`"get an output grouped by type name, properties, and array "`
`447`	`445`	`"length, as well as more information regarding each type.\n"`
`448`		`-#ifndef LLDB_SBMemoryRegionInfoList_h_`
`449`		- "Requires `LLNODE_RANGESFILE` environment variable to be set "
`450`		`- "to a file containing memory ranges for the core file being "`
`451`		`- "debugged.\n"`
`452`		`- "There are scripts for generating this file on Linux and Mac "`
`453`		`- "in the scripts directory of the llnode repository."`
`454`		`-#endif // LLDB_SBMemoryRegionInfoList_h_`
`455`	`446`	`);`
`456`	`447`
`457`	`448`	`SBCommand settingsCmd =`