commit 4a4251b9e719415f30db0f5170abf31296a62225
author Sebastian Redl <sebastian.redl@getdesigned.at> Sat Feb 07 13:06:23 2009 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Sat Feb 07 13:06:23 2009 +0000
tree 75f8332feed732497cc47e83608a0b863985781b
parent 36a2ada69fdb457b0e46d0ef452c150b360d8888

Make const-initialized const integral variables I-C-Es in C++.

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

lib/AST/Expr.cpp

diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index d686167..904fe5f 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -865,6 +865,17 @@
       Result = D->getInitVal();
       break;
     }
+    if (Ctx.getLangOptions().CPlusPlus &&
+        getType().getCVRQualifiers() == QualType::Const) {
+      // C++ 7.1.5.1p2
+      //   A variable of non-volatile const-qualified integral or enumeration
+      //   type initialized by an ICE can be used in ICEs.
+      if (const VarDecl *Dcl =
+              dyn_cast<VarDecl>(cast<DeclRefExpr>(this)->getDecl())) {
+        if (const Expr *Init = Dcl->getInit())
+          return Init->isIntegerConstantExpr(Result, Ctx, Loc, isEvaluated);
+      }
+    }
     if (Loc) *Loc = getLocStart();
     return false;
   case UnaryOperatorClass: {

test/SemaCXX/i-c-e-cxx.cpp

diff --git a/test/SemaCXX/i-c-e-cxx.cpp b/test/SemaCXX/i-c-e-cxx.cpp
new file mode 100644
index 0000000..64ffe8b
--- /dev/null
+++ b/test/SemaCXX/i-c-e-cxx.cpp
@@ -0,0 +1,6 @@
+// RUN: clang -fsyntax-only -verify %s
+
+// C++-specific tests for integral constant expressions.
+
+const int c = 10;
+int ar[c];

www/cxx_status.html

diff --git a/www/cxx_status.html b/www/cxx_status.html
index a5a0454..95ce0e5 100644
--- a/www/cxx_status.html
+++ b/www/cxx_status.html
@@ -1013,9 +1013,9 @@
   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;7.1.5.1 [dcl.type.cv]</td>

   <td class="complete" align="center">&#x2713;</td>

   <td class="complete" align="center">&#x2713;</td>

-  <td class="medium"></td>

+  <td class="complete" align="center">&#x2713;</td>

   <td></td>

-  <td>Const integral variables with ICE initializers are not ICEs.</td>

+  <td></td>

 </tr>

 <tr>

   <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;7.1.5.2 [dcl.type.simple]</td>