From 9bcafe39c66e2981c752d47ad590ecac1207ec61 Mon Sep 17 00:00:00 2001
From: "Frederick C. Kurz" <fckurz1@yahoo.com>
Date: Fri, 10 Jul 2015 12:50:37 -0400
Subject: [PATCH] Changes to elab_type.c

Changes for "Microsoft Visual Studio Express 2015 RC Web" to first check for a dereferencable iterator so pr1741212.v, and many others, will pass with a DEBUG build.
---
 elab_type.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elab_type.cc b/elab_type.cc
index 3ff85a9d8..eb2803cbf 100644
--- a/elab_type.cc
+++ b/elab_type.cc
@@ -81,8 +81,8 @@ ivl_type_s* data_type_t::elaborate_type(Design*des, NetScope*scope)
 	    use_definitions = des;
 
       map<Definitions*,ivl_type_s*>::iterator pos = cache_type_elaborate_.lower_bound(use_definitions);
-      if (pos->first == use_definitions)
-	    return pos->second;
+	  if (pos != cache_type_elaborate_.end() && pos->first == use_definitions)
+	     return pos->second;
 
       ivl_type_s*tmp = elaborate_type_raw(des, scope);
       cache_type_elaborate_.insert(pos, pair<NetScope*,ivl_type_s*>(scope, tmp));