Merge branch 'main' into jmm/mean-atomic-mass

lanl · Dec 3, 2024 · 91865e5 · 91865e5
2 parents 5edeed4 + 668d71a
commit 91865e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/singularity-eos/eos/get_sg_eos_rho_e.cpp b/singularity-eos/eos/get_sg_eos_rho_e.cpp
@@ -54,9 +54,9 @@ void get_sg_eos_rho_e(const char *name, int ncell, indirection_v &offsets_v,
           // eos accessor
           singularity::EOSAccessor_ eos_inx(eos_v, &pte_idxs(tid, 0));
           // reset inputs
-          // JMM: Address sanitizer likes these named. My guess is
-          // that the forwarding references are not being resolved
-          // properly.
+          // JMM: The solver constructor is (deep under the hood)
+          // capturing by reference. So to avoid out-of-scope access,
+          // these must be "anchored" at caller scope.
           Real *prho_pte = &rho_pte(tid, 0);
           Real *pvfrac_pte = &vfrac_pte(tid, 0);
           Real *psie_pte = &sie_pte(tid, 0);

diff --git a/singularity-eos/eos/get_sg_eos_rho_t.cpp b/singularity-eos/eos/get_sg_eos_rho_t.cpp
@@ -55,8 +55,9 @@ void get_sg_eos_rho_t(const char *name, int ncell, indirection_v &offsets_v,
           // create solver lambda
           // eos accessor
           singularity::EOSAccessor_ eos_inx(eos_v, &pte_idxs(tid, 0));
-          // JMM: Address sanitizer does not like passing these in
-          // through the function call.
+          // JMM: The solver constructor is (deep under the hood)
+          // capturing by reference. So to avoid out-of-scope access,
+          // these must be "anchored" at caller scope.
           Real *prho_pte = &rho_pte(tid, 0);
           Real *pvfrac_pte = &vfrac_pte(tid, 0);
           Real *psie_pte = &sie_pte(tid, 0);