diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 27dd600..5b784aa 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -449,6 +449,7 @@
   }
 
   GV->setInitializer(Init);
+  GV->setConstant(D->getType().isConstant(Context));
 
   // FIXME: This is silly; getTypeAlign should just work for incomplete arrays
   unsigned Align;