[gnome-builder] persistent-map: fix incorrect assertions

[Christian Hergert <chergert src gnome org>]

commit 82c2b65f16b272a9a881fa98b48955fbcd3b82b0
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 18 06:36:28 2018 -0800

    persistent-map: fix incorrect assertions
    
    We can change these a bit now that we know how they're getting
    used in the new version of the code.

 src/plugins/code-index/ide-persistent-map-builder.c | 12 +-----------
 src/plugins/code-index/ide-persistent-map.c         |  4 +++-
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/plugins/code-index/ide-persistent-map-builder.c 
b/src/plugins/code-index/ide-persistent-map-builder.c
index dd727011f..9868ff018 100644
--- a/src/plugins/code-index/ide-persistent-map-builder.c
+++ b/src/plugins/code-index/ide-persistent-map-builder.c
@@ -56,9 +56,6 @@ struct _IdePersistentMapBuilder
 {
   GObject parent;
 
-  /* Owning thread for assertions */
-  GThread *thread;
-
   /*
    * The build state lets us keep all the contents together, and then
    * pass it to the worker thread so the main thread can no longer access
@@ -253,11 +250,10 @@ ide_persistent_map_builder_write (IdePersistentMapBuilder  *self,
   g_autoptr(GTask) task = NULL;
 
   g_return_val_if_fail (IDE_IS_PERSISTENT_MAP_BUILDER (self), FALSE);
-  g_return_val_if_fail (self->thread == g_thread_self (), FALSE);
   g_return_val_if_fail (G_IS_FILE (destination), FALSE);
   g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE);
   g_return_val_if_fail (self->state != NULL, FALSE);
-  g_return_val_if_fail (self->state->destination != NULL, FALSE);
+  g_return_val_if_fail (self->state->destination == NULL, FALSE);
 
   self->state->destination = g_object_ref (destination);
 
@@ -281,10 +277,8 @@ ide_persistent_map_builder_write_async (IdePersistentMapBuilder *self,
   g_autoptr(GTask) task = NULL;
 
   g_return_if_fail (IDE_IS_PERSISTENT_MAP_BUILDER (self));
-  g_return_if_fail (self->thread == g_thread_self ());
   g_return_if_fail (G_IS_FILE (destination));
   g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
-  g_return_if_fail (self->thread == g_thread_self ());
   g_return_if_fail (self->state != NULL);
   g_return_if_fail (self->state->destination != NULL);
 
@@ -313,7 +307,6 @@ ide_persistent_map_builder_write_finish (IdePersistentMapBuilder  *self,
 {
   g_return_val_if_fail (IDE_IS_PERSISTENT_MAP_BUILDER (self), FALSE);
   g_return_val_if_fail (G_IS_TASK (result), FALSE);
-  g_return_val_if_fail (self->thread == g_thread_self (), FALSE);
 
   return g_task_propagate_boolean (G_TASK (result), error);
 }
@@ -324,7 +317,6 @@ ide_persistent_map_builder_finalize (GObject *object)
   IdePersistentMapBuilder *self = (IdePersistentMapBuilder *)object;
 
   g_clear_pointer (&self->state, build_state_free);
-  self->thread =  NULL;
 
   G_OBJECT_CLASS (ide_persistent_map_builder_parent_class)->finalize (object);
 }
@@ -332,8 +324,6 @@ ide_persistent_map_builder_finalize (GObject *object)
 static void
 ide_persistent_map_builder_init (IdePersistentMapBuilder *self)
 {
-  self->thread = g_thread_self ();
-
   self->state = g_slice_new0 (BuildState);
   self->state->keys = g_byte_array_new ();
   self->state->keys_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
diff --git a/src/plugins/code-index/ide-persistent-map.c b/src/plugins/code-index/ide-persistent-map.c
index 4b3725776..85883a017 100644
--- a/src/plugins/code-index/ide-persistent-map.c
+++ b/src/plugins/code-index/ide-persistent-map.c
@@ -258,6 +258,9 @@ ide_persistent_map_lookup_value (IdePersistentMap *self,
   g_return_val_if_fail (self->values != NULL, NULL);
   g_return_val_if_fail (self->n_kvpairs < G_MAXINT64, NULL);
 
+  if (self->n_kvpairs == 0)
+    return NULL;
+
   /* unsigned long to signed long */
   r = (gint64)self->n_kvpairs - 1;
   l = 0;
@@ -279,7 +282,6 @@ ide_persistent_map_lookup_value (IdePersistentMap *self,
 
       g_assert (l >= 0);
       g_assert (r >= 0);
-      g_assert (r >= l);
     }
 
   if (value != NULL && self->byte_order != G_BYTE_ORDER)