From 72eb8ff8da721a5f08031a51e68b979df2ddd2d1 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 27 Oct 2016 22:01:00 -0700
Subject: [PATCH] ircd::js: Add conversions for JS::Heap<> type to handle
 types.

---
 include/ircd/js/root.h | 44 ++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/include/ircd/js/root.h b/include/ircd/js/root.h
index 672e308ea..56c417464 100644
--- a/include/ircd/js/root.h
+++ b/include/ircd/js/root.h
@@ -93,6 +93,23 @@ struct root<T, lifetime::stack>
 	root &operator=(const root &) = delete;
 };
 
+// This conversion is missing in the jsapi. Is this object not gc rooted? Can it not have a handle?
+template<class T>
+JS::Handle<T>
+operator&(const JS::Heap<T> &h)
+{
+	return JS::Handle<T>::fromMarkedLocation(h.address());
+}
+
+// This conversion is missing in the jsapi. Is this object not gc rooted? Can it not have a handle?
+template<class T>
+JS::MutableHandle<T>
+operator&(JS::Heap<T> &h)
+{
+	const auto ptr(const_cast<T *>(h.address()));
+	return JS::MutableHandle<T>::fromMarkedLocation(ptr);
+}
+
 template<class T>
 struct root<T, lifetime::heap>
 :JS::Heap<T>
@@ -112,16 +129,6 @@ struct root<T, lifetime::heap>
 		return JS::MutableHandle<T>::fromMarkedLocation(ptr);
 	}
 
-	auto operator&() const
-	{
-		return static_cast<handle>(*this);
-	}
-
-	auto operator&()
-	{
-		return static_cast<handle_mutable>(*this);
-	}
-
 	root(const handle &h)
 	:JS::Heap<T>{h}
 	{
@@ -154,6 +161,23 @@ struct root<T, lifetime::heap>
 	root &operator=(const root &) = default;
 };
 
+// This conversion is missing in the jsapi. Is this object not gc rooted? Can it not have a handle?
+template<class T>
+JS::Handle<T>
+operator&(const JS::TenuredHeap<T> &h)
+{
+	return JS::Handle<T>::fromMarkedLocation(h.address());
+}
+
+// This conversion is missing in the jsapi. Is this object not gc rooted? Can it not have a handle?
+template<class T>
+JS::MutableHandle<T>
+operator&(JS::TenuredHeap<T> &h)
+{
+	const auto ptr(const_cast<T *>(h.address()));
+	return JS::MutableHandle<T>::fromMarkedLocation(ptr);
+}
+
 template<class T>
 struct root<T, lifetime::tenured>
 :JS::TenuredHeap<T>