diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a5934a..4e7fe92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ env:
   # will error - we use Clang to compile test programs, and cclyzer++ must be
   # able to read the bitcode it outputs. We currently only run tests with the
   # most recent (matching) Clang/LLVM combination.
-  LLVM_MAJOR_VERSION: "13"
-  CLANG_VERSION: "13"
+  LLVM_MAJOR_VERSION: "14"
+  CLANG_VERSION: "14"
   UBUNTU_VERSION: "22.04"
   UBUNTU_NAME: "jammy"
 
@@ -58,7 +58,12 @@ jobs:
           llvm_version: "12"
           ubuntu_version: "20.04"
           ubuntu_name: "focal"
-        - llvm_version: "13"
+        - clang_version: "14"
+          llvm_version: "13"
+          ubuntu_version: "22.04"
+          ubuntu_name: "jammy"
+        - clang_version: "14"
+          llvm_version: "14"
           ubuntu_version: "22.04"
           ubuntu_name: "jammy"
     env:
@@ -115,7 +120,7 @@ jobs:
 
     - name: Run tests
       # See NOTE[Clang+LLVM]
-      if: ${{ env.LLVM_MAJOR_VERSION == 13 }}
+      if: ${{ env.LLVM_MAJOR_VERSION == 14 }}
       run: |
         # See previous comment
         if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3941682..124c624 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(cclyzer++ LANGUAGES C CXX VERSION 0.5.0)
 # -----------------------------------------------------------------------------
 
 if(NOT (DEFINED LLVM_MAJOR_VERSION))
-  set(LLVM_MAJOR_VERSION 13)
+  set(LLVM_MAJOR_VERSION 14)
 endif()
 
 find_package(LLVM ${LLVM_MAJOR_VERSION}.0 REQUIRED CONFIG)
diff --git a/FactGenerator/src/ContextManager.hpp b/FactGenerator/src/ContextManager.hpp
index 3766265..4312ee4 100644
--- a/FactGenerator/src/ContextManager.hpp
+++ b/FactGenerator/src/ContextManager.hpp
@@ -5,6 +5,7 @@
 #include <llvm/IR/Module.h>
 #include <llvm/IR/Value.h>
 
+#include <map>
 #include <sstream>
 #include <utility>
 #include <vector>
@@ -43,7 +44,7 @@ class ContextManager {
   using const_reverse_iterator = std::vector<context>::const_reverse_iterator;
 
   ContextManager(const llvm::Module& module, const std::string& path)
-      : iFunctionCtx(-1), mod(module), instrIndex(0), constantIndex(0) {
+      :  mod(module) {
     // Compute global prefix for this module
     std::stringstream prefix;
     prefix << '<' << path << '>' << std::flush;
@@ -123,14 +124,14 @@ class ContextManager {
   std::vector<Context> contexts;
 
   // The vector index containing a function context
-  int iFunctionCtx;
+  int iFunctionCtx{-1};
 
   // Current module and path
   const llvm::Module& mod;
 
   // Instruction and constant indices
-  unsigned instrIndex;
-  unsigned constantIndex;
+  unsigned instrIndex{0};
+  unsigned constantIndex{0};
 };
 }  // end of namespace cclyzer
 
diff --git a/FactGenerator/src/InstructionVisitor.cpp b/FactGenerator/src/InstructionVisitor.cpp
index 58dc262..6868592 100644
--- a/FactGenerator/src/InstructionVisitor.cpp
+++ b/FactGenerator/src/InstructionVisitor.cpp
@@ -285,7 +285,11 @@ void InstructionVisitor::visitInvokeInst(const llvm::InvokeInst &II) {
   writeInstrOperand(pred::invoke::func_operand, iref, invokeOp);
 
   // actual args
+#if LLVM_VERSION_MAJOR > 13
+  for (unsigned op = 0; op < II.arg_size(); ++op)
+#else
   for (unsigned op = 0; op < II.getNumArgOperands(); ++op)
+#endif
     writeInstrOperand(pred::invoke::arg, iref, II.getArgOperand(op), op);
 
   writeInstrOperand(pred::invoke::normal_label, iref, II.getNormalDest());
@@ -544,7 +548,11 @@ void InstructionVisitor::visitCallInst(const llvm::CallInst &CI) {
   // call instruction function (also records type)
   writeInstrOperand(pred::call::func_operand, iref, callOp);
 
+#if LLVM_VERSION_MAJOR > 13
+  for (unsigned op = 0; op < CI.arg_size(); ++op)
+#else
   for (unsigned op = 0; op < CI.getNumArgOperands(); ++op)
+#endif
     writeInstrOperand(pred::call::arg, iref, CI.getArgOperand(op), op);
 
   if (CI.isTailCall()) gen.writeFact(pred::call::tail_opt, iref);
diff --git a/FactGenerator/src/constants.cpp b/FactGenerator/src/constants.cpp
index 2c35cfc..07454d5 100644
--- a/FactGenerator/src/constants.cpp
+++ b/FactGenerator/src/constants.cpp
@@ -124,7 +124,12 @@ void FactGenerator::writeConstantExpr(
             pred::ptrtoint_constant_expr::from_ptr_constant, refmode, opref);
         break;
     }
+
+#if LLVM_VERSION_MAJOR > 13
+  } else if (expr.getOpcode() == llvm::Instruction::GetElementPtr) {
+#else
   } else if (expr.isGEPWithNoNotionalOverIndexing()) {
+#endif
     unsigned nOperands = expr.getNumOperands();
 
     for (unsigned i = 0; i < nOperands; i++) {
diff --git a/FactGenerator/src/main.cpp b/FactGenerator/src/main.cpp
index 81d841b..9a206d5 100644
--- a/FactGenerator/src/main.cpp
+++ b/FactGenerator/src/main.cpp
@@ -49,7 +49,7 @@ void cclyzer::factgen(
 
   // Loop over each input file
   for (FileIt it = firstFile; it != endFile; ++it) {
-    fs::path inputFile = *it;
+    const fs::path &inputFile = *it;
 
     // Parse input file
     std::unique_ptr<llvm::Module> module =
diff --git a/doc/build.rst b/doc/build.rst
index e105a27..2cf482e 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -27,7 +27,9 @@ Ubuntu 20.04:
 Configuring the Build
 *********************
 
-You can pass ``-DLLVM_MAJOR_VERSION=10`` to CMake to build against LLVM 10.
+You can pass ``-DLLVM_MAJOR_VERSION=<MAJOR_VERSION_NUMBER>`` to CMake to build
+against a specific version of LLVM. See :ref:`LLVM Library Version <llvmver>`
+for supported versions.
 
 Building the Fact Generator
 ***************************
diff --git a/doc/changelog.rst b/doc/changelog.rst
index a97872f..a220f59 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -10,7 +10,7 @@ next
 Changed
 ~~~~~~~
 
-- cclyzer++ now builds against (and requires) LLVM 13. See :doc:`build` for how
+- cclyzer++ now builds against (and requires) LLVM 14. See :doc:`build` for how
   to build against other versions of LLVM.
 
 `v0.5.0`_ - 2022-10-21
diff --git a/doc/install.rst b/doc/install.rst
index dfbac87..b95ffec 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -6,6 +6,7 @@ Pre-built Debian packages are available from the `releases page`_.
 You can download Docker images from GHCR or them build yourself; see
 :doc:`docker`.
 
-If you need to use LLVM 10, you'll have to build from source. See :doc:`build`.
+If you need to use a older version of LLVM, you'll have to build from source.
+See :doc:`build`.
 
 .. _releases page: https://github.com/GaloisInc/cclyzerpp/releases
diff --git a/doc/overview.rst b/doc/overview.rst
index 7ff70d8..4460f09 100644
--- a/doc/overview.rst
+++ b/doc/overview.rst
@@ -40,7 +40,7 @@ other external libraries. Such models are crucial for soundness. See
 Language Support
 ----------------
 
-cclyzer++ has primarily been tested on LLVM code produced by Clang 10 through 13
+cclyzer++ has primarily been tested on LLVM code produced by Clang 10 through 14
 when compiling from C and C++ for x86_64. Your mileage may vary with other
 languages, compilers, and targets.
 
@@ -66,7 +66,7 @@ Comparison to cclyzer
 As mentioned above, cclyzer++ is based on cclyzer. The major differences are that
 cclyzer++
 
-* supports LLVM 10 through 13
+* supports LLVM 10 through 14
 * is implemented in Soufflé rather than LogicBlox
 * has :ref:`a C++ interface <cpp>`, rather than a Python one
 * has runtime-configurable context-sensitivity and heap-cloning
@@ -101,20 +101,23 @@ Versioning
 Since v0.4.0, cclyzer++ has attempted to follow `semantic versioning 2.0.0
 <semver>`_.
 
+.. _llvmver:
+
 LLVM Library Version
 ********************
 
 .. TODO(lb): Policy for supporting different LLVM versions
 
-cclyzer++ currently builds against LLVM 13 by default and can be built with
-LLVM 10. There are `plans <llvmver>`_ to support recent versions.
+cclyzer++ currently builds against LLVM 14 by default and can be built with
+previous versions 13 through 10. There are `plans <llvmver>`_ to support
+LLVM 15.
 
 Development Tools
 *****************
 
-cclyzer++ currently builds with Clang 13 (including other Clang tools such as
-clang-format and clang-tidy). There are `plans <llvmver>`_ to build with more
-recent versions of Clang.
+cclyzer++ currently builds with Clang 12 or Clang 14 (including other Clang
+tools such as clang-format and clang-tidy). There are `plans <llvmver>`_ to
+build with Clang 15.
 
 .. _tutorial: http://yanniss.github.io/points-to-tutorial15.pdf
 .. _llvmver: https://github.com/GaloisInc/cclyzerpp/issues/12
diff --git a/docker/dev.dockerfile b/docker/dev.dockerfile
index d0ec09b..b98b8ad 100644
--- a/docker/dev.dockerfile
+++ b/docker/dev.dockerfile
@@ -8,8 +8,8 @@ ARG UBUNTU_NAME=jammy
 ARG UBUNTU_VERSION=22.04
 FROM ubuntu:$UBUNTU_VERSION as dev
 # See NOTE[Clang+LLVM] in ci.yml
-ARG CLANG_VERSION=13
-ARG LLVM_MAJOR_VERSION=13
+ARG CLANG_VERSION=14
+ARG LLVM_MAJOR_VERSION=14
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
 ARG UBUNTU_NAME
 ARG UBUNTU_VERSION
diff --git a/scripts/format.sh b/scripts/format.sh
index 692a534..f7a111e 100644
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -3,5 +3,5 @@
 set -eo pipefail
 
 for f in ./src/*.cpp ./FactGenerator/**/*.cpp; do
-  clang-format-10 -i "${f}"
+  clang-format-14 -i "${f}"
 done
diff --git a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
index a943d71..e177952 100644
--- a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
@@ -1,41 +1,42 @@
-[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
-[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
+[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
+[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32
 [<<startup-context>>, nil]	<cxxbasic.cpp>:_ZNSt8ios_base4InitC1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0
 [<<startup-context>>, nil]	<cxxbasic.cpp>:__cxa_atexit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1
-[<cxxbasic.cpp>:main:102, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
-[<cxxbasic.cpp>:main:110, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
-[<cxxbasic.cpp>:main:111, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:111
-[<cxxbasic.cpp>:main:116, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
-[<cxxbasic.cpp>:main:117, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
-[<cxxbasic.cpp>:main:136, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:136
-[<cxxbasic.cpp>:main:138, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:138
-[<cxxbasic.cpp>:main:140, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:140
-[<cxxbasic.cpp>:main:55, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
+[<cxxbasic.cpp>:main:107, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107
+[<cxxbasic.cpp>:main:108, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+[<cxxbasic.cpp>:main:113, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
+[<cxxbasic.cpp>:main:114, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:114
+[<cxxbasic.cpp>:main:133, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
+[<cxxbasic.cpp>:main:135, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
+[<cxxbasic.cpp>:main:137, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:137
+[<cxxbasic.cpp>:main:52, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52
 [<cxxbasic.cpp>:main:6, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:6
-[<cxxbasic.cpp>:main:63, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
-[<cxxbasic.cpp>:main:64, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:64
-[<cxxbasic.cpp>:main:69, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:69
-[<cxxbasic.cpp>:main:70, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
-[<cxxbasic.cpp>:main:91, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
-nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
+[<cxxbasic.cpp>:main:60, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60
+[<cxxbasic.cpp>:main:61, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+[<cxxbasic.cpp>:main:66, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
+[<cxxbasic.cpp>:main:67, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:67
+[<cxxbasic.cpp>:main:88, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
+[<cxxbasic.cpp>:main:99, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
+nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:7
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:100
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:101
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:103
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:104
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:105
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:106
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:109
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:11
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:112
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:115
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:118
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:119
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:120
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:121
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:123
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:124
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:125
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:126
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:127
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:128
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:129
@@ -43,64 +44,60 @@ nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:13
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:130
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:131
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:132
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:134
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:14
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:15
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:18
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:19
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:21
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:23
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:24
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:25
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:26
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:27
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:28
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:29
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:3
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:30
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:31
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:33
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:34
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:36
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:37
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:38
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:39
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:4
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:40
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:43
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:47
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:44
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:50
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:51
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:53
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:54
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:56
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:57
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:58
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:59
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:62
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:65
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:68
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:71
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:72
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:73
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:74
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:75
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:76
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:78
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:79
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:8
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:80
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:81
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:82
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:83
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:84
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:85
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:86
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:87
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:89
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:90
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:92
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:93
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:94
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:95
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:97
-nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:49
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:98
+nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
diff --git a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
index ac6f0ee..4945667 100644
--- a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
+++ b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
@@ -22,133 +22,130 @@
 [<<main-context>>, nil]	*stack_alloc@main[i8* %__c.addr.i32]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:%__c.addr.i32
 [<<main-context>>, nil]	*stack_alloc@main[i8* %__c.addr.i]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:%__c.addr.i
 nil	*argv-alloc	[<<main-context>>, nil]	<cxxbasic.cpp>:main:%argv
-nil	*global_alloc@.str	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:2:@.str
-nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:3:@.str.1
-nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:3:@.str.1
-nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.2	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:3:@.str.2
-nil	*global_alloc@.str.2[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
-nil	*global_alloc@.str.2[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
-nil	*global_alloc@.str[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
-nil	*global_alloc@.str[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
-nil	*global_alloc@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:0:@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
+nil	*global_alloc@.str	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:2:@.str
+nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:3:@.str.1
+nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:3:@.str.1
+nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.2	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:3:@.str.2
+nil	*global_alloc@.str.2[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
+nil	*global_alloc@.str.2[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
+nil	*global_alloc@.str[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
+nil	*global_alloc@.str[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
+nil	*global_alloc@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:0:@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
 nil	*global_alloc@_ZNSt8ios_base4InitC1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0:0:@_ZNSt8ios_base4InitC1Ev
 nil	*global_alloc@_ZNSt8ios_base4InitD1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:1:bitcast (void (%"class.std::ios_base::Init"*)* @_ZNSt8ios_base4InitD1Ev to void (i8*)*)
 nil	*global_alloc@_ZNSt8ios_base4InitD1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:2:@_ZNSt8ios_base4InitD1Ev
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:69:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:1:@_ZSt4cout
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110:1:@_ZSt4cout
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:1:@_ZSt4cout
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63:1:@_ZSt4cout
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107:1:@_ZSt4cout
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:1:@_ZSt4cout
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60:1:@_ZSt4cout
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:1:@_ZSt4cout
 nil	*global_alloc@_ZStL8__ioinit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0:1:@_ZStL8__ioinit
 nil	*global_alloc@_ZStL8__ioinit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:4:@_ZStL8__ioinit
 nil	*global_alloc@_ZStL8__ioinit[0].?/0	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:3:getelementptr inbounds (%"class.std::ios_base::Init", %"class.std::ios_base::Init"* @_ZStL8__ioinit, i64 0, i32 0)
-nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:136:0:@_ZdlPv
-nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88:0:@_ZdlPv
 nil	*global_alloc@__cxa_atexit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:0:@__cxa_atexit
 nil	*global_alloc@__dso_handle	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:7:@__dso_handle
 nil	*global_alloc@__gxx_personality_v0	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10:@__gxx_personality_v0
 nil	*global_alloc@__gxx_personality_v0	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9:bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
-nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22:0:@llvm.dbg.declare
+nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:7:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:100:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:101:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:103:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:104:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:105:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:106:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:109:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:112:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:115:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:118:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:119:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:11:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:120:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:121:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:123:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:124:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:125:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:126:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:127:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:128:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:129:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:130:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:131:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:132:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:134:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:13:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:14:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:15:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:18:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:19:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:21:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:23:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:24:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:25:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:26:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:27:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:28:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:29:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:30:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:31:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:33:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:34:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:36:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:37:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:38:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:39:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:3:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:40:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:43:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:47:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:44:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:4:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:50:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:51:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:53:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:54:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:56:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:57:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:58:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:59:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:62:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:65:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:68:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:71:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:72:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:73:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:74:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:75:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:76:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:78:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:79:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:80:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:81:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:82:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:83:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:84:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:85:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:86:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:87:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:89:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:8:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:90:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:92:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:93:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:94:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:95:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:97:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:98:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9:0:@llvm.dbg.value
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:138:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:140:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:111:0:@llvm.lifetime.start.p0i8
-nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:64:0:@llvm.lifetime.start.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:114:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:137:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:67:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108:0:@llvm.lifetime.start.p0i8
+nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:6:0:@llvm.lifetime.start.p0i8
-nil	*global_alloc@llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:0:@llvm.memcpy.p0i8.p0i8.i64
-nil	*global_alloc@rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:49:0:@rand
+nil	*global_alloc@llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:0:@llvm.memcpy.p0i8.p0i8.i64
+nil	*global_alloc@rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46:0:@rand
diff --git a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
index a943d71..e177952 100644
--- a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
@@ -1,41 +1,42 @@
-[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
-[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
+[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
+[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32
 [<<startup-context>>, nil]	<cxxbasic.cpp>:_ZNSt8ios_base4InitC1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0
 [<<startup-context>>, nil]	<cxxbasic.cpp>:__cxa_atexit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1
-[<cxxbasic.cpp>:main:102, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
-[<cxxbasic.cpp>:main:110, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
-[<cxxbasic.cpp>:main:111, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:111
-[<cxxbasic.cpp>:main:116, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
-[<cxxbasic.cpp>:main:117, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
-[<cxxbasic.cpp>:main:136, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:136
-[<cxxbasic.cpp>:main:138, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:138
-[<cxxbasic.cpp>:main:140, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:140
-[<cxxbasic.cpp>:main:55, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
+[<cxxbasic.cpp>:main:107, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107
+[<cxxbasic.cpp>:main:108, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+[<cxxbasic.cpp>:main:113, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
+[<cxxbasic.cpp>:main:114, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:114
+[<cxxbasic.cpp>:main:133, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
+[<cxxbasic.cpp>:main:135, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
+[<cxxbasic.cpp>:main:137, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:137
+[<cxxbasic.cpp>:main:52, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52
 [<cxxbasic.cpp>:main:6, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:6
-[<cxxbasic.cpp>:main:63, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
-[<cxxbasic.cpp>:main:64, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:64
-[<cxxbasic.cpp>:main:69, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:69
-[<cxxbasic.cpp>:main:70, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
-[<cxxbasic.cpp>:main:91, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
-nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
+[<cxxbasic.cpp>:main:60, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60
+[<cxxbasic.cpp>:main:61, nil]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+[<cxxbasic.cpp>:main:66, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
+[<cxxbasic.cpp>:main:67, nil]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:67
+[<cxxbasic.cpp>:main:88, nil]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
+[<cxxbasic.cpp>:main:99, nil]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
+nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:7
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:100
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:101
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:103
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:104
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:105
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:106
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:109
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:11
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:112
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:115
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:118
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:119
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:120
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:121
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:123
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:124
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:125
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:126
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:127
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:128
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:129
@@ -43,64 +44,60 @@ nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:13
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:130
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:131
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:132
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:134
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:14
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:15
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:18
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:19
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:21
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:23
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:24
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:25
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:26
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:27
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:28
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:29
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:3
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:30
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:31
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:33
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:34
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:36
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:37
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:38
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:39
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:4
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:40
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:43
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:47
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:44
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:50
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:51
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:53
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:54
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:56
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:57
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:58
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:59
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:62
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:65
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:68
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:71
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:72
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:73
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:74
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:75
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:76
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:78
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:79
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:8
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:80
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:81
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:82
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:83
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:84
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:85
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:86
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:87
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:89
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:90
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:92
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:93
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:94
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:95
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:97
-nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:49
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:98
+nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
diff --git a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
index bdd7635..3036e6c 100644
--- a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
@@ -1,41 +1,42 @@
-[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
-[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
+[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
+[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32
 [<<startup-context>>, nil]	<cxxbasic.cpp>:_ZNSt8ios_base4InitC1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0
 [<<startup-context>>, nil]	<cxxbasic.cpp>:__cxa_atexit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1
-[<cxxbasic.cpp>:main:102, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
-[<cxxbasic.cpp>:main:110, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
-[<cxxbasic.cpp>:main:111, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:111
-[<cxxbasic.cpp>:main:116, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
-[<cxxbasic.cpp>:main:117, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
-[<cxxbasic.cpp>:main:136, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:136
-[<cxxbasic.cpp>:main:138, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:138
-[<cxxbasic.cpp>:main:140, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:140
-[<cxxbasic.cpp>:main:55, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
+[<cxxbasic.cpp>:main:107, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107
+[<cxxbasic.cpp>:main:108, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+[<cxxbasic.cpp>:main:113, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
+[<cxxbasic.cpp>:main:114, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:114
+[<cxxbasic.cpp>:main:133, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
+[<cxxbasic.cpp>:main:135, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
+[<cxxbasic.cpp>:main:137, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:137
+[<cxxbasic.cpp>:main:52, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52
 [<cxxbasic.cpp>:main:6, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:6
-[<cxxbasic.cpp>:main:63, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
-[<cxxbasic.cpp>:main:64, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:64
-[<cxxbasic.cpp>:main:69, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:69
-[<cxxbasic.cpp>:main:70, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
-[<cxxbasic.cpp>:main:91, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
-nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
+[<cxxbasic.cpp>:main:60, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60
+[<cxxbasic.cpp>:main:61, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+[<cxxbasic.cpp>:main:66, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
+[<cxxbasic.cpp>:main:67, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:67
+[<cxxbasic.cpp>:main:88, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
+[<cxxbasic.cpp>:main:99, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
+nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:7
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:100
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:101
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:103
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:104
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:105
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:106
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:109
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:11
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:112
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:115
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:118
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:119
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:120
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:121
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:123
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:124
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:125
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:126
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:127
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:128
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:129
@@ -43,64 +44,60 @@ nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:13
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:130
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:131
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:132
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:134
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:14
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:15
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:18
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:19
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:21
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:23
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:24
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:25
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:26
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:27
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:28
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:29
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:3
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:30
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:31
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:33
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:34
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:36
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:37
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:38
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:39
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:4
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:40
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:43
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:47
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:44
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:50
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:51
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:53
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:54
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:56
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:57
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:58
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:59
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:62
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:65
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:68
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:71
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:72
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:73
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:74
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:75
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:76
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:78
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:79
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:8
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:80
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:81
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:82
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:83
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:84
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:85
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:86
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:87
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:89
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:90
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:92
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:93
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:94
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:95
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:97
-nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:49
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:98
+nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
diff --git a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
index ac6f0ee..4945667 100644
--- a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
+++ b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
@@ -22,133 +22,130 @@
 [<<main-context>>, nil]	*stack_alloc@main[i8* %__c.addr.i32]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:%__c.addr.i32
 [<<main-context>>, nil]	*stack_alloc@main[i8* %__c.addr.i]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:%__c.addr.i
 nil	*argv-alloc	[<<main-context>>, nil]	<cxxbasic.cpp>:main:%argv
-nil	*global_alloc@.str	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:2:@.str
-nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:3:@.str.1
-nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:3:@.str.1
-nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
-nil	*global_alloc@.str.2	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:3:@.str.2
-nil	*global_alloc@.str.2[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
-nil	*global_alloc@.str.2[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
-nil	*global_alloc@.str[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
-nil	*global_alloc@.str[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
-nil	*global_alloc@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:0:@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
+nil	*global_alloc@.str	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:2:@.str
+nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:3:@.str.1
+nil	*global_alloc@.str.1	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:3:@.str.1
+nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.1[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.1[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:2:getelementptr inbounds ([5 x i8], [5 x i8]* @.str.1, i64 0, i64 0)
+nil	*global_alloc@.str.2	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:3:@.str.2
+nil	*global_alloc@.str.2[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
+nil	*global_alloc@.str.2[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:2:getelementptr inbounds ([4 x i8], [4 x i8]* @.str.2, i64 0, i64 0)
+nil	*global_alloc@.str[0]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
+nil	*global_alloc@.str[0][*]	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:1:getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0)
+nil	*global_alloc@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:0:@_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
 nil	*global_alloc@_ZNSt8ios_base4InitC1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0:0:@_ZNSt8ios_base4InitC1Ev
 nil	*global_alloc@_ZNSt8ios_base4InitD1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:1:bitcast (void (%"class.std::ios_base::Init"*)* @_ZNSt8ios_base4InitD1Ev to void (i8*)*)
 nil	*global_alloc@_ZNSt8ios_base4InitD1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:2:@_ZNSt8ios_base4InitD1Ev
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:69:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:1:@_ZSt4cout
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110:1:@_ZSt4cout
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:1:@_ZSt4cout
-nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63:1:@_ZSt4cout
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:0:@_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107:1:@_ZSt4cout
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52:1:@_ZSt4cout
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60:1:@_ZSt4cout
+nil	*global_alloc@_ZSt4cout	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99:1:@_ZSt4cout
 nil	*global_alloc@_ZStL8__ioinit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0:1:@_ZStL8__ioinit
 nil	*global_alloc@_ZStL8__ioinit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:4:@_ZStL8__ioinit
 nil	*global_alloc@_ZStL8__ioinit[0].?/0	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:3:getelementptr inbounds (%"class.std::ios_base::Init", %"class.std::ios_base::Init"* @_ZStL8__ioinit, i64 0, i32 0)
-nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:136:0:@_ZdlPv
-nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88:0:@_ZdlPv
 nil	*global_alloc@__cxa_atexit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:0:@__cxa_atexit
 nil	*global_alloc@__dso_handle	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1:7:@__dso_handle
 nil	*global_alloc@__gxx_personality_v0	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10:@__gxx_personality_v0
 nil	*global_alloc@__gxx_personality_v0	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9:bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
-nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22:0:@llvm.dbg.declare
+nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:7:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:100:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:101:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:103:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:104:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:105:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:106:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:109:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:112:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:115:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:118:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:119:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:11:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:120:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:121:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:123:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:124:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:125:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:126:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:127:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:128:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:129:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:130:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:131:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:132:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:134:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:13:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:14:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:15:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:18:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:19:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:21:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:23:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:24:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:25:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:26:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:27:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:28:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:29:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:30:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:31:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:33:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:34:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:36:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:37:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:38:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:39:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:3:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:40:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:43:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:47:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:44:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:4:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:50:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:51:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:53:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:54:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:56:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:57:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:58:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:59:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:62:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:65:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:68:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:71:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:72:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:73:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:74:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:75:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:76:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:78:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:79:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:80:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:81:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:82:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:83:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:84:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:85:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:86:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:87:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:89:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:8:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:90:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:92:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:93:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:94:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:95:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:97:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:98:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9:0:@llvm.dbg.value
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:138:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:140:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:111:0:@llvm.lifetime.start.p0i8
-nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:64:0:@llvm.lifetime.start.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:114:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:137:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:67:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108:0:@llvm.lifetime.start.p0i8
+nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:6:0:@llvm.lifetime.start.p0i8
-nil	*global_alloc@llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35:0:@llvm.memcpy.p0i8.p0i8.i64
-nil	*global_alloc@rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:49:0:@rand
+nil	*global_alloc@llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32:0:@llvm.memcpy.p0i8.p0i8.i64
+nil	*global_alloc@rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46:0:@rand
diff --git a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
index bdd7635..3036e6c 100644
--- a/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/cxxbasic.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
@@ -1,41 +1,42 @@
-[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
-[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
+[<<main-context>>, nil]	<cxxbasic.cpp>:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
+[<<main-context>>, nil]	<cxxbasic.cpp>:llvm.memcpy.p0i8.p0i8.i64	[<<main-context>>, nil]	<cxxbasic.cpp>:main:32
 [<<startup-context>>, nil]	<cxxbasic.cpp>:_ZNSt8ios_base4InitC1Ev	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:0
 [<<startup-context>>, nil]	<cxxbasic.cpp>:__cxa_atexit	[<<startup-context>>, nil]	<cxxbasic.cpp>:_GLOBAL__sub_I_cxxbasic.cpp:1
-[<cxxbasic.cpp>:main:102, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
-[<cxxbasic.cpp>:main:110, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
-[<cxxbasic.cpp>:main:111, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:111
-[<cxxbasic.cpp>:main:116, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
-[<cxxbasic.cpp>:main:117, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
-[<cxxbasic.cpp>:main:136, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:136
-[<cxxbasic.cpp>:main:138, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:138
-[<cxxbasic.cpp>:main:140, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:140
-[<cxxbasic.cpp>:main:55, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
+[<cxxbasic.cpp>:main:107, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:107
+[<cxxbasic.cpp>:main:108, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+[<cxxbasic.cpp>:main:113, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
+[<cxxbasic.cpp>:main:114, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:114
+[<cxxbasic.cpp>:main:133, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
+[<cxxbasic.cpp>:main:135, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
+[<cxxbasic.cpp>:main:137, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:137
+[<cxxbasic.cpp>:main:52, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:52
 [<cxxbasic.cpp>:main:6, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:6
-[<cxxbasic.cpp>:main:63, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
-[<cxxbasic.cpp>:main:64, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:64
-[<cxxbasic.cpp>:main:69, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:69
-[<cxxbasic.cpp>:main:70, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
-[<cxxbasic.cpp>:main:91, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
-nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
+[<cxxbasic.cpp>:main:60, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:60
+[<cxxbasic.cpp>:main:61, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+[<cxxbasic.cpp>:main:66, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
+[<cxxbasic.cpp>:main:67, [<<main-context>>, nil]]	<cxxbasic.cpp>:llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<cxxbasic.cpp>:main:67
+[<cxxbasic.cpp>:main:88, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZdlPv	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
+[<cxxbasic.cpp>:main:99, [<<main-context>>, nil]]	<cxxbasic.cpp>:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l	[<<main-context>>, nil]	<cxxbasic.cpp>:main:99
+nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.declare	[<<main-context>>, nil]	<cxxbasic.cpp>:main:7
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:10
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:100
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:101
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:102
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:103
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:104
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:105
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:106
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:108
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:109
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:11
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:110
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:112
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:113
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:115
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:116
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:117
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:118
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:119
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:120
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:121
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:123
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:124
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:125
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:126
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:127
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:128
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:129
@@ -43,64 +44,60 @@ nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:13
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:130
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:131
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:132
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:133
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:134
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:135
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:14
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:15
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:18
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:19
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:20
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:21
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:23
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:22
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:24
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:25
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:26
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:27
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:28
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:29
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:3
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:30
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:31
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:33
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:34
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:35
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:36
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:37
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:38
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:39
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:4
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:40
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:43
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:47
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:44
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:50
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:51
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:53
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:54
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:55
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:56
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:57
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:58
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:59
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:61
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:62
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:63
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:65
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:66
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:68
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:70
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:71
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:72
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:73
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:74
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:75
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:76
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:78
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:79
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:8
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:80
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:81
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:82
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:83
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:84
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:85
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:86
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:87
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:88
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:89
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:9
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:90
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:91
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:92
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:93
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:94
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:95
-nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:96
 nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:97
-nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:49
+nil	<cxxbasic.cpp>:llvm.dbg.value	[<<main-context>>, nil]	<cxxbasic.cpp>:main:98
+nil	<cxxbasic.cpp>:rand	[<<main-context>>, nil]	<cxxbasic.cpp>:main:46
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
index 2b76c98..72b8852 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
@@ -40,18 +40,18 @@
 [<notes.c>:handle:94, nil]	<notes.c>:strdup	nil	<notes.c>:handle:94
 [<notes.c>:handle:99, nil]	<notes.c>:fwrite	nil	<notes.c>:handle:99
 [<notes.c>:handle_loop:10, nil]	<notes.c>:__assert_fail	nil	<notes.c>:handle_loop:10
-[<notes.c>:handle_loop:3, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:3
-[<notes.c>:handle_loop:30, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:30
-[<notes.c>:handle_loop:31, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:31
-[<notes.c>:handle_loop:32, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:32
-[<notes.c>:handle_loop:33, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:33
-[<notes.c>:handle_loop:34, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:34
-[<notes.c>:handle_loop:36, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:36
-[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:37
-[<notes.c>:handle_loop:39, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:39
+[<notes.c>:handle_loop:2, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:2
+[<notes.c>:handle_loop:33, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:33
+[<notes.c>:handle_loop:34, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:34
+[<notes.c>:handle_loop:35, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:35
+[<notes.c>:handle_loop:36, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:36
+[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:37
+[<notes.c>:handle_loop:39, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:39
 [<notes.c>:handle_loop:4, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:4
-[<notes.c>:handle_loop:43, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:43
-[<notes.c>:handle_loop:45, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:45
+[<notes.c>:handle_loop:40, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:40
+[<notes.c>:handle_loop:42, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:42
+[<notes.c>:handle_loop:46, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:46
+[<notes.c>:handle_loop:48, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:48
 [<notes.c>:handle_loop:6, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:6
 [<notes.c>:main:2, nil]	<notes.c>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<notes.c>:main:2
 [<notes.c>:main:23, nil]	<notes.c>:puts	[<<main-context>>, nil]	<notes.c>:main:23
@@ -78,13 +78,13 @@ nil	<notes.c>:exit	nil	<notes.c>:handle:88
 nil	<notes.c>:fgets	nil	<notes.c>:handle:204
 nil	<notes.c>:fprintf	nil	<notes.c>:handle:170
 nil	<notes.c>:fread	nil	<notes.c>:handle:117
-nil	<notes.c>:handle	nil	<notes.c>:handle_loop:26
+nil	<notes.c>:handle	nil	<notes.c>:handle_loop:29
 nil	<notes.c>:handle_loop	nil	<notes.c>:accept_loop:6
 nil	<notes.c>:listen	[<<main-context>>, nil]	<notes.c>:main:27
 nil	<notes.c>:llvm.dbg.declare	[<<main-context>>, nil]	<notes.c>:main:3
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:104
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:203
-nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:38
+nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:41
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:5
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:35
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:5
@@ -142,8 +142,8 @@ nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:83
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:93
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:95
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:1
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:27
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:40
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:30
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:43
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:7
 nil	<notes.c>:shutdown	nil	<notes.c>:accept_loop:7
 nil	<notes.c>:socket	[<<main-context>>, nil]	<notes.c>:main:4
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
index b34267c..0a4c420 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
@@ -7,7 +7,7 @@
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/1	[<<main-context>>, nil]	<notes.c>:main:%sin_port
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2	[<<main-context>>, nil]	<notes.c>:main:%s_addr
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2.?/0	[<<main-context>>, nil]	<notes.c>:main:%s_addr
-nil	*global_alloc@.str	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str	nil	<notes.c>:handle:%8
 nil	*global_alloc@.str.1	nil	<notes.c>:handle:5:2:@.str.1
 nil	*global_alloc@.str.10	[<<main-context>>, nil]	<notes.c>:main:26:2:@.str.10
@@ -84,27 +84,27 @@ nil	*global_alloc@.str.3[0][*]	nil	<notes.c>:handle:63:1:getelementptr inbounds
 nil	*global_alloc@.str.4	nil	<notes.c>:handle:218:2:@.str.4
 nil	*global_alloc@.str.4[0]	nil	<notes.c>:handle:218:1:getelementptr inbounds ([17 x i8], [17 x i8]* @.str.4, i64 0, i64 0)
 nil	*global_alloc@.str.4[0][*]	nil	<notes.c>:handle:218:1:getelementptr inbounds ([17 x i8], [17 x i8]* @.str.4, i64 0, i64 0)
-nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:36:2:@.str.5
-nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:3:2:@.str.5
-nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:36:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
-nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:3:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
-nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:36:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
-nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:3:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:2:2:@.str.5
+nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:39:2:@.str.5
+nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:2:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:39:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:2:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:39:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
 nil	*global_alloc@.str.6	nil	<notes.c>:handle_loop:10:2:@.str.6
 nil	*global_alloc@.str.6[0]	nil	<notes.c>:handle_loop:10:1:getelementptr inbounds ([16 x i8], [16 x i8]* @.str.6, i64 0, i64 0)
 nil	*global_alloc@.str.6[0][*]	nil	<notes.c>:handle_loop:10:1:getelementptr inbounds ([16 x i8], [16 x i8]* @.str.6, i64 0, i64 0)
-nil	*global_alloc@.str.7	nil	<notes.c>:handle_loop:32:2:@.str.7
-nil	*global_alloc@.str.7[0]	nil	<notes.c>:handle_loop:32:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
-nil	*global_alloc@.str.7[0][*]	nil	<notes.c>:handle_loop:32:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
+nil	*global_alloc@.str.7	nil	<notes.c>:handle_loop:35:2:@.str.7
+nil	*global_alloc@.str.7[0]	nil	<notes.c>:handle_loop:35:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
+nil	*global_alloc@.str.7[0][*]	nil	<notes.c>:handle_loop:35:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
 nil	*global_alloc@.str.8	[<<main-context>>, nil]	<notes.c>:main:8:2:@.str.8
 nil	*global_alloc@.str.8[0]	[<<main-context>>, nil]	<notes.c>:main:8:1:getelementptr inbounds ([25 x i8], [25 x i8]* @.str.8, i64 0, i64 0)
 nil	*global_alloc@.str.8[0][*]	[<<main-context>>, nil]	<notes.c>:main:8:1:getelementptr inbounds ([25 x i8], [25 x i8]* @.str.8, i64 0, i64 0)
 nil	*global_alloc@.str.9	[<<main-context>>, nil]	<notes.c>:main:23:2:@.str.9
 nil	*global_alloc@.str.9[0]	[<<main-context>>, nil]	<notes.c>:main:23:1:getelementptr inbounds ([23 x i8], [23 x i8]* @.str.9, i64 0, i64 0)
 nil	*global_alloc@.str.9[0][*]	[<<main-context>>, nil]	<notes.c>:main:23:1:getelementptr inbounds ([23 x i8], [23 x i8]* @.str.9, i64 0, i64 0)
-nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%8
-nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%8
 nil	*global_alloc@TOO_FEW_ARGS	nil	<notes.c>:handle:178:0:@TOO_FEW_ARGS
 nil	*global_alloc@TOO_FEW_ARGS	nil	<notes.c>:handle:80:0:@TOO_FEW_ARGS
@@ -149,7 +149,7 @@ nil	*global_alloc@fread	nil	<notes.c>:handle:117:0:@fread
 nil	*global_alloc@free	nil	<notes.c>:handle:168:0:@free
 nil	*global_alloc@free	nil	<notes.c>:handle:229:0:@free
 nil	*global_alloc@free	nil	<notes.c>:handle:56:0:@free
-nil	*global_alloc@free	nil	<notes.c>:handle_loop:33:0:@free
+nil	*global_alloc@free	nil	<notes.c>:handle_loop:36:0:@free
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:185:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:198:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:212:0:@fwrite
@@ -158,7 +158,7 @@ nil	*global_alloc@fwrite	nil	<notes.c>:handle:27:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:68:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:87:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:99:0:@fwrite
-nil	*global_alloc@handle	nil	<notes.c>:handle_loop:26:0:@handle
+nil	*global_alloc@handle	nil	<notes.c>:handle_loop:29:0:@handle
 nil	*global_alloc@handle_loop	nil	<notes.c>:accept_loop:6:0:@handle_loop
 nil	*global_alloc@hex_str.hex_digits	nil	<notes.c>:handle:141:0:@hex_str.hex_digits
 nil	*global_alloc@hex_str.hex_digits	nil	<notes.c>:handle:147:0:@hex_str.hex_digits
@@ -170,7 +170,7 @@ nil	*global_alloc@listen	[<<main-context>>, nil]	<notes.c>:main:27:0:@listen
 nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<notes.c>:main:3:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle:104:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle:203:0:@llvm.dbg.declare
-nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle_loop:38:0:@llvm.dbg.declare
+nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle_loop:41:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle_loop:5:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:35:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:5:0:@llvm.dbg.value
@@ -228,19 +228,19 @@ nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle:8:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle:93:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle:95:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:1:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:27:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:40:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:30:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:43:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:7:0:@llvm.dbg.value
 nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<notes.c>:main:37:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle:162:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle:215:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:34:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:43:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:45:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:37:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:46:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:48:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<notes.c>:main:2:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle:103:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle:202:0:@llvm.lifetime.start.p0i8
-nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:37:0:@llvm.lifetime.start.p0i8
+nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:40:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:4:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.memset.p0i8.i64	[<<main-context>>, nil]	<notes.c>:main:11:0:@llvm.memset.p0i8.i64
 nil	*global_alloc@malloc	nil	<notes.c>:handle:128:0:@malloc
@@ -249,12 +249,12 @@ nil	*global_alloc@printf	[<<main-context>>, nil]	<notes.c>:main:26:0:@printf
 nil	*global_alloc@puts	[<<main-context>>, nil]	<notes.c>:main:23:0:@puts
 nil	*global_alloc@puts	[<<main-context>>, nil]	<notes.c>:main:30:0:@puts
 nil	*global_alloc@puts	[<<main-context>>, nil]	<notes.c>:main:8:0:@puts
-nil	*global_alloc@recv	nil	<notes.c>:handle_loop:39:0:@recv
+nil	*global_alloc@recv	nil	<notes.c>:handle_loop:42:0:@recv
 nil	*global_alloc@recv	nil	<notes.c>:handle_loop:6:0:@recv
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:31:0:@send
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:32:0:@send
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:36:0:@send
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:3:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:2:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:34:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:35:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:39:0:@send
 nil	*global_alloc@shutdown	nil	<notes.c>:accept_loop:7:0:@shutdown
 nil	*global_alloc@socket	[<<main-context>>, nil]	<notes.c>:main:4:0:@socket
 nil	*global_alloc@stderr	nil	<notes.c>:handle:184:0:@stderr
@@ -277,7 +277,7 @@ nil	*global_alloc@strdup	nil	<notes.c>:handle:63:0:@strdup
 nil	*global_alloc@strdup	nil	<notes.c>:handle:82:0:@strdup
 nil	*global_alloc@strdup	nil	<notes.c>:handle:94:0:@strdup
 nil	*global_alloc@strlen	nil	<notes.c>:handle:90:0:@strlen
-nil	*global_alloc@strlen	nil	<notes.c>:handle_loop:30:0:@strlen
+nil	*global_alloc@strlen	nil	<notes.c>:handle_loop:33:0:@strlen
 nil	*heap_alloc@handle[i8* %call.i.i.i23]	nil	<notes.c>:handle:%call.i.i.i23
 nil	*heap_alloc@handle[i8* %call.i.i.i23]	nil	<notes.c>:handle:%resp.0
 nil	*heap_alloc@handle[i8* %call.i.i.i23]	nil	<notes.c>:handle:%retval.0
@@ -287,7 +287,7 @@ nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx11.i.
 nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx19.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i23][64]	nil	<notes.c>:handle:%arrayidx21.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -305,7 +305,7 @@ nil	*null*	nil	<notes.c>:accept_loop:11:1:null
 nil	*null*	nil	<notes.c>:accept_loop:11:2:null
 nil	*null*	nil	<notes.c>:accept_loop:1:1:null
 nil	*null*	nil	<notes.c>:accept_loop:1:2:null
-nil	*null*	nil	<notes.c>:handle:%32
+nil	*null*	nil	<notes.c>:handle:%33
 nil	*null*	nil	<notes.c>:handle:%arg.0.i
 nil	*null*	nil	<notes.c>:handle:%c
 nil	*null*	nil	<notes.c>:handle:%resp.0
@@ -335,11 +335,11 @@ nil	*null*	nil	<notes.c>:handle:78:0:null
 nil	*null*	nil	<notes.c>:handle:84:0:null
 nil	*null*	nil	<notes.c>:handle:96:0:null
 nil	*null*	nil	<notes.c>:handle_loop:%call18
-nil	*null*	nil	<notes.c>:handle_loop:28:0:null
-nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%27
+nil	*null*	nil	<notes.c>:handle_loop:31:0:null
+nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%data.i
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%27
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%27
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%28
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%13
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%data.i.i
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i][*]	nil	<notes.c>:handle:%add.ptr.i.i
@@ -360,7 +360,7 @@ nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx8
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx9
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -379,7 +379,7 @@ nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/0	nil	<notes.c>:hand
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg7
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -394,7 +394,7 @@ nil	*typed_heap_alloc@handle[i32* %call.i.i.i][0]	nil	<notes.c>:handle:%c17.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%3
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%arg2.i.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv
index 5a1a5a0..133bc20 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv
@@ -7,11 +7,11 @@
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/1	[<<main-context>>, nil]	<notes.c>:main:%sin_port
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2	[<<main-context>>, nil]	<notes.c>:main:%s_addr
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2.?/0	[<<main-context>>, nil]	<notes.c>:main:%s_addr
-nil	*global_alloc@.str	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str	nil	<notes.c>:handle:%8
-nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%8
-nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%8
 nil	*global_alloc@hex_str.hex_digits[*]	nil	<notes.c>:handle:%arrayidx16.i.i.i
 nil	*global_alloc@hex_str.hex_digits[*]	nil	<notes.c>:handle:%arrayidx9.i.i.i
@@ -26,7 +26,7 @@ nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx11.i.
 nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx19.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i23][64]	nil	<notes.c>:handle:%arrayidx21.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -40,7 +40,7 @@ nil	*heap_alloc@handle[i8* %call.i.i.i][0]	nil	<notes.c>:handle:%c12.i
 nil	*heap_alloc@handle[i8* %call.i.i.i][0]	nil	<notes.c>:handle:%c17.i
 nil	*heap_alloc@handle[i8* %call.i.i.i][8]	nil	<notes.c>:handle:%3
 nil	*heap_alloc@handle[i8* %call.i.i.i][8]	nil	<notes.c>:handle:%arg2.i.i
-nil	*null*	nil	<notes.c>:handle:%32
+nil	*null*	nil	<notes.c>:handle:%33
 nil	*null*	nil	<notes.c>:handle:%arg.0.i
 nil	*null*	nil	<notes.c>:handle:%c
 nil	*null*	nil	<notes.c>:handle:%resp.0
@@ -48,10 +48,10 @@ nil	*null*	nil	<notes.c>:handle:%retval.0
 nil	*null*	nil	<notes.c>:handle:%retval.0.i
 nil	*null*	nil	<notes.c>:handle:%retval.3.i.i
 nil	*null*	nil	<notes.c>:handle_loop:%call18
-nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%27
+nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%data.i
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%27
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%27
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%28
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%13
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%data.i.i
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i][*]	nil	<notes.c>:handle:%add.ptr.i.i
@@ -72,7 +72,7 @@ nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx8
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx9
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -91,7 +91,7 @@ nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/0	nil	<notes.c>:hand
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg7
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -106,7 +106,7 @@ nil	*typed_heap_alloc@handle[i32* %call.i.i.i][0]	nil	<notes.c>:handle:%c17.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%3
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%arg2.i.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
index 2b76c98..72b8852 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
@@ -40,18 +40,18 @@
 [<notes.c>:handle:94, nil]	<notes.c>:strdup	nil	<notes.c>:handle:94
 [<notes.c>:handle:99, nil]	<notes.c>:fwrite	nil	<notes.c>:handle:99
 [<notes.c>:handle_loop:10, nil]	<notes.c>:__assert_fail	nil	<notes.c>:handle_loop:10
-[<notes.c>:handle_loop:3, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:3
-[<notes.c>:handle_loop:30, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:30
-[<notes.c>:handle_loop:31, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:31
-[<notes.c>:handle_loop:32, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:32
-[<notes.c>:handle_loop:33, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:33
-[<notes.c>:handle_loop:34, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:34
-[<notes.c>:handle_loop:36, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:36
-[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:37
-[<notes.c>:handle_loop:39, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:39
+[<notes.c>:handle_loop:2, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:2
+[<notes.c>:handle_loop:33, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:33
+[<notes.c>:handle_loop:34, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:34
+[<notes.c>:handle_loop:35, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:35
+[<notes.c>:handle_loop:36, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:36
+[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:37
+[<notes.c>:handle_loop:39, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:39
 [<notes.c>:handle_loop:4, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:4
-[<notes.c>:handle_loop:43, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:43
-[<notes.c>:handle_loop:45, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:45
+[<notes.c>:handle_loop:40, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:40
+[<notes.c>:handle_loop:42, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:42
+[<notes.c>:handle_loop:46, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:46
+[<notes.c>:handle_loop:48, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:48
 [<notes.c>:handle_loop:6, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:6
 [<notes.c>:main:2, nil]	<notes.c>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<notes.c>:main:2
 [<notes.c>:main:23, nil]	<notes.c>:puts	[<<main-context>>, nil]	<notes.c>:main:23
@@ -78,13 +78,13 @@ nil	<notes.c>:exit	nil	<notes.c>:handle:88
 nil	<notes.c>:fgets	nil	<notes.c>:handle:204
 nil	<notes.c>:fprintf	nil	<notes.c>:handle:170
 nil	<notes.c>:fread	nil	<notes.c>:handle:117
-nil	<notes.c>:handle	nil	<notes.c>:handle_loop:26
+nil	<notes.c>:handle	nil	<notes.c>:handle_loop:29
 nil	<notes.c>:handle_loop	nil	<notes.c>:accept_loop:6
 nil	<notes.c>:listen	[<<main-context>>, nil]	<notes.c>:main:27
 nil	<notes.c>:llvm.dbg.declare	[<<main-context>>, nil]	<notes.c>:main:3
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:104
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:203
-nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:38
+nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:41
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:5
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:35
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:5
@@ -142,8 +142,8 @@ nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:83
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:93
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:95
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:1
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:27
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:40
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:30
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:43
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:7
 nil	<notes.c>:shutdown	nil	<notes.c>:accept_loop:7
 nil	<notes.c>:socket	[<<main-context>>, nil]	<notes.c>:main:4
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
index 61fec1d..3974e0f 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
@@ -40,18 +40,18 @@
 [<notes.c>:handle:94, nil]	<notes.c>:strdup	nil	<notes.c>:handle:94
 [<notes.c>:handle:99, nil]	<notes.c>:fwrite	nil	<notes.c>:handle:99
 [<notes.c>:handle_loop:10, nil]	<notes.c>:__assert_fail	nil	<notes.c>:handle_loop:10
-[<notes.c>:handle_loop:3, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:3
-[<notes.c>:handle_loop:30, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:30
-[<notes.c>:handle_loop:31, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:31
-[<notes.c>:handle_loop:32, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:32
-[<notes.c>:handle_loop:33, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:33
-[<notes.c>:handle_loop:34, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:34
-[<notes.c>:handle_loop:36, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:36
-[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:37
-[<notes.c>:handle_loop:39, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:39
+[<notes.c>:handle_loop:2, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:2
+[<notes.c>:handle_loop:33, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:33
+[<notes.c>:handle_loop:34, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:34
+[<notes.c>:handle_loop:35, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:35
+[<notes.c>:handle_loop:36, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:36
+[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:37
+[<notes.c>:handle_loop:39, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:39
 [<notes.c>:handle_loop:4, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:4
-[<notes.c>:handle_loop:43, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:43
-[<notes.c>:handle_loop:45, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:45
+[<notes.c>:handle_loop:40, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:40
+[<notes.c>:handle_loop:42, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:42
+[<notes.c>:handle_loop:46, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:46
+[<notes.c>:handle_loop:48, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:48
 [<notes.c>:handle_loop:6, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:6
 [<notes.c>:main:2, [<<main-context>>, nil]]	<notes.c>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<notes.c>:main:2
 [<notes.c>:main:23, [<<main-context>>, nil]]	<notes.c>:puts	[<<main-context>>, nil]	<notes.c>:main:23
@@ -78,13 +78,13 @@ nil	<notes.c>:exit	nil	<notes.c>:handle:88
 nil	<notes.c>:fgets	nil	<notes.c>:handle:204
 nil	<notes.c>:fprintf	nil	<notes.c>:handle:170
 nil	<notes.c>:fread	nil	<notes.c>:handle:117
-nil	<notes.c>:handle	nil	<notes.c>:handle_loop:26
+nil	<notes.c>:handle	nil	<notes.c>:handle_loop:29
 nil	<notes.c>:handle_loop	nil	<notes.c>:accept_loop:6
 nil	<notes.c>:listen	[<<main-context>>, nil]	<notes.c>:main:27
 nil	<notes.c>:llvm.dbg.declare	[<<main-context>>, nil]	<notes.c>:main:3
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:104
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:203
-nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:38
+nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:41
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:5
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:35
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:5
@@ -142,8 +142,8 @@ nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:83
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:93
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:95
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:1
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:27
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:40
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:30
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:43
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:7
 nil	<notes.c>:shutdown	nil	<notes.c>:accept_loop:7
 nil	<notes.c>:socket	[<<main-context>>, nil]	<notes.c>:main:4
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
index b34267c..0a4c420 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
@@ -7,7 +7,7 @@
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/1	[<<main-context>>, nil]	<notes.c>:main:%sin_port
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2	[<<main-context>>, nil]	<notes.c>:main:%s_addr
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2.?/0	[<<main-context>>, nil]	<notes.c>:main:%s_addr
-nil	*global_alloc@.str	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str	nil	<notes.c>:handle:%8
 nil	*global_alloc@.str.1	nil	<notes.c>:handle:5:2:@.str.1
 nil	*global_alloc@.str.10	[<<main-context>>, nil]	<notes.c>:main:26:2:@.str.10
@@ -84,27 +84,27 @@ nil	*global_alloc@.str.3[0][*]	nil	<notes.c>:handle:63:1:getelementptr inbounds
 nil	*global_alloc@.str.4	nil	<notes.c>:handle:218:2:@.str.4
 nil	*global_alloc@.str.4[0]	nil	<notes.c>:handle:218:1:getelementptr inbounds ([17 x i8], [17 x i8]* @.str.4, i64 0, i64 0)
 nil	*global_alloc@.str.4[0][*]	nil	<notes.c>:handle:218:1:getelementptr inbounds ([17 x i8], [17 x i8]* @.str.4, i64 0, i64 0)
-nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:36:2:@.str.5
-nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:3:2:@.str.5
-nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:36:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
-nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:3:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
-nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:36:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
-nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:3:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:2:2:@.str.5
+nil	*global_alloc@.str.5	nil	<notes.c>:handle_loop:39:2:@.str.5
+nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:2:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5[0]	nil	<notes.c>:handle_loop:39:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:2:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
+nil	*global_alloc@.str.5[0][*]	nil	<notes.c>:handle_loop:39:1:getelementptr inbounds ([8 x i8], [8 x i8]* @.str.5, i64 0, i64 0)
 nil	*global_alloc@.str.6	nil	<notes.c>:handle_loop:10:2:@.str.6
 nil	*global_alloc@.str.6[0]	nil	<notes.c>:handle_loop:10:1:getelementptr inbounds ([16 x i8], [16 x i8]* @.str.6, i64 0, i64 0)
 nil	*global_alloc@.str.6[0][*]	nil	<notes.c>:handle_loop:10:1:getelementptr inbounds ([16 x i8], [16 x i8]* @.str.6, i64 0, i64 0)
-nil	*global_alloc@.str.7	nil	<notes.c>:handle_loop:32:2:@.str.7
-nil	*global_alloc@.str.7[0]	nil	<notes.c>:handle_loop:32:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
-nil	*global_alloc@.str.7[0][*]	nil	<notes.c>:handle_loop:32:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
+nil	*global_alloc@.str.7	nil	<notes.c>:handle_loop:35:2:@.str.7
+nil	*global_alloc@.str.7[0]	nil	<notes.c>:handle_loop:35:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
+nil	*global_alloc@.str.7[0][*]	nil	<notes.c>:handle_loop:35:1:getelementptr inbounds ([2 x i8], [2 x i8]* @.str.7, i64 0, i64 0)
 nil	*global_alloc@.str.8	[<<main-context>>, nil]	<notes.c>:main:8:2:@.str.8
 nil	*global_alloc@.str.8[0]	[<<main-context>>, nil]	<notes.c>:main:8:1:getelementptr inbounds ([25 x i8], [25 x i8]* @.str.8, i64 0, i64 0)
 nil	*global_alloc@.str.8[0][*]	[<<main-context>>, nil]	<notes.c>:main:8:1:getelementptr inbounds ([25 x i8], [25 x i8]* @.str.8, i64 0, i64 0)
 nil	*global_alloc@.str.9	[<<main-context>>, nil]	<notes.c>:main:23:2:@.str.9
 nil	*global_alloc@.str.9[0]	[<<main-context>>, nil]	<notes.c>:main:23:1:getelementptr inbounds ([23 x i8], [23 x i8]* @.str.9, i64 0, i64 0)
 nil	*global_alloc@.str.9[0][*]	[<<main-context>>, nil]	<notes.c>:main:23:1:getelementptr inbounds ([23 x i8], [23 x i8]* @.str.9, i64 0, i64 0)
-nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%8
-nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%8
 nil	*global_alloc@TOO_FEW_ARGS	nil	<notes.c>:handle:178:0:@TOO_FEW_ARGS
 nil	*global_alloc@TOO_FEW_ARGS	nil	<notes.c>:handle:80:0:@TOO_FEW_ARGS
@@ -149,7 +149,7 @@ nil	*global_alloc@fread	nil	<notes.c>:handle:117:0:@fread
 nil	*global_alloc@free	nil	<notes.c>:handle:168:0:@free
 nil	*global_alloc@free	nil	<notes.c>:handle:229:0:@free
 nil	*global_alloc@free	nil	<notes.c>:handle:56:0:@free
-nil	*global_alloc@free	nil	<notes.c>:handle_loop:33:0:@free
+nil	*global_alloc@free	nil	<notes.c>:handle_loop:36:0:@free
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:185:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:198:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:212:0:@fwrite
@@ -158,7 +158,7 @@ nil	*global_alloc@fwrite	nil	<notes.c>:handle:27:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:68:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:87:0:@fwrite
 nil	*global_alloc@fwrite	nil	<notes.c>:handle:99:0:@fwrite
-nil	*global_alloc@handle	nil	<notes.c>:handle_loop:26:0:@handle
+nil	*global_alloc@handle	nil	<notes.c>:handle_loop:29:0:@handle
 nil	*global_alloc@handle_loop	nil	<notes.c>:accept_loop:6:0:@handle_loop
 nil	*global_alloc@hex_str.hex_digits	nil	<notes.c>:handle:141:0:@hex_str.hex_digits
 nil	*global_alloc@hex_str.hex_digits	nil	<notes.c>:handle:147:0:@hex_str.hex_digits
@@ -170,7 +170,7 @@ nil	*global_alloc@listen	[<<main-context>>, nil]	<notes.c>:main:27:0:@listen
 nil	*global_alloc@llvm.dbg.declare	[<<main-context>>, nil]	<notes.c>:main:3:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle:104:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle:203:0:@llvm.dbg.declare
-nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle_loop:38:0:@llvm.dbg.declare
+nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle_loop:41:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<notes.c>:handle_loop:5:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:35:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:5:0:@llvm.dbg.value
@@ -228,19 +228,19 @@ nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle:8:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle:93:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle:95:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:1:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:27:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:40:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:30:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:43:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<notes.c>:handle_loop:7:0:@llvm.dbg.value
 nil	*global_alloc@llvm.lifetime.end.p0i8	[<<main-context>>, nil]	<notes.c>:main:37:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle:162:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle:215:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:34:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:43:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:45:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:37:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:46:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:48:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<notes.c>:main:2:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle:103:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle:202:0:@llvm.lifetime.start.p0i8
-nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:37:0:@llvm.lifetime.start.p0i8
+nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:40:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:4:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.memset.p0i8.i64	[<<main-context>>, nil]	<notes.c>:main:11:0:@llvm.memset.p0i8.i64
 nil	*global_alloc@malloc	nil	<notes.c>:handle:128:0:@malloc
@@ -249,12 +249,12 @@ nil	*global_alloc@printf	[<<main-context>>, nil]	<notes.c>:main:26:0:@printf
 nil	*global_alloc@puts	[<<main-context>>, nil]	<notes.c>:main:23:0:@puts
 nil	*global_alloc@puts	[<<main-context>>, nil]	<notes.c>:main:30:0:@puts
 nil	*global_alloc@puts	[<<main-context>>, nil]	<notes.c>:main:8:0:@puts
-nil	*global_alloc@recv	nil	<notes.c>:handle_loop:39:0:@recv
+nil	*global_alloc@recv	nil	<notes.c>:handle_loop:42:0:@recv
 nil	*global_alloc@recv	nil	<notes.c>:handle_loop:6:0:@recv
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:31:0:@send
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:32:0:@send
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:36:0:@send
-nil	*global_alloc@send	nil	<notes.c>:handle_loop:3:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:2:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:34:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:35:0:@send
+nil	*global_alloc@send	nil	<notes.c>:handle_loop:39:0:@send
 nil	*global_alloc@shutdown	nil	<notes.c>:accept_loop:7:0:@shutdown
 nil	*global_alloc@socket	[<<main-context>>, nil]	<notes.c>:main:4:0:@socket
 nil	*global_alloc@stderr	nil	<notes.c>:handle:184:0:@stderr
@@ -277,7 +277,7 @@ nil	*global_alloc@strdup	nil	<notes.c>:handle:63:0:@strdup
 nil	*global_alloc@strdup	nil	<notes.c>:handle:82:0:@strdup
 nil	*global_alloc@strdup	nil	<notes.c>:handle:94:0:@strdup
 nil	*global_alloc@strlen	nil	<notes.c>:handle:90:0:@strlen
-nil	*global_alloc@strlen	nil	<notes.c>:handle_loop:30:0:@strlen
+nil	*global_alloc@strlen	nil	<notes.c>:handle_loop:33:0:@strlen
 nil	*heap_alloc@handle[i8* %call.i.i.i23]	nil	<notes.c>:handle:%call.i.i.i23
 nil	*heap_alloc@handle[i8* %call.i.i.i23]	nil	<notes.c>:handle:%resp.0
 nil	*heap_alloc@handle[i8* %call.i.i.i23]	nil	<notes.c>:handle:%retval.0
@@ -287,7 +287,7 @@ nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx11.i.
 nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx19.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i23][64]	nil	<notes.c>:handle:%arrayidx21.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -305,7 +305,7 @@ nil	*null*	nil	<notes.c>:accept_loop:11:1:null
 nil	*null*	nil	<notes.c>:accept_loop:11:2:null
 nil	*null*	nil	<notes.c>:accept_loop:1:1:null
 nil	*null*	nil	<notes.c>:accept_loop:1:2:null
-nil	*null*	nil	<notes.c>:handle:%32
+nil	*null*	nil	<notes.c>:handle:%33
 nil	*null*	nil	<notes.c>:handle:%arg.0.i
 nil	*null*	nil	<notes.c>:handle:%c
 nil	*null*	nil	<notes.c>:handle:%resp.0
@@ -335,11 +335,11 @@ nil	*null*	nil	<notes.c>:handle:78:0:null
 nil	*null*	nil	<notes.c>:handle:84:0:null
 nil	*null*	nil	<notes.c>:handle:96:0:null
 nil	*null*	nil	<notes.c>:handle_loop:%call18
-nil	*null*	nil	<notes.c>:handle_loop:28:0:null
-nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%27
+nil	*null*	nil	<notes.c>:handle_loop:31:0:null
+nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%data.i
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%27
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%27
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%28
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%13
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%data.i.i
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i][*]	nil	<notes.c>:handle:%add.ptr.i.i
@@ -360,7 +360,7 @@ nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx8
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx9
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -379,7 +379,7 @@ nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/0	nil	<notes.c>:hand
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg7
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -394,7 +394,7 @@ nil	*typed_heap_alloc@handle[i32* %call.i.i.i][0]	nil	<notes.c>:handle:%c17.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%3
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%arg2.i.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv
index 5a1a5a0..133bc20 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv
@@ -7,11 +7,11 @@
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/1	[<<main-context>>, nil]	<notes.c>:main:%sin_port
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2	[<<main-context>>, nil]	<notes.c>:main:%s_addr
 [<<main-context>>, nil]	*stack_alloc@main[%struct.sockaddr_in* %sa][0].?/2.?/0	[<<main-context>>, nil]	<notes.c>:main:%s_addr
-nil	*global_alloc@.str	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str	nil	<notes.c>:handle:%8
-nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0]	nil	<notes.c>:handle:%8
-nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%22
+nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%23
 nil	*global_alloc@.str[0][*]	nil	<notes.c>:handle:%8
 nil	*global_alloc@hex_str.hex_digits[*]	nil	<notes.c>:handle:%arrayidx16.i.i.i
 nil	*global_alloc@hex_str.hex_digits[*]	nil	<notes.c>:handle:%arrayidx9.i.i.i
@@ -26,7 +26,7 @@ nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx11.i.
 nil	*heap_alloc@handle[i8* %call.i.i.i23][*]	nil	<notes.c>:handle:%arrayidx19.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i23][64]	nil	<notes.c>:handle:%arrayidx21.i.i.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -40,7 +40,7 @@ nil	*heap_alloc@handle[i8* %call.i.i.i][0]	nil	<notes.c>:handle:%c12.i
 nil	*heap_alloc@handle[i8* %call.i.i.i][0]	nil	<notes.c>:handle:%c17.i
 nil	*heap_alloc@handle[i8* %call.i.i.i][8]	nil	<notes.c>:handle:%3
 nil	*heap_alloc@handle[i8* %call.i.i.i][8]	nil	<notes.c>:handle:%arg2.i.i
-nil	*null*	nil	<notes.c>:handle:%32
+nil	*null*	nil	<notes.c>:handle:%33
 nil	*null*	nil	<notes.c>:handle:%arg.0.i
 nil	*null*	nil	<notes.c>:handle:%c
 nil	*null*	nil	<notes.c>:handle:%resp.0
@@ -48,10 +48,10 @@ nil	*null*	nil	<notes.c>:handle:%retval.0
 nil	*null*	nil	<notes.c>:handle:%retval.0.i
 nil	*null*	nil	<notes.c>:handle:%retval.3.i.i
 nil	*null*	nil	<notes.c>:handle_loop:%call18
-nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%27
+nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[1024 x i8]* %data.i]	nil	<notes.c>:handle:%data.i
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%27
-nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%27
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0]	nil	<notes.c>:handle:%28
+nil	*stack_alloc@handle[[1024 x i8]* %data.i][0][*]	nil	<notes.c>:handle:%28
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%13
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i]	nil	<notes.c>:handle:%data.i.i
 nil	*stack_alloc@handle[[32 x i8]* %data.i.i][*]	nil	<notes.c>:handle:%add.ptr.i.i
@@ -72,7 +72,7 @@ nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx8
 nil	*stack_alloc@handle_loop[[1024 x i8]* %req][0][*]	nil	<notes.c>:handle_loop:%arrayidx9
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -91,7 +91,7 @@ nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/0	nil	<notes.c>:hand
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg
 nil	*typed_heap_alloc@handle[%struct.cmd* %call.i.i.i][0].?/1	nil	<notes.c>:handle:%arg7
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
@@ -106,7 +106,7 @@ nil	*typed_heap_alloc@handle[i32* %call.i.i.i][0]	nil	<notes.c>:handle:%c17.i
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%3
 nil	*typed_heap_alloc@handle[i32* %call.i.i.i][2]	nil	<notes.c>:handle:%arg2.i.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%2
-nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%32
+nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%33
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c.i
 nil	*typed_heap_alloc@handle[i8* %call.i.i.i]	nil	<notes.c>:handle:%c1.i.i
diff --git a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
index 61fec1d..3974e0f 100644
--- a/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/notes.clang.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
@@ -40,18 +40,18 @@
 [<notes.c>:handle:94, nil]	<notes.c>:strdup	nil	<notes.c>:handle:94
 [<notes.c>:handle:99, nil]	<notes.c>:fwrite	nil	<notes.c>:handle:99
 [<notes.c>:handle_loop:10, nil]	<notes.c>:__assert_fail	nil	<notes.c>:handle_loop:10
-[<notes.c>:handle_loop:3, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:3
-[<notes.c>:handle_loop:30, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:30
-[<notes.c>:handle_loop:31, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:31
-[<notes.c>:handle_loop:32, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:32
-[<notes.c>:handle_loop:33, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:33
-[<notes.c>:handle_loop:34, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:34
-[<notes.c>:handle_loop:36, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:36
-[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:37
-[<notes.c>:handle_loop:39, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:39
+[<notes.c>:handle_loop:2, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:2
+[<notes.c>:handle_loop:33, nil]	<notes.c>:strlen	nil	<notes.c>:handle_loop:33
+[<notes.c>:handle_loop:34, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:34
+[<notes.c>:handle_loop:35, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:35
+[<notes.c>:handle_loop:36, nil]	<notes.c>:free	nil	<notes.c>:handle_loop:36
+[<notes.c>:handle_loop:37, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:37
+[<notes.c>:handle_loop:39, nil]	<notes.c>:send	nil	<notes.c>:handle_loop:39
 [<notes.c>:handle_loop:4, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:4
-[<notes.c>:handle_loop:43, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:43
-[<notes.c>:handle_loop:45, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:45
+[<notes.c>:handle_loop:40, nil]	<notes.c>:llvm.lifetime.start.p0i8	nil	<notes.c>:handle_loop:40
+[<notes.c>:handle_loop:42, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:42
+[<notes.c>:handle_loop:46, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:46
+[<notes.c>:handle_loop:48, nil]	<notes.c>:llvm.lifetime.end.p0i8	nil	<notes.c>:handle_loop:48
 [<notes.c>:handle_loop:6, nil]	<notes.c>:recv	nil	<notes.c>:handle_loop:6
 [<notes.c>:main:2, [<<main-context>>, nil]]	<notes.c>:llvm.lifetime.start.p0i8	[<<main-context>>, nil]	<notes.c>:main:2
 [<notes.c>:main:23, [<<main-context>>, nil]]	<notes.c>:puts	[<<main-context>>, nil]	<notes.c>:main:23
@@ -78,13 +78,13 @@ nil	<notes.c>:exit	nil	<notes.c>:handle:88
 nil	<notes.c>:fgets	nil	<notes.c>:handle:204
 nil	<notes.c>:fprintf	nil	<notes.c>:handle:170
 nil	<notes.c>:fread	nil	<notes.c>:handle:117
-nil	<notes.c>:handle	nil	<notes.c>:handle_loop:26
+nil	<notes.c>:handle	nil	<notes.c>:handle_loop:29
 nil	<notes.c>:handle_loop	nil	<notes.c>:accept_loop:6
 nil	<notes.c>:listen	[<<main-context>>, nil]	<notes.c>:main:27
 nil	<notes.c>:llvm.dbg.declare	[<<main-context>>, nil]	<notes.c>:main:3
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:104
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle:203
-nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:38
+nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:41
 nil	<notes.c>:llvm.dbg.declare	nil	<notes.c>:handle_loop:5
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:35
 nil	<notes.c>:llvm.dbg.value	[<<main-context>>, nil]	<notes.c>:main:5
@@ -142,8 +142,8 @@ nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:83
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:93
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle:95
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:1
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:27
-nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:40
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:30
+nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:43
 nil	<notes.c>:llvm.dbg.value	nil	<notes.c>:handle_loop:7
 nil	<notes.c>:shutdown	nil	<notes.c>:accept_loop:7
 nil	<notes.c>:socket	[<<main-context>>, nil]	<notes.c>:main:4
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
index ba122ac..2902c1b 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.callgraph.callgraph_edge.golden.csv
@@ -1,27 +1,27 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121
-[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127
+[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
-[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
+[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
 nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv	[<<main-context>>, nil]	<ovington-extra-minimal.cpp>:main:0
-nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
+nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:125
 nil	<ovington-extra-minimal.cpp>:_Znwm	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:24
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:14
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:3
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
@@ -42,24 +42,24 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:10
@@ -68,7 +68,6 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:105
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:109
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:110
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:124
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:15
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:16
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:17
@@ -111,22 +110,23 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:97
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:98
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:12
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:13
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:15
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:19
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:20
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:32
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:33
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:37
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:38
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:40
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:44
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:45
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:13
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:14
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:16
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:20
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:21
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:33
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:34
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:38
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:39
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:41
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:45
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:46
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:9
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:4
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:5
 nil	<ovington-extra-minimal.cpp>:llvm.lifetime.start.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
index b0d5ee0..9172440 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.operand_points_to.golden.csv
@@ -1,17 +1,17 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	*stack_alloc@_ZNK10FakeLambda7inspectEv[%class.FakeLambda** %this.addr]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this.addr
 nil	*global_alloc@_Z16hardcoded_sharedv	[<<main-context>>, nil]	<ovington-extra-minimal.cpp>:main:0:0:@_Z16hardcoded_sharedv
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%8
-nil	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126:0:@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev
+nil	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:125:0:@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZTV10FakeLambda	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:47:2:@_ZTV10FakeLambda
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:47:0:bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV10FakeLambda, i64 0, inrange i32 0, i64 2) to i32 (...)**)
@@ -19,54 +19,54 @@ nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:31:2:@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:31:0:bitcast (i8** getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2) to i32 (...)**)
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:31:1:getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2)
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:38:2:@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:38:0:bitcast (i8** getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2) to i32 (...)**)
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:38:1:getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2)
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12:0:@_ZdlPv
-nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12:0:@_ZdlPv
 nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2:0:@_ZdlPv
 nil	*global_alloc@_Znwm	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:24:0:@_Znwm
 nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:@__gxx_personality_v0
 nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:@__gxx_personality_v0
-nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:@__gxx_personality_v0
-nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:@__gxx_personality_v0
+nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:@__gxx_personality_v0
+nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:@__gxx_personality_v0
 nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:1:bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
 nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2:@__gxx_personality_v0
-nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0:@__gxx_personality_v0
+nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0:@__gxx_personality_v0
 nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:74:0:@__libc_single_threaded
 nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:99:0:@__libc_single_threaded
-nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:34:0:@__libc_single_threaded
-nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:9:0:@__libc_single_threaded
+nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:10:0:@__libc_single_threaded
+nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:35:0:@__libc_single_threaded
 nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:2:0:@llvm.dbg.declare
-nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.declare
+nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:14:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:3:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.value
@@ -87,24 +87,24 @@ nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sha
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:102:0:@llvm.dbg.value
@@ -113,7 +113,6 @@ nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:109:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:10:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:110:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:124:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:15:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:16:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:17:0:@llvm.dbg.value
@@ -156,26 +155,27 @@ nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:97:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:98:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:9:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:12:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:13:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:15:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:19:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:20:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:32:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:33:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:37:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:38:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:40:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:44:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:45:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:5:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:7:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:13:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:14:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:16:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:1:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:20:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:21:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:33:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:34:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:38:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:39:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:41:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:45:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:46:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:6:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:9:0:@llvm.dbg.value
 nil	*global_alloc@llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:4:0:@llvm.experimental.noalias.scope.decl
 nil	*global_alloc@llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:5:0:@llvm.experimental.noalias.scope.decl
 nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1:0:@llvm.trap
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
@@ -183,11 +183,11 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
@@ -195,25 +195,25 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovingt
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
@@ -226,32 +226,36 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovi
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_use_count.i.i.i.i.i.i.i
 nil	*null*	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:12:0:null
 nil	*null*	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:68:0:null
-nil	*null*	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:3:0:null
+nil	*null*	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:4:0:null
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%0
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%6
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%mylambda
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%5
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i.i.i.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i3
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
@@ -259,25 +263,25 @@ nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv
index 5359a85..367fa8a 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset.var_points_to.golden.csv
@@ -1,53 +1,53 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	*stack_alloc@_ZNK10FakeLambda7inspectEv[%class.FakeLambda** %this.addr]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this.addr
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%8
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
@@ -55,25 +55,25 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovingt
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
@@ -85,30 +85,34 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	nil	<ov
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%2
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_use_count.i.i.i.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%0
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%6
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%mylambda
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%5
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i.i.i.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i3
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
@@ -116,25 +120,25 @@ nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_may_alias_ctx.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_may_alias_ctx.golden.csv
index 5ea843f..b13e2de 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_may_alias_ctx.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_may_alias_ctx.golden.csv
@@ -14,7 +14,7 @@ nil	*global_alloc@_Z16hardcoded_sharedv	*global_alloc@_Z16hardcoded_sharedv
 nil	*global_alloc@_ZN10FakeLambdaD0Ev	*global_alloc@_ZN10FakeLambdaD0Ev
 nil	*global_alloc@_ZN10FakeLambdaD2Ev	*global_alloc@_ZN10FakeLambdaD2Ev
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	*global_alloc@_ZNK10FakeLambda7inspectEv
-nil	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev
+nil	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_must_alias_ctx.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_must_alias_ctx.golden.csv
index 5ea843f..b13e2de 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_must_alias_ctx.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.subset_lift.alloc_must_alias_ctx.golden.csv
@@ -14,7 +14,7 @@ nil	*global_alloc@_Z16hardcoded_sharedv	*global_alloc@_Z16hardcoded_sharedv
 nil	*global_alloc@_ZN10FakeLambdaD0Ev	*global_alloc@_ZN10FakeLambdaD0Ev
 nil	*global_alloc@_ZN10FakeLambdaD2Ev	*global_alloc@_ZN10FakeLambdaD2Ev
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	*global_alloc@_ZNK10FakeLambda7inspectEv
-nil	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev
+nil	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
index ba122ac..2902c1b 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.1-callsite.unification.callgraph.callgraph_edge.golden.csv
@@ -1,27 +1,27 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121
-[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127
+[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
-[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
+[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, nil]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
 nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv	[<<main-context>>, nil]	<ovington-extra-minimal.cpp>:main:0
-nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
+nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:125
 nil	<ovington-extra-minimal.cpp>:_Znwm	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:24
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:14
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:3
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
@@ -42,24 +42,24 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:10
@@ -68,7 +68,6 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:105
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:109
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:110
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:124
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:15
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:16
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:17
@@ -111,22 +110,23 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:97
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:98
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:12
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:13
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:15
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:19
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:20
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:32
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:33
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:37
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:38
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:40
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:44
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:45
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:13
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:14
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:16
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:20
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:21
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:33
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:34
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:38
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:39
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:41
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:45
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:46
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:9
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:4
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:5
 nil	<ovington-extra-minimal.cpp>:llvm.lifetime.start.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
index d0f3087..b3bf905 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.callgraph.callgraph_edge.golden.csv
@@ -1,28 +1,28 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121
-[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127
+[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
-[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
+[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
-[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
+[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
 nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv	[<<main-context>>, nil]	<ovington-extra-minimal.cpp>:main:0
-nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
+nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:125
 nil	<ovington-extra-minimal.cpp>:_Znwm	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:24
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:14
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:3
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
@@ -43,35 +43,34 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:10
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:102
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:103
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:105
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:109
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:110
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:124
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:15
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:16
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:17
@@ -114,24 +113,25 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:97
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:98
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:12
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:13
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:15
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:19
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:20
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:32
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:33
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:37
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:38
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:40
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:44
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:45
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:13
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:14
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:16
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:20
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:21
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:33
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:34
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:38
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:39
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:41
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:45
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:46
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:9
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:4
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:5
 nil	<ovington-extra-minimal.cpp>:llvm.lifetime.start.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2
 nil	<ovington-extra-minimal.cpp>:llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1
-nil	<ovington-extra-minimal.cpp>:llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1
+nil	<ovington-extra-minimal.cpp>:llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
index 956ffb2..55fa16c 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.operand_points_to.golden.csv
@@ -1,17 +1,17 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	*stack_alloc@_ZNK10FakeLambda7inspectEv[%class.FakeLambda** %this.addr]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this.addr
 nil	*global_alloc@_Z16hardcoded_sharedv	[<<main-context>>, nil]	<ovington-extra-minimal.cpp>:main:0:0:@_Z16hardcoded_sharedv
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%8
-nil	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126:0:@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev
+nil	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:125:0:@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZTV10FakeLambda	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:47:2:@_ZTV10FakeLambda
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:47:0:bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV10FakeLambda, i64 0, inrange i32 0, i64 2) to i32 (...)**)
@@ -19,55 +19,55 @@ nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:31:2:@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:31:0:bitcast (i8** getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2) to i32 (...)**)
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:31:1:getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2)
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:38:2:@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:38:0:bitcast (i8** getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2) to i32 (...)**)
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:38:1:getelementptr inbounds ({ [7 x i8*] }, { [7 x i8*] }* @_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE, i64 0, inrange i32 0, i64 2)
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12:0:@_ZdlPv
-nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12:0:@_ZdlPv
 nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2:0:@_ZdlPv
-nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2:0:@_ZdlPv
+nil	*global_alloc@_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2:0:@_ZdlPv
 nil	*global_alloc@_Znwm	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:24:0:@_Znwm
 nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:@__gxx_personality_v0
 nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:@__gxx_personality_v0
-nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:@__gxx_personality_v0
-nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:@__gxx_personality_v0
+nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:@__gxx_personality_v0
+nil	*global_alloc@__gxx_personality_v0	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:@__gxx_personality_v0
 nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:1:bitcast (i32 (...)* @__gxx_personality_v0 to i8*)
 nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2:@__gxx_personality_v0
-nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0:@__gxx_personality_v0
+nil	*global_alloc@__gxx_personality_v0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0:@__gxx_personality_v0
 nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:74:0:@__libc_single_threaded
 nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:99:0:@__libc_single_threaded
-nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:34:0:@__libc_single_threaded
-nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:9:0:@__libc_single_threaded
+nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:10:0:@__libc_single_threaded
+nil	*global_alloc@__libc_single_threaded	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:35:0:@__libc_single_threaded
 nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:2:0:@llvm.dbg.declare
-nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.declare
+nil	*global_alloc@llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:14:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:3:0:@llvm.dbg.declare
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.value
@@ -88,35 +88,34 @@ nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sha
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:102:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:103:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:105:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:109:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:10:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:110:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:124:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:15:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:16:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:17:0:@llvm.dbg.value
@@ -159,71 +158,72 @@ nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:97:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:98:0:@llvm.dbg.value
 nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:9:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:12:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:13:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:15:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:19:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:20:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:32:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:33:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:37:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:38:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:40:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:44:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:45:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:5:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:7:0:@llvm.dbg.value
-nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:13:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:14:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:16:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:1:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:20:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:21:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:33:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:34:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:38:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:39:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:41:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:45:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:46:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:6:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:8:0:@llvm.dbg.value
+nil	*global_alloc@llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:9:0:@llvm.dbg.value
 nil	*global_alloc@llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:4:0:@llvm.experimental.noalias.scope.decl
 nil	*global_alloc@llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:5:0:@llvm.experimental.noalias.scope.decl
 nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121:0:@llvm.lifetime.end.p0i8
-nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127:0:@llvm.lifetime.end.p0i8
+nil	*global_alloc@llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126:0:@llvm.lifetime.end.p0i8
 nil	*global_alloc@llvm.lifetime.start.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2:0:@llvm.lifetime.start.p0i8
 nil	*global_alloc@llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1:0:@llvm.trap
-nil	*global_alloc@llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1:0:@llvm.trap
+nil	*global_alloc@llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1:0:@llvm.trap
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%1
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
@@ -236,64 +236,68 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovi
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_use_count.i.i.i.i.i.i.i
 nil	*null*	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:12:0:null
 nil	*null*	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:68:0:null
-nil	*null*	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:3:0:null
+nil	*null*	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:4:0:null
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%0
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%6
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%mylambda
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%5
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i.i.i.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i3
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%1
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv
index 5748d35..acbae63 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset.var_points_to.golden.csv
@@ -1,85 +1,85 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	*stack_alloc@_ZNK10FakeLambda7inspectEv[%class.FakeLambda** %this.addr]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this.addr
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%8
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%18
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%9
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
-nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
+nil	*global_alloc@_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%1
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable
 nil	*global_alloc@_ZTV10FakeLambda[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vtable
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vtable6.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[2]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vtable6.i.i
 nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i
-nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[3]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%vfn
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[4]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%vfn7.i.i.i
+nil	*global_alloc@_ZTVSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE[0].?/0[5]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%vfn7.i.i
 nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%14
-nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
+nil	*global_alloc@__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%5
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%1
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
@@ -91,62 +91,66 @@ nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	nil	<ov
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%2
 nil	*heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][8]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_use_count.i.i.i.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%0
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%6
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%mylambda
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%20
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_ptr.i.i.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%5
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
 nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i.i.i.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_refcount.i3
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%this
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i
-nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_pi.i.i
+nil	*stack_alloc@_Z16hardcoded_sharedv[%"class.std::shared_ptr"* %mylambda][0].?/0.?/1.?/0	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%_M_pi.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%1
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%call5.i.i.i21.i.i.i.i2.i
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:%this
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%13
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%9
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
-nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%0
+nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][0]	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:%4
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%3
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][12]	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:%_M_weak_count.i.i.i.i.i.i.i
 nil	*typed_heap_alloc@_Z16hardcoded_sharedv[i8* %call5.i.i.i21.i.i.i.i2.i][16]	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:%this
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_may_alias_ctx.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_may_alias_ctx.golden.csv
index 5ea843f..b13e2de 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_may_alias_ctx.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_may_alias_ctx.golden.csv
@@ -14,7 +14,7 @@ nil	*global_alloc@_Z16hardcoded_sharedv	*global_alloc@_Z16hardcoded_sharedv
 nil	*global_alloc@_ZN10FakeLambdaD0Ev	*global_alloc@_ZN10FakeLambdaD0Ev
 nil	*global_alloc@_ZN10FakeLambdaD2Ev	*global_alloc@_ZN10FakeLambdaD2Ev
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	*global_alloc@_ZNK10FakeLambda7inspectEv
-nil	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev
+nil	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_must_alias_ctx.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_must_alias_ctx.golden.csv
index 5ea843f..b13e2de 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_must_alias_ctx.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.subset_lift.alloc_must_alias_ctx.golden.csv
@@ -14,7 +14,7 @@ nil	*global_alloc@_Z16hardcoded_sharedv	*global_alloc@_Z16hardcoded_sharedv
 nil	*global_alloc@_ZN10FakeLambdaD0Ev	*global_alloc@_ZN10FakeLambdaD0Ev
 nil	*global_alloc@_ZN10FakeLambdaD2Ev	*global_alloc@_ZN10FakeLambdaD2Ev
 nil	*global_alloc@_ZNK10FakeLambda7inspectEv	*global_alloc@_ZNK10FakeLambda7inspectEv
-nil	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev
+nil	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev
 nil	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev	*global_alloc@_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev
diff --git a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
index d0f3087..b3bf905 100644
--- a/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
+++ b/test/gold/ovington-extra-minimal.clang++.-g-grecord-gcc-switches-O1-O1-fno-discard-value-names.2-callsite.unification.callgraph.callgraph_edge.golden.csv
@@ -1,28 +1,28 @@
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:121
-[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:127
+[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126, nil]	<ovington-extra-minimal.cpp>:llvm.lifetime.end.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
 [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
-[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:__cxa_pure_virtual	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
+[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
-[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
+[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:12
 [<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
-[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
+[<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2, [<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, nil]]	<ovington-extra-minimal.cpp>:_ZdlPv	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:2
 nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv	[<<main-context>>, nil]	<ovington-extra-minimal.cpp>:main:0
-nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:126
+nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:125
 nil	<ovington-extra-minimal.cpp>:_Znwm	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:24
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:63, nil]	<ovington-extra-minimal.cpp>:_ZNK10FakeLambda7inspectEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:14
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.declare	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:3
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
@@ -43,35 +43,34 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:95, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:30, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:31, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:10
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:2
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:3
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:4
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:7
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt23_Sp_counted_ptr_inplaceI10FakeLambdaSaIS0_ELN9__gnu_cxx12_Lock_policyE2EED0Ev:0
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:10
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:102
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:103
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:105
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:109
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:110
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:124
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:15
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:16
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:17
@@ -114,24 +113,25 @@ nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:9
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:97
 nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:98
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:0
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:12
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:13
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:15
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:19
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:20
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:32
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:33
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:37
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:38
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:40
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:44
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:45
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:5
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:7
-nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:0
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:1
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:13
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:14
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:16
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:20
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:21
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:33
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:34
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:38
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:39
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:41
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:45
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:46
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:6
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:8
+nil	<ovington-extra-minimal.cpp>:llvm.dbg.value	nil	<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:9
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:4
 nil	<ovington-extra-minimal.cpp>:llvm.experimental.noalias.scope.decl	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:5
 nil	<ovington-extra-minimal.cpp>:llvm.lifetime.start.p0i8	nil	<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:2
 nil	<ovington-extra-minimal.cpp>:llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_Z16hardcoded_sharedv:119, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1
-nil	<ovington-extra-minimal.cpp>:llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev:54, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1
+nil	<ovington-extra-minimal.cpp>:llvm.trap	[<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv:5, [<ovington-extra-minimal.cpp>:_ZNSt12__shared_ptrI10FakeLambdaLN9__gnu_cxx12_Lock_policyE2EED2Ev:55, nil]]	<ovington-extra-minimal.cpp>:_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev:1