[PATCH] D53718: Change keep-static-consts to work on static storage duration, not storage class.

2018-10-25 Thread Erich Keane via Phabricator via cfe-commits 
erichkeane closed this revision.
erichkeane added a comment.

https://reviews.llvm.org/rL345302


https://reviews.llvm.org/D53718



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53718: Change keep-static-consts to work on static storage duration, not storage class.

2018-10-25 Thread Erich Keane via Phabricator via cfe-commits 
erichkeane updated this revision to Diff 171163.
erichkeane edited the summary of this revision.
erichkeane added a comment.

Add to the test


https://reviews.llvm.org/D53718

Files:
  lib/CodeGen/CodeGenModule.cpp
  test/CodeGen/keep-static-consts.cpp


Index: test/CodeGen/keep-static-consts.cpp
===
--- test/CodeGen/keep-static-consts.cpp
+++ test/CodeGen/keep-static-consts.cpp
@@ -1,6 +1,11 @@
 // RUN: %clang_cc1 -fkeep-static-consts -emit-llvm %s -o - 
-triple=x86_64-unknown-linux-gnu | FileCheck %s
 
 // CHECK: @_ZL7srcvers = internal constant [4 x i8] c"xyz\00", align 1
-// CHECK: @llvm.used = appending global [1 x i8*] [i8* getelementptr inbounds 
([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0)], section "llvm.metadata"
+// CHECK: @_ZL8srcvers2 = internal constant [4 x i8] c"abc\00", align 1
+// CHECK: @_ZL1N = internal constant i32 2, align 4
+// CHECK: @llvm.used = appending global [4 x i8*] [i8* getelementptr inbounds 
([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0), i8* bitcast (i32* @b to i8*), 
i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL8srcvers2, i32 0, i32 0), 
i8* bitcast (i32* @_ZL1N to i8*)], section "llvm.metadata"
+
 static const char srcvers[] = "xyz";
 extern const int b = 1;
+const char srcvers2[] = "abc";
+constexpr int N = 2;
Index: lib/CodeGen/CodeGenModule.cpp
===
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -1386,7 +1386,8 @@
 
   if (CodeGenOpts.KeepStaticConsts && D && isa(D)) {
 const auto *VD = cast(D);
-if (VD->getType().isConstQualified() && VD->getStorageClass() == SC_Static)
+if (VD->getType().isConstQualified() &&
+VD->getStorageDuration() == SD_Static)
   addUsedGlobal(GV);
   }
 }
@@ -2024,7 +2025,7 @@
   if (CodeGenOpts.KeepStaticConsts) {
 const auto *VD = dyn_cast(Global);
 if (VD && VD->getType().isConstQualified() &&
-VD->getStorageClass() == SC_Static)
+VD->getStorageDuration() == SD_Static)
   return true;
   }
 


Index: test/CodeGen/keep-static-consts.cpp
===
--- test/CodeGen/keep-static-consts.cpp
+++ test/CodeGen/keep-static-consts.cpp
@@ -1,6 +1,11 @@
 // RUN: %clang_cc1 -fkeep-static-consts -emit-llvm %s -o - -triple=x86_64-unknown-linux-gnu | FileCheck %s
 
 // CHECK: @_ZL7srcvers = internal constant [4 x i8] c"xyz\00", align 1
-// CHECK: @llvm.used = appending global [1 x i8*] [i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0)], section "llvm.metadata"
+// CHECK: @_ZL8srcvers2 = internal constant [4 x i8] c"abc\00", align 1
+// CHECK: @_ZL1N = internal constant i32 2, align 4
+// CHECK: @llvm.used = appending global [4 x i8*] [i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0), i8* bitcast (i32* @b to i8*), i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL8srcvers2, i32 0, i32 0), i8* bitcast (i32* @_ZL1N to i8*)], section "llvm.metadata"
+
 static const char srcvers[] = "xyz";
 extern const int b = 1;
+const char srcvers2[] = "abc";
+constexpr int N = 2;
Index: lib/CodeGen/CodeGenModule.cpp
===
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -1386,7 +1386,8 @@
 
   if (CodeGenOpts.KeepStaticConsts && D && isa(D)) {
 const auto *VD = cast(D);
-if (VD->getType().isConstQualified() && VD->getStorageClass() == SC_Static)
+if (VD->getType().isConstQualified() &&
+VD->getStorageDuration() == SD_Static)
   addUsedGlobal(GV);
   }
 }
@@ -2024,7 +2025,7 @@
   if (CodeGenOpts.KeepStaticConsts) {
 const auto *VD = dyn_cast(Global);
 if (VD && VD->getType().isConstQualified() &&
-VD->getStorageClass() == SC_Static)
+VD->getStorageDuration() == SD_Static)
   return true;
   }
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53718: Change keep-static-consts to work on static storage duration, not storage class.

2018-10-25 Thread Erich Keane via Phabricator via cfe-commits 
erichkeane added a comment.

In https://reviews.llvm.org/D53718#1276205, @zturner wrote:

> Will this work for the following variable?
>
>   constexpr int N = 3;
>


Yep, just confirmed that it does!  Adding to the test and will update the 
review.


Repository:
  rC Clang

https://reviews.llvm.org/D53718



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53718: Change keep-static-consts to work on static storage duration, not storage class.

2018-10-25 Thread Zachary Turner via Phabricator via cfe-commits 
zturner added a comment.

Will this work for the following variable?

  constexpr int N = 3;


Repository:
  rC Clang

https://reviews.llvm.org/D53718



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53718: Change keep-static-consts to work on static storage duration, not storage class.

2018-10-25 Thread Erich Keane via Phabricator via cfe-commits 
erichkeane created this revision.
erichkeane added reviewers: rnk, zturner, eandrews.

To be more in line with what GCC does, switch the condition to be based

  on the Static Storage duration instead of the storage class.


Repository:
  rC Clang

https://reviews.llvm.org/D53718

Files:
  lib/CodeGen/CodeGenModule.cpp
  test/CodeGen/keep-static-consts.cpp


Index: test/CodeGen/keep-static-consts.cpp
===
--- test/CodeGen/keep-static-consts.cpp
+++ test/CodeGen/keep-static-consts.cpp
@@ -1,6 +1,9 @@
 // RUN: %clang_cc1 -fkeep-static-consts -emit-llvm %s -o - 
-triple=x86_64-unknown-linux-gnu | FileCheck %s
 
 // CHECK: @_ZL7srcvers = internal constant [4 x i8] c"xyz\00", align 1
-// CHECK: @llvm.used = appending global [1 x i8*] [i8* getelementptr inbounds 
([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0)], section "llvm.metadata"
+// CHECK: @_ZL8srcvers2 = internal constant [4 x i8] c"abc\00", align 1
+// CHECK: @llvm.used = appending global [3 x i8*] [i8* getelementptr inbounds 
([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0), i8* bitcast (i32* @b to i8*), 
i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL8srcvers2, i32 0, i32 0)], 
section "llvm.metadata"
+
 static const char srcvers[] = "xyz";
 extern const int b = 1;
+const char srcvers2[] = "abc";
Index: lib/CodeGen/CodeGenModule.cpp
===
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -1385,7 +1385,8 @@
 
   if (CodeGenOpts.KeepStaticConsts && D && isa(D)) {
 const auto *VD = cast(D);
-if (VD->getType().isConstQualified() && VD->getStorageClass() == SC_Static)
+if (VD->getType().isConstQualified() &&
+VD->getStorageDuration() == SD_Static)
   addUsedGlobal(GV);
   }
 }
@@ -2023,7 +2024,7 @@
   if (CodeGenOpts.KeepStaticConsts) {
 const auto *VD = dyn_cast(Global);
 if (VD && VD->getType().isConstQualified() &&
-VD->getStorageClass() == SC_Static)
+VD->getStorageDuration() == SD_Static)
   return true;
   }
 


Index: test/CodeGen/keep-static-consts.cpp
===
--- test/CodeGen/keep-static-consts.cpp
+++ test/CodeGen/keep-static-consts.cpp
@@ -1,6 +1,9 @@
 // RUN: %clang_cc1 -fkeep-static-consts -emit-llvm %s -o - -triple=x86_64-unknown-linux-gnu | FileCheck %s
 
 // CHECK: @_ZL7srcvers = internal constant [4 x i8] c"xyz\00", align 1
-// CHECK: @llvm.used = appending global [1 x i8*] [i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0)], section "llvm.metadata"
+// CHECK: @_ZL8srcvers2 = internal constant [4 x i8] c"abc\00", align 1
+// CHECK: @llvm.used = appending global [3 x i8*] [i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL7srcvers, i32 0, i32 0), i8* bitcast (i32* @b to i8*), i8* getelementptr inbounds ([4 x i8], [4 x i8]* @_ZL8srcvers2, i32 0, i32 0)], section "llvm.metadata"
+
 static const char srcvers[] = "xyz";
 extern const int b = 1;
+const char srcvers2[] = "abc";
Index: lib/CodeGen/CodeGenModule.cpp
===
--- lib/CodeGen/CodeGenModule.cpp
+++ lib/CodeGen/CodeGenModule.cpp
@@ -1385,7 +1385,8 @@
 
   if (CodeGenOpts.KeepStaticConsts && D && isa(D)) {
 const auto *VD = cast(D);
-if (VD->getType().isConstQualified() && VD->getStorageClass() == SC_Static)
+if (VD->getType().isConstQualified() &&
+VD->getStorageDuration() == SD_Static)
   addUsedGlobal(GV);
   }
 }
@@ -2023,7 +2024,7 @@
   if (CodeGenOpts.KeepStaticConsts) {
 const auto *VD = dyn_cast(Global);
 if (VD && VD->getType().isConstQualified() &&
-VD->getStorageClass() == SC_Static)
+VD->getStorageDuration() == SD_Static)
   return true;
   }
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits