diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 069b5890d8443314bfec14dd618c3a269430c628..24212a1f4a6cade316f75504c37828ecbcc6d189 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-26  Richard Guenther  <rguenther@suse.de>
+
+	* lto.c (lto_fixup_type): Deal with non-type TYPE_CONTEXT.
+
 2010-04-26  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* lto.h (lto_elf_file_open): Rename prototype from this ...
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index b6001d85dd0becd1f7729a5e63d42052af984bca..9002686ae652013bb41f91782893d0c4555757fe 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -1422,7 +1422,13 @@ lto_fixup_type (tree t, void *data)
   /* Accessor is for derived node types only. */
   LTO_FIXUP_SUBTREE (t->type.binfo);
 
-  LTO_REGISTER_TYPE_AND_FIXUP_SUBTREE (TYPE_CONTEXT (t));
+  if (TYPE_CONTEXT (t))
+    {
+      if (TYPE_P (TYPE_CONTEXT (t)))
+	LTO_REGISTER_TYPE_AND_FIXUP_SUBTREE (TYPE_CONTEXT (t));
+      else
+	LTO_FIXUP_SUBTREE (TYPE_CONTEXT (t));
+    }
   LTO_REGISTER_TYPE_AND_FIXUP_SUBTREE (TYPE_CANONICAL (t));
 
   /* The following re-creates proper variant lists while fixing up
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9f470ca7d8cb21fd569ab0dd6f702273d253d047..0b022d5c012970170fe96517d3fcf04e56506ae8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-26  Richard Guenther  <rguenther@suse.de>
+
+	* gcc.dg/lto/20100426_0.c: New testcase.
+
 2010-04-26  Jie Zhang  <jie@codesourcery.com>
 
 	PR tree-optimization/43833
diff --git a/gcc/testsuite/gcc.dg/lto/20100426_0.c b/gcc/testsuite/gcc.dg/lto/20100426_0.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1dc06f960bd019397a86306b3ebacc243a40d6b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/20100426_0.c
@@ -0,0 +1,7 @@
+/* { dg-lto-do link } */
+/* { dg-lto-options {{-r -nostdlib -flto -g}} } */
+
+long Perl_my_htonl (long l)
+{
+      union { } u;
+}