Use std::map instead of llvm::DenseMap because we rely on the stability of references to values in these maps. PR13197.

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

2 files changed, 48 insertions, 2 deletions

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index e9cce9f23a..b16ba8fb52 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -287,7 +287,9 @@ namespace {
     /// parameters' function scope indices.
     const APValue *Arguments;
 
-    typedef llvm::DenseMap<const Expr*, APValue> MapTy;
+    // Note that we intentionally use std::map here so that references to
+    // values are stable.
+    typedef std::map<const Expr*, APValue> MapTy;
     typedef MapTy::const_iterator temp_iterator;
     /// Temporaries - Temporary lvalues materialized within this stack frame.
     MapTy Temporaries;
@@ -361,7 +363,9 @@ namespace {
     /// NextCallIndex - The next call index to assign.
     unsigned NextCallIndex;
 
-    typedef llvm::DenseMap<const OpaqueValueExpr*, APValue> MapTy;
+    // Note that we intentionally use std::map here so that references
+    // to values are stable.
+    typedef std::map<const OpaqueValueExpr*, APValue> MapTy;
     /// OpaqueValues - Values used as the common expression in a
     /// BinaryConditionalOperator.
     MapTy OpaqueValues;
diff --git a/test/SemaCXX/constexpr-many-arguments.cpp b/test/SemaCXX/constexpr-many-arguments.cpp
new file mode 100644
index 0000000000..3b5e974b33
--- /dev/null
+++ b/test/SemaCXX/constexpr-many-arguments.cpp
@@ -0,0 +1,42 @@
+// RUN: %clang_cc1 -std=c++11 -fsyntax-only %s
+// PR13197
+
+struct type1
+{
+  constexpr type1(int a0) : my_data{a0} {}
+  int my_data[1];
+};
+
+struct type2
+{
+  typedef type1 T;
+  constexpr type2(T a00, T a01, T a02, T a03, T a04, T a05, T a06, T a07, T a08, T a09,
+                       T a10, T a11, T a12, T a13, T a14, T a15, T a16, T a17, T a18, T a19,
+                       T a20, T a21, T a22) 
+    : my_data{a00, a01, a02, a03, a04, a05, a06, a07, a08, a09,
+              a10, a11, a12, a13, a14, a15, a16, a17, a18, a19,
+              a20, a21, a22}
+  {}
+  type1 my_data[23];
+};
+
+struct type3
+{
+  constexpr type3(type2 a0, type2 a1) : my_data{a0, a1} {}
+  type2 my_data[2];
+};
+
+constexpr type3 g
+{
+  {
+   {0},{0},{0},{0},{0},{0},{0},{0},{0},{0},
+   {0},{0},{0},{0},{0},{0},{0},{0},{0},{0},
+   {0},{0},{0}
+  }, 
+  {
+   {0},{0},{0},{0},{0},{0},{0},{0},{0},{0},
+   {0},{0},{0},{0},{0},{0},{0},{0},{0},{0},
+   {0},{0},{0}
+  }
+};
+