diff --git a/llvm/test/Assembler/ConstantExprFold.ll b/llvm/test/Assembler/ConstantExprFold.ll
index 523edd94bd05f..ab85fa525ae3d 100644
--- a/llvm/test/Assembler/ConstantExprFold.ll
+++ b/llvm/test/Assembler/ConstantExprFold.ll
@@ -1,7 +1,9 @@
-; This test checks to make sure that constant exprs fold in some simple 
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
+; This test checks to make sure that constant exprs fold in some simple
 ; situations
 
-; RUN: llvm-as < %s | llvm-dis | not grep "("
+; RUN: opt -S < %s | FileCheck %s
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 
 @A = global i64 0
@@ -17,12 +19,12 @@
 @8 = global i64* inttoptr (i64 xor (i64 ptrtoint (i64* @A to i64), i64 0) to i64*) ; X ^ 0 == X
 
 %Ty = type { i32, i32 }
-@B = external global %Ty 
+@B = external global %Ty
 
 @9 = global i1 icmp ult (i64* @A, i64* getelementptr (i64, i64* @A, i64 1))        ; true
 @10 = global i1 icmp slt (i64* @A, i64* getelementptr (i64, i64* @A, i64 0))        ; false
 @11 = global i1 icmp ult (i32* getelementptr (%Ty, %Ty* @B, i64 0, i32 0),
-                   i32* getelementptr (%Ty, %Ty* @B, i64 0, i32 1))            ; true
+  i32* getelementptr (%Ty, %Ty* @B, i64 0, i32 1))            ; true
 ;global i1 icmp ne (i64* @A, i64* bitcast (%Ty* @B to i64*))                 ; true
 
 ; PR2206
@@ -33,3 +35,34 @@
 @14 = global <2 x i8*> getelementptr({ i8 }, <2 x { i8 }*> undef, <2 x i64> <i64 1, i64 1>, <2 x i32> <i32 0, i32 0>)
 @15 = global <2 x i8*> getelementptr(i8, <2 x i8*> zeroinitializer, <2 x i64> <i64 0, i64 0>)
 @16 = global <2 x i8*> getelementptr({ i8 }, <2 x { i8 }*> zeroinitializer, <2 x i64> <i64 0, i64 0>, <2 x i32> <i32 0, i32 0>)
+
+
+; Need a function to make update_test_checks.py work.
+;.
+; CHECK: @[[A:[a-zA-Z0-9_$"\\.-]+]] = global i64 0
+; CHECK: @[[GLOB0:[0-9]+]] = global i64* @A
+; CHECK: @[[GLOB1:[0-9]+]] = global i64* @A
+; CHECK: @[[GLOB2:[0-9]+]] = global i64* null
+; CHECK: @[[GLOB3:[0-9]+]] = global i64* @A
+; CHECK: @[[GLOB4:[0-9]+]] = global i64* null
+; CHECK: @[[GLOB5:[0-9]+]] = global i64* null
+; CHECK: @[[GLOB6:[0-9]+]] = global i64* @A
+; CHECK: @[[GLOB7:[0-9]+]] = global i64 -1
+; CHECK: @[[GLOB8:[0-9]+]] = global i64* @A
+; CHECK: @[[B:[a-zA-Z0-9_$"\\.-]+]] = external global [[TY:%.*]]
+; CHECK: @[[GLOB9:[0-9]+]] = global i1 true
+; CHECK: @[[GLOB10:[0-9]+]] = global i1 false
+; CHECK: @[[GLOB11:[0-9]+]] = global i1 true
+; CHECK: @[[CONS:[a-zA-Z0-9_$"\\.-]+]] = weak global i32 0, align 8
+; CHECK: @[[GLOB12:[0-9]+]] = global i64 0
+; CHECK: @[[GLOB13:[0-9]+]] = global <2 x i8*> undef
+; CHECK: @[[GLOB14:[0-9]+]] = global <2 x i8*> undef
+; CHECK: @[[GLOB15:[0-9]+]] = global <2 x i8*> zeroinitializer
+; CHECK: @[[GLOB16:[0-9]+]] = global <2 x i8*> zeroinitializer
+;.
+define void @dummy() {
+; CHECK-LABEL: @dummy(
+; CHECK-NEXT:    ret void
+;
+  ret void
+}