commit 38e1d69672c4028124637e3b78430f4c45dff6a8
Author: Jason Merrill <jason@redhat.com>
Date: Thu Feb 14 22:11:56 2013 -0500
PR c++/52026
* semantics.c (finish_id_expression): In a template, return
the identifier for a constant variable.
@@ -3015,7 +3015,14 @@ finish_id_expression (tree id_expression,
FIXME update for final resolution of core issue 696. */
if (decl_constant_var_p (decl))
- return integral_constant_value (decl);
+ {
+ if (processing_template_decl)
+ /* In a template, the constant value may not be in a usable
+ form, so look it up again at instantiation time. */
+ return id_expression;
+ else
+ return integral_constant_value (decl);
+ }
/* If we are in a lambda function, we can move out until we hit
1. the context,
new file mode 100644
@@ -0,0 +1,15 @@
+// PR c++/52026
+// { dg-options "-std=c++11 -O" }
+// { dg-do run }
+
+template<bool B>
+int func() {
+ const int constVal1 = B ? 100 : -100;
+ const int constVal = constVal1;
+ return [] { return constVal; }();
+}
+
+int main() {
+ if (func<true>() != 100)
+ __builtin_abort ();
+}