From 17b816fbf83069332441c98daee231a9772cf809 Mon Sep 17 00:00:00 2001
From: Adam Kelly <adam@cthulahoops.org>
Date: Mon, 25 Mar 2019 20:37:47 +0000
Subject: [PATCH] Fix objset compilation error caused by merge race.

---
 vm/src/obj/objset.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vm/src/obj/objset.rs b/vm/src/obj/objset.rs
index 72ee8c897..7071cc6e4 100644
--- a/vm/src/obj/objset.rs
+++ b/vm/src/obj/objset.rs
@@ -86,11 +86,13 @@ fn create_set(
                 elements: RefCell::new(elements),
             },
             PySet::class(vm),
+            None,
         ))
     } else if objtype::issubclass(&cls, &vm.ctx.frozenset_type()) {
         Ok(PyObject::new(
             PyFrozenSet { elements: elements },
             PyFrozenSet::class(vm),
+            None,
         ))
     } else {
         Err(vm.new_type_error(format!("{} is not a subtype of set or frozenset", cls)))