Author: compnerd
Date: Fri Jul 8 20:59:51 2016
New Revision: 274956
URL: http://llvm.org/viewvc/llvm-project?rev=274956&view=rev
Log:
CodeGen: tweak CFString section for COFF, ELF
Place the structure data into `cfstring`. This both isolates the structures to
permit coalescing in the future (by the linker) as well as ensures that it
doesnt get marked as read-only data. The structures themselves are not
read-only, only the string contents.
Modified:
cfe/trunk/lib/CodeGen/CodeGenModule.cpp
cfe/trunk/test/CodeGen/CFStrings.c
Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=274956&r1=274955&r2=274956&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri Jul 8 20:59:51 2016
@@ -3209,10 +3209,8 @@ CodeGenModule::GetAddrOfConstantCFString
case llvm::Triple::UnknownObjectFormat:
llvm_unreachable("unknown file format");
case llvm::Triple::COFF:
- GV->setSection(".rdata.cfstring");
- break;
case llvm::Triple::ELF:
- GV->setSection(".rodata.cfstring");
+ GV->setSection("cfstring");
break;
case llvm::Triple::MachO:
GV->setSection("__DATA,__cfstring");
Modified: cfe/trunk/test/CodeGen/CFStrings.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/CFStrings.c?rev=274956&r1=274955&r2=274956&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/CFStrings.c (original)
+++ cfe/trunk/test/CodeGen/CFStrings.c Fri Jul 8 20:59:51 2016
@@ -21,9 +21,9 @@ const CFStringRef two = (CFStringRef)__b
// CHECK-ELF: @.str = private unnamed_addr constant [4 x i8] c"one\00", align 1
// CHECK-MACHO: @.str = private unnamed_addr constant [4 x i8] c"one\00",
section "__TEXT,__cstring,cstring_literals", align 1
-// CHECK-COFF: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 3 },
section ".rdata.cfstring", align {{[48]}}
-// CHECK-ELF32: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 3 },
section ".rodata.cfstring", align 4
-// CHECK-ELF64: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i64 3 },
section ".rodata.cfstring", align 8
+// CHECK-COFF: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 3 },
section "cfstring", align {{[48]}}
+// CHECK-ELF32: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 3 },
section "cfstring", align 4
+// CHECK-ELF64: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i64 3 },
section "cfstring", align 8
// CHECK-MACHO32: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i32 3 },
section "__DATA,__cfstring", align 4
// CHECK-MACHO64: @_unnamed_cfstring_ = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 1992, i8*
getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i32 0, i32 0), i64 3 },
section "__DATA,__cfstring", align 8
@@ -31,9 +31,9 @@ const CFStringRef two = (CFStringRef)__b
// CHECK-ELF: @.str.1 = private unnamed_addr constant [7 x i16] [i16 -3, i16
116, i16 -3, i16 119, i16 -3, i16 111, i16 0], align 2
// CHECK-MACHO: @.str.1 = private unnamed_addr constant [7 x i16] [i16 -3, i16
116, i16 -3, i16 119, i16 -3, i16 111, i16 0], section "__TEXT,__ustring",
align 2
-// CHECK-COFF: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i32 6 }, section ".rdata.cfstring", align {{[48]}}
-// CHECK-ELF32: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i32 6 }, section ".rodata.cfstring", align 4
-// CHECK-ELF64: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i64 6 }, section ".rodata.cfstring", align 8
+// CHECK-COFF: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i32 6 }, section "cfstring", align {{[48]}}
+// CHECK-ELF32: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i32 6 }, section "cfstring", align 4
+// CHECK-ELF64: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i64 6 }, section "cfstring", align 8
// CHECK-MACHO32: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i32 6 }, section "__DATA,__cfstring", align 4
// CHECK-MACHO64: @_unnamed_cfstring_.2 = private constant
%struct.__NSConstantString_tag { i32* getelementptr inbounds ([0 x i32], [0 x
i32]* @__CFConstantStringClassReference, i32 0, i32 0), i32 2000, i8* bitcast
([7 x i16]* @.str.1 to i8*), i64 6 }, section "__DATA,__cfstring", align 8
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
