diff --git a/llvm/lib/Transforms/IPO/GlobalOpt.cpp b/llvm/lib/Transforms/IPO/GlobalOpt.cpp
index d197a3c87ad5..bb37bf4c26e4 100644
--- a/llvm/lib/Transforms/IPO/GlobalOpt.cpp
+++ b/llvm/lib/Transforms/IPO/GlobalOpt.cpp
@@ -2511,10 +2511,13 @@ bool Evaluator::EvaluateBlock(BasicBlock::iterator CurInst,
           if (!II->use_empty())
             return false;
           ConstantInt *Size = cast<ConstantInt>(II->getArgOperand(0));
-          if (Size->isAllOnesValue()) {
-            Value *PtrArg = getVal(II->getArgOperand(1));
-            Value *Ptr = PtrArg->stripPointerCasts();
-            if (GlobalVariable *GV = dyn_cast<GlobalVariable>(Ptr))
+          Value *PtrArg = getVal(II->getArgOperand(1));
+          Value *Ptr = PtrArg->stripPointerCasts();
+          if (GlobalVariable *GV = dyn_cast<GlobalVariable>(Ptr)) {
+            Type *ElemTy = cast<PointerType>(GV->getType())->getElementType();
+            if (!Size->isAllOnesValue() &&
+                Size->getValue().getLimitedValue() >=
+                TD->getTypeStoreSize(ElemTy))
               Invariants.insert(GV);
           }
           // Continue even if we do nothing.
diff --git a/llvm/test/Transforms/GlobalOpt/invariant.ll b/llvm/test/Transforms/GlobalOpt/invariant.ll
index 687dc83f5cff..6b9919347890 100644
--- a/llvm/test/Transforms/GlobalOpt/invariant.ll
+++ b/llvm/test/Transforms/GlobalOpt/invariant.ll
@@ -1,9 +1,12 @@
 ; RUN: opt -globalopt -S -o - < %s | FileCheck %s
 
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
 declare {}* @llvm.invariant.start(i64 %size, i8* nocapture %ptr)
 
 define void @test1(i8* %ptr) {
-  call {}* @llvm.invariant.start(i64 -1, i8* %ptr)
+  call {}* @llvm.invariant.start(i64 4, i8* %ptr)
   ret void
 }
 
@@ -22,12 +25,35 @@ define void @ctor1() {
 define void @ctor2() {
   store i32 -1, i32* @object2
   %A = bitcast i32* @object2 to i8*
-  %B = call {}* @llvm.invariant.start(i64 -1, i8* %A)
+  %B = call {}* @llvm.invariant.start(i64 4, i8* %A)
   %C = bitcast {}* %B to i8*
   ret void
 }
 
+
+@object3 = global i32 0
+; CHECK: @object3 = global i32 -1
+define void @ctor3() {
+  store i32 -1, i32* @object3
+  %A = bitcast i32* @object3 to i8*
+  call {}* @llvm.invariant.start(i64 3, i8* %A)
+  ret void
+}
+
+
+@object4 = global i32 0
+; CHECK: @object4 = global i32 -1
+define void @ctor4() {
+  store i32 -1, i32* @object4
+  %A = bitcast i32* @object4 to i8*
+  call {}* @llvm.invariant.start(i64 -1, i8* %A)
+  ret void
+}
+
+
 @llvm.global_ctors = appending constant
-  [2 x { i32, void ()* }]
+  [4 x { i32, void ()* }]
   [ { i32, void ()* } { i32 65535, void ()* @ctor1 },
-    { i32, void ()* } { i32 65535, void ()* @ctor2 } ]
+    { i32, void ()* } { i32 65535, void ()* @ctor2 },
+    { i32, void ()* } { i32 65535, void ()* @ctor3 },
+    { i32, void ()* } { i32 65535, void ()* @ctor4 } ]