Revert r201622 and r201608.

This causes the LLVMgold plugin to segfault. More information on the
replies to r201608.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201669 91177308-0d34-0410-b5e6-96231b3b80d8

6 files changed, 8 insertions, 87 deletions

diff --git a/test/CodeGen/PowerPC/private.ll b/test/CodeGen/PowerPC/private.ll
index 633fa65103..e606dd1136 100644
--- a/test/CodeGen/PowerPC/private.ll
+++ b/test/CodeGen/PowerPC/private.ll
@@ -7,22 +7,22 @@
 ; RUN: FileCheck --check-prefix=OSX %s
 
 ; LINUX: .Lfoo:
-; OSX: l_foo:
+; OSX: L_foo:
 define private void @foo() nounwind {
         ret void
 }
 
 define i32 @bar() nounwind {
 ; LINUX: bl{{.*}}.Lfoo
-; OSX: bl{{.*}}l_foo
+; OSX: bl{{.*}}L_foo
         call void @foo()
 
 ; LINUX: lis{{.*}}.Lbaz
-; OSX:  lis{{.*}}l_baz
+; OSX:  lis{{.*}}L_baz
 	%1 = load i32* @baz, align 4
         ret i32 %1
 }
 
 ; LINUX: .Lbaz:
-; OSX: l_baz:
+; OSX: L_baz:
 @baz = private global i32 4
diff --git a/test/CodeGen/X86/2009-11-16-UnfoldMemOpBug.ll b/test/CodeGen/X86/2009-11-16-UnfoldMemOpBug.ll
index b828c27e78..08a99e3f66 100644
--- a/test/CodeGen/X86/2009-11-16-UnfoldMemOpBug.ll
+++ b/test/CodeGen/X86/2009-11-16-UnfoldMemOpBug.ll
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin -mcpu=corei7 | FileCheck %s
 ; rdar://7396984
 
-@str = private unnamed_addr constant [28 x i8] c"xxxxxxxxxxxxxxxxxxxxxxxxxxx\00", align 1
+@str = private constant [28 x i8] c"xxxxxxxxxxxxxxxxxxxxxxxxxxx\00", align 1
 
 define void @t(i32 %count) ssp nounwind {
 entry:
diff --git a/test/CodeGen/X86/global-sections.ll b/test/CodeGen/X86/global-sections.ll
index c031821f9a..eaf7337214 100644
--- a/test/CodeGen/X86/global-sections.ll
+++ b/test/CodeGen/X86/global-sections.ll
@@ -168,11 +168,3 @@
 ; DARWIN: .zerofill __DATA,__common,_G12,1,3
 ; DARWIN: .globl _G13
 ; DARWIN: .zerofill __DATA,__common,_G13,1,3
-
-@G14 = private unnamed_addr constant [4 x i8] c"foo\00", align 1
-
-; LINUX-SECTIONS:        .type   .LG14,@object           # @G14
-; LINUX-SECTIONS:        .section        .rodata..LG14,"aMS",@progbits,1
-; LINUX-SECTIONS: .LG14:
-; LINUX-SECTIONS:        .asciz  "foo"
-; LINUX-SECTIONS:        .size   .LG14, 4
diff --git a/test/CodeGen/X86/osx-private-labels.ll b/test/CodeGen/X86/osx-private-labels.ll
deleted file mode 100644
index 349ce7d0cc..0000000000
--- a/test/CodeGen/X86/osx-private-labels.ll
+++ /dev/null
@@ -1,71 +0,0 @@
-; RUN: llc < %s -mtriple=x86_64-apple-darwin | FileCheck %s
-; Test all the cases where a L label is safe. Removing any entry from
-; TargetLoweringObjectFileMachO::isSectionAtomizableBySymbols should cause
-; this to fail.
-; We also test some noteworthy cases that require an l label.
-
-@private1 = private unnamed_addr constant [4 x i8] c"zed\00"
-; CHECK: .section	__TEXT,__cstring,cstring_literals
-; CHECK-NEXT: L_private1:
-
-@private2 = private unnamed_addr constant [5 x i16] [i16 116, i16 101,
-                                                     i16 115, i16 116, i16 0]
-; CHECK: .section	__TEXT,__ustring
-; CHECK-NEXT: .align	1
-; CHECK-NEXT: l_private2:
-
-; There is no dedicated 4 byte strings on MachO.
-
-%struct.NSConstantString = type { i32*, i32, i8*, i32 }
-@private3 = private constant %struct.NSConstantString { i32* null, i32 1992, i8* null, i32 0 }, section "__DATA,__cfstring"
-; CHECK: .section	__DATA,__cfstring
-; CHECK-NEXT: .align	4
-; CHECK-NEXT: L_private3:
-
-; There is no dedicated 1 or 2 byte constant section on MachO.
-
-@private4 = private unnamed_addr constant i32 42
-; CHECK: .section	__TEXT,__literal4,4byte_literals
-; CHECK-NEXT: .align	2
-; CHECK-NEXT: L_private4:
-
-@private5 = private unnamed_addr constant i64 42
-; CHECK: .section	__TEXT,__literal8,8byte_literals
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private5:
-
-@private6 = private unnamed_addr constant i128 42
-; CHECK: .section	__TEXT,__literal16,16byte_literals
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private6:
-
-%struct._objc_class = type { i8* }
-@private7 = private global %struct._objc_class* null, section "__OBJC,__cls_refs,literal_pointers,no_dead_strip"
-; CHECK: .section	__OBJC,__cls_refs,literal_pointers,no_dead_strip
-; CHECK: .align	3
-; CHECK: L_private7:
-
-@private8 = private global i32* null, section "__DATA,__nl_symbol_ptr,non_lazy_symbol_pointers"
-; CHECK: .section	__DATA,__nl_symbol_ptr,non_lazy_symbol_pointers
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private8:
-
-@private9 = private global i32* null, section "__DATA,__la_symbol_ptr,lazy_symbol_pointers"
-; CHECK: .section	__DATA,__la_symbol_ptr,lazy_symbol_pointers
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private9:
-
-@private10 = private global i32* null, section "__DATA,__mod_init_func,mod_init_funcs"
-; CHECK: .section	__DATA,__mod_init_func,mod_init_funcs
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private10:
-
-@private11 = private global i32* null, section "__DATA,__mod_term_func,mod_term_funcs"
-; CHECK: .section	__DATA,__mod_term_func,mod_term_funcs
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private11:
-
-@private12 = private global i32* null, section "__DATA,__foobar,interposing"
-; CHECK: .section	__DATA,__foobar,interposing
-; CHECK-NEXT: .align	3
-; CHECK-NEXT: L_private12:
diff --git a/test/CodeGen/X86/pr10420.ll b/test/CodeGen/X86/pr10420.ll
index b2f08e873b..100bb2c9ee 100644
--- a/test/CodeGen/X86/pr10420.ll
+++ b/test/CodeGen/X86/pr10420.ll
@@ -14,7 +14,7 @@ define void @bar() {
        ret void;
 }
 
-; CHECK: l_foo:                                   ## @foo
+; CHECK: L_foo:                                   ## @foo
 ; CHECK-NEXT: Ltmp0:
 
 ; CHECK: _bar:                                   ## @bar
@@ -34,7 +34,7 @@ define void @bar() {
 ; CHECK-NEXT: {{.quad|.long}}   Ltmp[[NUM2]]
 
 
-; OLD: l_foo:                                   ## @foo
+; OLD: L_foo:                                   ## @foo
 ; OLD-NEXT: Ltmp0:
 
 ; OLD: _bar:                                   ## @bar
diff --git a/test/CodeGen/X86/private-2.ll b/test/CodeGen/X86/private-2.ll
index cf2d741193..4413cee23b 100644
--- a/test/CodeGen/X86/private-2.ll
+++ b/test/CodeGen/X86/private-2.ll
@@ -2,7 +2,7 @@
 ; Quote should be outside of private prefix.
 ; rdar://6855766x
 
-; CHECK: "l__ZZ20-[Example1 whatever]E4C.91"
+; CHECK: L__ZZ20
 
 	%struct.A = type { i32*, i32 }
 @"_ZZ20-[Example1 whatever]E4C.91" = private constant %struct.A { i32* null, i32 1 }		; <%struct.A*> [#uses=1]