Make sure to always mark a global variable as not being constant if it has a C++ initializer.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94504 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGenCXX/static-init.cpp b/test/CodeGenCXX/static-init.cpp
index cbd90e7..33d92d6 100644
--- a/test/CodeGenCXX/static-init.cpp
+++ b/test/CodeGenCXX/static-init.cpp
@@ -1,4 +1,6 @@
 // RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+
+// CHECK: @_ZZ1hvE1i = internal global i32 0, align 4
 struct A {
   A();
   ~A();
@@ -15,3 +17,8 @@
   // CHECK: call void @_ZN1AC1Ev(
   static A& a = *new A;
 }
+
+int a();
+void h() {
+  static const int i = a();
+}