OSDN Git Service

Don't crash if package import fails.
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 4 Jan 2011 18:24:05 +0000 (18:24 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 4 Jan 2011 18:24:05 +0000 (18:24 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168477 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/go/gofrontend/gogo.cc

index 1b00549..c274424 100644 (file)
@@ -330,8 +330,11 @@ Gogo::import_package(const std::string& filename,
   Import imp(stream, location);
   imp.register_builtin_types(this);
   Package* package = imp.import(this, local_name, is_local_name_exported);
-  this->imports_.insert(std::make_pair(filename, package));
-  package->set_is_imported();
+  if (package != NULL)
+    {
+      this->imports_.insert(std::make_pair(filename, package));
+      package->set_is_imported();
+    }
 
   delete stream;
 }