diff --git a/CodeGen/CodeGenModule.cpp b/CodeGen/CodeGenModule.cpp
index afd23c4..2ce7f4e 100644
--- a/CodeGen/CodeGenModule.cpp
+++ b/CodeGen/CodeGenModule.cpp
@@ -488,8 +488,8 @@
   if (!Init)
     Init = EmitGlobalInit(D->getInit());
 
-  assert(Init && "FIXME: Global variable initializers unimp!");
-
+  assert(GV->getType()->getElementType() == Init->getType() &&
+         "Initializer codegen type mismatch!");
   GV->setInitializer(Init);
   
   // Set the llvm linkage type as appropriate.